diff options
229 files changed, 1155 insertions, 510 deletions
diff --git a/3rdparty b/3rdparty -Subproject d18387e5293c376dec791ec4c2ce96b1962a16b +Subproject 58b4c791cba853bc27422b6a091c2d0ae3f8860 diff --git a/apps/comments/l10n/af.js b/apps/comments/l10n/af.js index cf5633c90ee..b75ff8e06c5 100644 --- a/apps/comments/l10n/af.js +++ b/apps/comments/l10n/af.js @@ -12,6 +12,7 @@ OC.L10N.register( "More comments …" : "Nog kommentare …", "Save" : "Bewaar", "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}", + "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is", "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is", "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is", "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"], @@ -24,6 +25,8 @@ OC.L10N.register( "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer", "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer", "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers", + "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.", + "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.", "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem", "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem", "Unknown user" : "Onbekende gebruiker", diff --git a/apps/comments/l10n/af.json b/apps/comments/l10n/af.json index eeea8c04f60..2c9db7765e1 100644 --- a/apps/comments/l10n/af.json +++ b/apps/comments/l10n/af.json @@ -10,6 +10,7 @@ "More comments …" : "Nog kommentare …", "Save" : "Bewaar", "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}", + "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is", "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is", "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is", "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"], @@ -22,6 +23,8 @@ "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer", "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer", "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers", + "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.", + "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.", "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem", "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem", "Unknown user" : "Onbekende gebruiker", diff --git a/apps/comments/l10n/he.js b/apps/comments/l10n/he.js index d21f53e4326..7b4fad58ca2 100644 --- a/apps/comments/l10n/he.js +++ b/apps/comments/l10n/he.js @@ -1,25 +1,36 @@ OC.L10N.register( "comments", { + "Comments" : "תגובות", + "New comment …" : "תגובה חדשה", "Delete comment" : "מחיקת תגובה", "Post" : "פרסום", "Cancel" : "ביטול", "Edit comment" : "עריכת תגובה", "[Deleted user]" : "[משתמשים מוסרים]", - "Comments" : "תגובות", + "No comments yet, start the conversation!" : "אין תגובות עדיין, בואו נתחיל לקשקש!", + "More comments …" : "תגובות נוספות…", "Save" : "שמירה", "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}", - "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}", + "Error occurred while retrieving comment with ID {id}" : "אירעה שגיאה בעת קבלת התגובה עם המזהה {id}", "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}", "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה", + "_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו"], "Comment" : "תגובה", "You commented" : "הערות שלך", "%1$s commented" : "התקבלו תגובות %1$s", - "You commented on %2$s" : "הערות שלך ב- %2$s", + "{author} commented" : "התקבלה תגובה מאת {author}", + "You commented on %1$s" : "הגבת על %1$s", + "You commented on {file}" : "הגבת על {file}", "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ", - "Type in a new comment..." : "יש להכניס תגובה חדשה...", - "No other comments available" : "אין תגובות אחרות זמינות", - "More comments..." : "תגובות נוספות...", - "{count} unread comments" : "{count} תגובות שלא נקראו" + "{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}", + "<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים", + "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "אוזכרת ב־„%s”, בתגובה על ידי משתמש שנמחק בינתיים.", + "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.", + "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”", + "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”", + "Unknown user" : "משתמש לא ידוע", + "A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”", + "A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/he.json b/apps/comments/l10n/he.json index 5cf6472acb0..30f07bf5268 100644 --- a/apps/comments/l10n/he.json +++ b/apps/comments/l10n/he.json @@ -1,23 +1,34 @@ { "translations": { + "Comments" : "תגובות", + "New comment …" : "תגובה חדשה", "Delete comment" : "מחיקת תגובה", "Post" : "פרסום", "Cancel" : "ביטול", "Edit comment" : "עריכת תגובה", "[Deleted user]" : "[משתמשים מוסרים]", - "Comments" : "תגובות", + "No comments yet, start the conversation!" : "אין תגובות עדיין, בואו נתחיל לקשקש!", + "More comments …" : "תגובות נוספות…", "Save" : "שמירה", "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}", - "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}", + "Error occurred while retrieving comment with ID {id}" : "אירעה שגיאה בעת קבלת התגובה עם המזהה {id}", "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}", "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה", + "_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו"], "Comment" : "תגובה", "You commented" : "הערות שלך", "%1$s commented" : "התקבלו תגובות %1$s", - "You commented on %2$s" : "הערות שלך ב- %2$s", + "{author} commented" : "התקבלה תגובה מאת {author}", + "You commented on %1$s" : "הגבת על %1$s", + "You commented on {file}" : "הגבת על {file}", "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ", - "Type in a new comment..." : "יש להכניס תגובה חדשה...", - "No other comments available" : "אין תגובות אחרות זמינות", - "More comments..." : "תגובות נוספות...", - "{count} unread comments" : "{count} תגובות שלא נקראו" + "{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}", + "<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים", + "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "אוזכרת ב־„%s”, בתגובה על ידי משתמש שנמחק בינתיים.", + "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.", + "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”", + "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”", + "Unknown user" : "משתמש לא ידוע", + "A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”", + "A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/dav/l10n/he.js b/apps/dav/l10n/he.js new file mode 100644 index 00000000000..04523cb0c1e --- /dev/null +++ b/apps/dav/l10n/he.js @@ -0,0 +1,39 @@ +OC.L10N.register( + "dav", + { + "Calendar" : "יומן", + "Todos" : "משימות מטלות", + "Personal" : "אישי", + "{actor} created calendar {calendar}" : "היומן {calendar} נוצר על ידי {actor}", + "You created calendar {calendar}" : "מחקת את היומן {calendar}", + "{actor} deleted calendar {calendar}" : "היומן {calendar} נמחק על ידי {actor}", + "You deleted calendar {calendar}" : "מחקת את היומן {calendar}", + "{actor} updated calendar {calendar}" : "היומן {calendar} עודכן על ידי {actor}", + "You updated calendar {calendar}" : "עדכנת את היומן {calendar}", + "You shared calendar {calendar} as public link" : "שיתפת את היומן {calendar} כקישור ציבורי", + "You removed public link for calendar {calendar}" : "הסרת את הקישור הציבורי ליומן {calendar}", + "A <strong>calendar</strong> was modified" : " <strong>יומן</strong> נערך", + "A calendar <strong>event</strong> was modified" : "<strong>אירוע</strong> ביומן נערך", + "Contact birthdays" : "ימי הולדת של אנשי קשר", + "Invitation canceled" : "ההזמנה בוטלה", + "Hello %s," : "שלום %s,", + "The meeting »%s« with %s was canceled." : "הפגישה „%s” עם %s בוטלה.", + "Invitation updated" : "ההזמנה עודכנה", + "The meeting »%s« with %s was updated." : "הפגישה „%s” עם %s עודכנה.", + "When:" : "מתי:", + "Where:" : "איפה:", + "Description:" : "תיאור:", + "Link:" : "קישור:", + "Contacts" : "אנשי קשר", + "WebDAV" : "WebDAV", + "Technical details" : "פרטים טכניים", + "Remote Address: %s" : "כתובת מרוחקת: %s", + "Request ID: %s" : "מזהה בקשה: %s", + "CalDAV server" : "שרת CalDAV", + "Send invitations to attendees" : "שליחת הזמנות למשתתפים", + "Please make sure to properly set up the email settings above." : "נא לוודא שהגדרת את הדוא״ל שלהלן כראוי.", + "Automatically generate a birthday calendar" : "יצירת יומן ימי הולדת אוטומטית", + "Birthday calendars will be generated by a background job." : "יומני ימי הולדת ייווצרו על ידי משימה ברקע.", + "Hence they will not be available immediately after enabling but will show up after some time." : "לכן הם לא יהיה זמינים מיד לאחר ההפעלה אלא הם יופיעו לאחר זמן מה." +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/dav/l10n/he.json b/apps/dav/l10n/he.json new file mode 100644 index 00000000000..11c7ca6b6bf --- /dev/null +++ b/apps/dav/l10n/he.json @@ -0,0 +1,37 @@ +{ "translations": { + "Calendar" : "יומן", + "Todos" : "משימות מטלות", + "Personal" : "אישי", + "{actor} created calendar {calendar}" : "היומן {calendar} נוצר על ידי {actor}", + "You created calendar {calendar}" : "מחקת את היומן {calendar}", + "{actor} deleted calendar {calendar}" : "היומן {calendar} נמחק על ידי {actor}", + "You deleted calendar {calendar}" : "מחקת את היומן {calendar}", + "{actor} updated calendar {calendar}" : "היומן {calendar} עודכן על ידי {actor}", + "You updated calendar {calendar}" : "עדכנת את היומן {calendar}", + "You shared calendar {calendar} as public link" : "שיתפת את היומן {calendar} כקישור ציבורי", + "You removed public link for calendar {calendar}" : "הסרת את הקישור הציבורי ליומן {calendar}", + "A <strong>calendar</strong> was modified" : " <strong>יומן</strong> נערך", + "A calendar <strong>event</strong> was modified" : "<strong>אירוע</strong> ביומן נערך", + "Contact birthdays" : "ימי הולדת של אנשי קשר", + "Invitation canceled" : "ההזמנה בוטלה", + "Hello %s," : "שלום %s,", + "The meeting »%s« with %s was canceled." : "הפגישה „%s” עם %s בוטלה.", + "Invitation updated" : "ההזמנה עודכנה", + "The meeting »%s« with %s was updated." : "הפגישה „%s” עם %s עודכנה.", + "When:" : "מתי:", + "Where:" : "איפה:", + "Description:" : "תיאור:", + "Link:" : "קישור:", + "Contacts" : "אנשי קשר", + "WebDAV" : "WebDAV", + "Technical details" : "פרטים טכניים", + "Remote Address: %s" : "כתובת מרוחקת: %s", + "Request ID: %s" : "מזהה בקשה: %s", + "CalDAV server" : "שרת CalDAV", + "Send invitations to attendees" : "שליחת הזמנות למשתתפים", + "Please make sure to properly set up the email settings above." : "נא לוודא שהגדרת את הדוא״ל שלהלן כראוי.", + "Automatically generate a birthday calendar" : "יצירת יומן ימי הולדת אוטומטית", + "Birthday calendars will be generated by a background job." : "יומני ימי הולדת ייווצרו על ידי משימה ברקע.", + "Hence they will not be available immediately after enabling but will show up after some time." : "לכן הם לא יהיה זמינים מיד לאחר ההפעלה אלא הם יופיעו לאחר זמן מה." +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/dav/l10n/pl.js b/apps/dav/l10n/pl.js index dd67807e7fa..11d53da887d 100644 --- a/apps/dav/l10n/pl.js +++ b/apps/dav/l10n/pl.js @@ -10,6 +10,8 @@ OC.L10N.register( "You deleted calendar {calendar}" : "Usunąłęś/ęłaś kalendarz {calendar}", "{actor} updated calendar {calendar}" : "{actor} zaktualizował/-a kalendarz {calendar} .", "You updated calendar {calendar}" : "Zaktualizowałeś/-aś kalendarz {calendar}", + "You shared calendar {calendar} as public link" : "Udostępniłeś kalendarz {calendar} jako publiczny link", + "You removed public link for calendar {calendar}" : "Usunąłeś publiczny link do kalendarza {calendar}", "{actor} shared calendar {calendar} with you" : "{actor} współdzieli kalendarz {calendar} z Tobą", "You shared calendar {calendar} with {user}" : "Współdzielisz kalendarz {calendar} z {user}", "{actor} shared calendar {calendar} with {user}" : "{actor} współdzieli kalendarz {calendar} z {user}", @@ -59,6 +61,7 @@ OC.L10N.register( "Request ID: %s" : "ID żądania: %s", "CalDAV server" : "Serwer CalDAV", "Send invitations to attendees" : "Wyślij uczestnikom zaproszenia", - "Please make sure to properly set up the email settings above." : "Upewnij się, że dobrze skonfigurowano powyżej ustawienia poczty e-mail." + "Please make sure to properly set up the email settings above." : "Upewnij się, że dobrze skonfigurowano powyżej ustawienia poczty e-mail.", + "Automatically generate a birthday calendar" : "Automatycznie generuj kalendarz urodzin" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/apps/dav/l10n/pl.json b/apps/dav/l10n/pl.json index 8221c4e8228..e04a6e25b5c 100644 --- a/apps/dav/l10n/pl.json +++ b/apps/dav/l10n/pl.json @@ -8,6 +8,8 @@ "You deleted calendar {calendar}" : "Usunąłęś/ęłaś kalendarz {calendar}", "{actor} updated calendar {calendar}" : "{actor} zaktualizował/-a kalendarz {calendar} .", "You updated calendar {calendar}" : "Zaktualizowałeś/-aś kalendarz {calendar}", + "You shared calendar {calendar} as public link" : "Udostępniłeś kalendarz {calendar} jako publiczny link", + "You removed public link for calendar {calendar}" : "Usunąłeś publiczny link do kalendarza {calendar}", "{actor} shared calendar {calendar} with you" : "{actor} współdzieli kalendarz {calendar} z Tobą", "You shared calendar {calendar} with {user}" : "Współdzielisz kalendarz {calendar} z {user}", "{actor} shared calendar {calendar} with {user}" : "{actor} współdzieli kalendarz {calendar} z {user}", @@ -57,6 +59,7 @@ "Request ID: %s" : "ID żądania: %s", "CalDAV server" : "Serwer CalDAV", "Send invitations to attendees" : "Wyślij uczestnikom zaproszenia", - "Please make sure to properly set up the email settings above." : "Upewnij się, że dobrze skonfigurowano powyżej ustawienia poczty e-mail." + "Please make sure to properly set up the email settings above." : "Upewnij się, że dobrze skonfigurowano powyżej ustawienia poczty e-mail.", + "Automatically generate a birthday calendar" : "Automatycznie generuj kalendarz urodzin" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/dav/l10n/sk.js b/apps/dav/l10n/sk.js index 59bd102066a..46199bdd4f9 100644 --- a/apps/dav/l10n/sk.js +++ b/apps/dav/l10n/sk.js @@ -52,6 +52,7 @@ OC.L10N.register( "Description:" : "Popis:", "Link:" : "Odkaz:", "Contacts" : "Kontakty", + "WebDAV" : "WebDAV", "Technical details" : "Technické podrobnosti", "Remote Address: %s" : "Vzdialená adresa: %s", "Request ID: %s" : "ID požiadavky: %s", diff --git a/apps/dav/l10n/sk.json b/apps/dav/l10n/sk.json index 6e13d51b12c..6455aa505bc 100644 --- a/apps/dav/l10n/sk.json +++ b/apps/dav/l10n/sk.json @@ -50,6 +50,7 @@ "Description:" : "Popis:", "Link:" : "Odkaz:", "Contacts" : "Kontakty", + "WebDAV" : "WebDAV", "Technical details" : "Technické podrobnosti", "Remote Address: %s" : "Vzdialená adresa: %s", "Request ID: %s" : "ID požiadavky: %s", diff --git a/apps/dav/l10n/zh_TW.js b/apps/dav/l10n/zh_TW.js index 0ebd869fa8d..cbf4b4f262d 100644 --- a/apps/dav/l10n/zh_TW.js +++ b/apps/dav/l10n/zh_TW.js @@ -37,6 +37,7 @@ OC.L10N.register( "Description:" : "描述", "Link:" : "連結", "Contacts" : "聯絡人", + "WebDAV" : "WebDAV", "Technical details" : "技術細節", "Remote Address: %s" : "遠端位置：%s", "Request ID: %s" : "請求編號：%s", diff --git a/apps/dav/l10n/zh_TW.json b/apps/dav/l10n/zh_TW.json index d41e70036bb..c4a4ba65333 100644 --- a/apps/dav/l10n/zh_TW.json +++ b/apps/dav/l10n/zh_TW.json @@ -35,6 +35,7 @@ "Description:" : "描述", "Link:" : "連結", "Contacts" : "聯絡人", + "WebDAV" : "WebDAV", "Technical details" : "技術細節", "Remote Address: %s" : "遠端位置：%s", "Request ID: %s" : "請求編號：%s", diff --git a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php index e9118cfc9e0..d08917ff35d 100644 --- a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php +++ b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php @@ -52,6 +52,7 @@ class CustomPropertiesBackend implements BackendInterface { '{http://owncloud.org/ns}downloadURL', '{http://owncloud.org/ns}dDC', '{http://owncloud.org/ns}size', + '{http://nextcloud.org/ns}is-encrypted', ); /** diff --git a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php index 26e29e20d12..1678a8831dc 100644 --- a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php +++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php @@ -32,6 +32,7 @@ use OCP\ILogger; use Sabre\DAV\Exception\Conflict; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\InvalidSyncToken; +use Sabre\DAV\Exception\MethodNotAllowed; use Sabre\DAV\Exception\NotAuthenticated; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\NotImplemented; @@ -65,6 +66,9 @@ class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin { // happens when the parent directory is not present (for example when a // move is done to a non-existent directory) Conflict::class => true, + // happens when a certain method is not allowed to be called + // for example creating a folder that already exists + MethodNotAllowed::class => true, ]; /** @var string */ diff --git a/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php b/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php index bc81db50b28..90346546a23 100644 --- a/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php +++ b/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php @@ -427,9 +427,19 @@ class RequestHandlerController extends OCSController { $token = isset($_POST['token']) ? $_POST['token'] : null; - $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share_external` WHERE `remote_id` = ? AND `share_token` = ?'); - $query->execute(array($id, $token)); - $share = $query->fetchRow(); + $qb = $this->connection->getQueryBuilder(); + $qb->select('*') + ->from('share_external') + ->where( + $qb->expr()->andX( + $qb->expr()->eq('remote_id', $qb->createNamedParameter($id)), + $qb->expr()->eq('share_token', $qb->createNamedParameter($token)) + ) + ); + + $result = $qb->execute(); + $share = $result->fetch(); + $result->closeCursor(); if ($token && $id && !empty($share)) { @@ -439,8 +449,17 @@ class RequestHandlerController extends OCSController { $mountpoint = $share['mountpoint']; $user = $share['user']; - $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share_external` WHERE `remote_id` = ? AND `share_token` = ?'); - $query->execute(array($id, $token)); + $qb = $this->connection->getQueryBuilder(); + $qb->delete('share_external') + ->where( + $qb->expr()->andX( + $qb->expr()->eq('remote_id', $qb->createNamedParameter($id)), + $qb->expr()->eq('share_token', $qb->createNamedParameter($token)) + ) + ); + + $result = $qb->execute(); + $result->closeCursor(); if ($share['accepted']) { $path = trim($mountpoint, '/'); diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index 035b7da15ca..d76f93751a4 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -119,11 +119,13 @@ class RequestHandlerControllerTest extends TestCase { } protected function tearDown() { - $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share_external`'); - $query->execute(); + $qb = $this->connection->getQueryBuilder(); + $qb->delete('share_external'); + $qb->execute(); - $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`'); - $query->execute(); + $qb = $this->connection->getQueryBuilder(); + $qb->delete('share'); + $qb->execute(); parent::tearDown(); } @@ -142,9 +144,15 @@ class RequestHandlerControllerTest extends TestCase { $this->s2s->createShare(null); - $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share_external` WHERE `remote_id` = ?'); - $result = $query->execute(array('1')); - $data = $result->fetchRow(); + $qb = $this->connection->getQueryBuilder(); + $qb->select('*') + ->from('share_external') + ->where( + $qb->expr()->eq('remote_id', $qb->createNamedParameter(1)) + ); + $result = $qb->execute(); + $data = $result->fetch(); + $result->closeCursor(); $this->assertSame('localhost', $data['remote']); $this->assertSame('token', $data['share_token']); @@ -187,7 +195,7 @@ class RequestHandlerControllerTest extends TestCase { $this->share->expects($this->any())->method('verifyShare')->willReturn(true); - $dummy = \OCP\DB::prepare(' + $dummy = \OC_DB::prepare(' INSERT INTO `*PREFIX*share` (`share_type`, `uid_owner`, `item_type`, `item_source`, `item_target`, `file_source`, `file_target`, `permissions`, `stime`, `token`, `share_with`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) @@ -195,7 +203,7 @@ class RequestHandlerControllerTest extends TestCase { $dummy->execute(array(\OCP\Share::SHARE_TYPE_REMOTE, self::TEST_FILES_SHARING_API_USER1, 'test', '1', '/1', '1', '/test.txt', '1', time(), 'token1', 'foo@bar')); $dummy->execute(array(\OCP\Share::SHARE_TYPE_REMOTE, self::TEST_FILES_SHARING_API_USER1, 'test', '1', '/1', '1', '/test.txt', '1', time(), 'token2', 'bar@bar')); - $verify = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`'); + $verify = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`'); $result = $verify->execute(); $data = $result->fetchAll(); $this->assertCount(2, $data); @@ -203,7 +211,7 @@ class RequestHandlerControllerTest extends TestCase { $_POST['token'] = 'token1'; $this->s2s->declineShare(array('id' => $data[0]['id'])); - $verify = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`'); + $verify = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`'); $result = $verify->execute(); $data = $result->fetchAll(); $this->assertCount(1, $data); @@ -212,7 +220,7 @@ class RequestHandlerControllerTest extends TestCase { $_POST['token'] = 'token2'; $this->s2s->declineShare(array('id' => $data[0]['id'])); - $verify = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`'); + $verify = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`'); $result = $verify->execute(); $data = $result->fetchAll(); $this->assertEmpty($data); diff --git a/apps/federation/l10n/pl.js b/apps/federation/l10n/pl.js index b0f746bb74e..eb991b9dce9 100644 --- a/apps/federation/l10n/pl.js +++ b/apps/federation/l10n/pl.js @@ -5,6 +5,7 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Serwer znajduje się już na liście zaufanych serwerów.", "No server to federate with found" : "Nie znaleziono stowarzyszonego serwera", "Could not add server" : "Nie można dodać serwera", + "Federation" : "Stowarzyszenia", "Trusted servers" : "Zaufane serwery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Stowarzyszenie pozwala łączyć się z innymi zaufanymi użytkownikami i wymieniać się z nimi katalogami. Na przykład, może to być wykorzystane do autouzupełniania w dzieleniu się ze stowarzyszonym użytkownikiem.", "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu stowarzyszonego udziału.", diff --git a/apps/federation/l10n/pl.json b/apps/federation/l10n/pl.json index e2b8b9c32fe..be295636029 100644 --- a/apps/federation/l10n/pl.json +++ b/apps/federation/l10n/pl.json @@ -3,6 +3,7 @@ "Server is already in the list of trusted servers." : "Serwer znajduje się już na liście zaufanych serwerów.", "No server to federate with found" : "Nie znaleziono stowarzyszonego serwera", "Could not add server" : "Nie można dodać serwera", + "Federation" : "Stowarzyszenia", "Trusted servers" : "Zaufane serwery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Stowarzyszenie pozwala łączyć się z innymi zaufanymi użytkownikami i wymieniać się z nimi katalogami. Na przykład, może to być wykorzystane do autouzupełniania w dzieleniu się ze stowarzyszonym użytkownikiem.", "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu stowarzyszonego udziału.", diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index a6d376aa2a9..4c0ccaf6451 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -644,10 +644,10 @@ } OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { - context.fileList.copy(filename, targetPath); + context.fileList.copy(filename, targetPath, false, context.dir); } if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { - context.fileList.move(filename, targetPath); + context.fileList.move(filename, targetPath, false, context.dir); } }, false, "httpd/unix-directory", true, actions); } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e1a0491cdc8..9459b83dca2 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2047,10 +2047,12 @@ * @param fileNames array of file names to move * @param targetPath absolute target path * @param callback function to call when movement is finished + * @param dir the dir path where fileNames are located (optionnal, will take current folder if undefined) */ - move: function(fileNames, targetPath, callback) { + move: function(fileNames, targetPath, callback, dir) { var self = this; - var dir = this.getCurrentDirectory(); + + dir = typeof dir === 'string' ? dir : this.getCurrentDirectory(); if (dir.charAt(dir.length - 1) !== '/') { dir += '/'; } @@ -2110,13 +2112,14 @@ * @param fileNames array of file names to copy * @param targetPath absolute target path * @param callback to call when copy is finished with success + * @param dir the dir path where fileNames are located (optionnal, will take current folder if undefined) */ - copy: function(fileNames, targetPath, callback) { + copy: function(fileNames, targetPath, callback, dir) { var self = this; var filesToNotify = []; var count = 0; - var dir = this.getCurrentDirectory(); + dir = typeof dir === 'string' ? dir : this.getCurrentDirectory(); if (dir.charAt(dir.length - 1) !== '/') { dir += '/'; } diff --git a/apps/files/l10n/af.js b/apps/files/l10n/af.js new file mode 100644 index 00000000000..efd2f010a05 --- /dev/null +++ b/apps/files/l10n/af.js @@ -0,0 +1,107 @@ +OC.L10N.register( + "files", + { + "Storage is temporarily not available" : "Berging is tydelik onbeskikbaar", + "Storage invalid" : "Berging ongeldig", + "Unknown error" : "Onbekende fout", + "All files" : "Alle lêers", + "Recent" : "Onlangs", + "File could not be found" : "Lêer kon nie gevind word nie", + "Home" : "Tuis", + "Close" : "Sluit", + "Favorites" : "Gunstelinge", + "Could not create folder \"{dir}\"" : "Kan nie vouer: \"{dir}\" skep nie", + "Upload cancelled." : "Oplaai gekanselleer.", + "Not enough free space" : "Nie genoeg oop spasie nie", + "Uploading …" : "Laai tans op …", + "…" : "…", + "Actions" : "Aksies", + "Download" : "Laai Af", + "Rename" : "Hernoem", + "Move or copy" : "Kopieer of skuif", + "Copy" : "Kopieer", + "Target folder" : "Teikenvouer", + "Delete" : "Skrap", + "Disconnect storage" : "Ontkoppel berging", + "Unshare" : "Ontdeel", + "Files" : "Lêers", + "Details" : "Details", + "Select" : "Kies", + "Pending" : "Hangend", + "{newName} already exists" : "{nuweNaam} bestaan reeds", + "Name" : "Naam", + "Size" : "Grootte", + "Modified" : "Gewysig", + "_%n folder_::_%n folders_" : ["%n gids","%n gidse"], + "_%n file_::_%n files_" : ["%n lêer","%n lêers"], + "_Uploading %n file_::_Uploading %n files_" : ["Laai tans %n lêer op ","Laai tans %n lêers op"], + "New" : "Nuwe", + "{used} of {quota} used" : "{gebruik} van {kwota} gebruik", + "{used} used" : "{gebruik} gebruik", + "\"{name}\" is an invalid file name." : "\"{naam}\" is nie 'n geldige lêernaam nie.", + "File name cannot be empty." : "Lêernaam kan nie leeg wees nie.", + "\"/\" is not allowed inside a file name." : "\"/\" word nie binne 'n lêernaam toegelaat nie.", + "Your storage is almost full ({usedSpacePercent}%)" : "U stoorspasie is amper vol ({gebruikteSpasiePersent}%)", + "View in folder" : "Vertoon in gids", + "Copied!" : "Gekopieer!", + "Path" : "Roete", + "_%n byte_::_%n bytes_" : ["%n greep","%n grepe"], + "Favorited" : "As gunsteling ", + "Favorite" : "Gunsteling", + "New folder" : "Nuwe gids", + "Upload file" : "Laai lêer op", + "Not favorited" : "Nie as gunsteling", + "Remove from favorites" : "Verwyder uit gunstelinge", + "Add to favorites" : "Voeg by gunstelinge", + "Added to favorites" : "Tot gunstelinge bygevoeg", + "Removed from favorites" : "Van gunstelinge verwyder", + "You added {file} to your favorites" : "U het {lêer} tot u gunstelinge bygevoeg", + "You removed {file} from your favorites" : "U het {lêer} van u gunstelinge verwyder", + "File changes" : "Lêer veranderinge ", + "Created by {user}" : "Geskep deur {gebruiker}", + "Changed by {user}" : "Verander deur {gebruiker}", + "Deleted by {user}" : "Geskrap deur {gebruiker}", + "Restored by {user}" : "Herstel deur {gebruiker}", + "Renamed by {user}" : "Naam verander deur {gebruiker}", + "Moved by {user}" : "Geskuif deur {gebruiker}", + "\"remote user\"" : "“afstandsgebruiker”", + "You created {file}" : "U het {lêer} geskep", + "{user} created {file}" : "{gebruiker} het {lêer} geskep", + "{file} was created in a public folder" : "{lêer} was in 'n publieke gids geskep", + "You changed {file}" : "U het {lêer} verander", + "{user} changed {file}" : "{gebruiker} het {lêer} verander", + "You deleted {file}" : "U het {lêer} geskrap", + "{user} deleted {file}" : "{gebruiker} het {lêer} geskrap", + "You restored {file}" : "U het {lêer} herstel", + "{user} restored {file}" : "{gebruiker} het {lêer} herstel", + "You renamed {oldfile} to {newfile}" : "U het die naam van {oulêer} na {nuwelêer} verander", + "{user} renamed {oldfile} to {newfile}" : "{gebruiker} het die naam van {oulêer} na {nuwelêer} verander", + "You moved {oldfile} to {newfile}" : "U het {oulêer} na {nuwelêer} geskuif", + "{user} moved {oldfile} to {newfile}" : "{gebruiker} het {oulêer} na {nuwelêer} geskuif", + "Unlimited" : "Onbeperkte", + "Upload (max. %s)" : "Oplaai (maks. %s)", + "File handling" : "Lêerhantering", + "Maximum upload size" : "Maksimum oplaai grootte", + "max. possible: " : "maks. moontlik:", + "Save" : "Stoor", + "%s of %s used" : "%s van %s gebruik", + "%s used" : "%s gebruik", + "Settings" : "Instellings", + "Show hidden files" : "Vertoon verborge lêers ", + "WebDAV" : "WebDAV", + "Cancel upload" : "Kanselleer oplaai", + "No files in here" : "Geen lêers hierbinne nie", + "No entries found in this folder" : "Geen inskrwyings in hierdie vouer gevind", + "Select all" : "Merk alles", + "Upload too large" : "Oplaai te groot", + "No favorites yet" : "Tans geen gunstelinge ", + "Shared with you" : "Met u gedeel", + "Shared with others" : "Gedeel met ander", + "Shared by link" : "Gedeel per skakel", + "Tags" : "Merkers", + "Deleted files" : "Geskrapte lêers", + "Text file" : "Tekslêer", + "New text file.txt" : "Nuwe tekslêer.txt", + "Move" : "Skuif" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/af.json b/apps/files/l10n/af.json new file mode 100644 index 00000000000..a40153131ab --- /dev/null +++ b/apps/files/l10n/af.json @@ -0,0 +1,105 @@ +{ "translations": { + "Storage is temporarily not available" : "Berging is tydelik onbeskikbaar", + "Storage invalid" : "Berging ongeldig", + "Unknown error" : "Onbekende fout", + "All files" : "Alle lêers", + "Recent" : "Onlangs", + "File could not be found" : "Lêer kon nie gevind word nie", + "Home" : "Tuis", + "Close" : "Sluit", + "Favorites" : "Gunstelinge", + "Could not create folder \"{dir}\"" : "Kan nie vouer: \"{dir}\" skep nie", + "Upload cancelled." : "Oplaai gekanselleer.", + "Not enough free space" : "Nie genoeg oop spasie nie", + "Uploading …" : "Laai tans op …", + "…" : "…", + "Actions" : "Aksies", + "Download" : "Laai Af", + "Rename" : "Hernoem", + "Move or copy" : "Kopieer of skuif", + "Copy" : "Kopieer", + "Target folder" : "Teikenvouer", + "Delete" : "Skrap", + "Disconnect storage" : "Ontkoppel berging", + "Unshare" : "Ontdeel", + "Files" : "Lêers", + "Details" : "Details", + "Select" : "Kies", + "Pending" : "Hangend", + "{newName} already exists" : "{nuweNaam} bestaan reeds", + "Name" : "Naam", + "Size" : "Grootte", + "Modified" : "Gewysig", + "_%n folder_::_%n folders_" : ["%n gids","%n gidse"], + "_%n file_::_%n files_" : ["%n lêer","%n lêers"], + "_Uploading %n file_::_Uploading %n files_" : ["Laai tans %n lêer op ","Laai tans %n lêers op"], + "New" : "Nuwe", + "{used} of {quota} used" : "{gebruik} van {kwota} gebruik", + "{used} used" : "{gebruik} gebruik", + "\"{name}\" is an invalid file name." : "\"{naam}\" is nie 'n geldige lêernaam nie.", + "File name cannot be empty." : "Lêernaam kan nie leeg wees nie.", + "\"/\" is not allowed inside a file name." : "\"/\" word nie binne 'n lêernaam toegelaat nie.", + "Your storage is almost full ({usedSpacePercent}%)" : "U stoorspasie is amper vol ({gebruikteSpasiePersent}%)", + "View in folder" : "Vertoon in gids", + "Copied!" : "Gekopieer!", + "Path" : "Roete", + "_%n byte_::_%n bytes_" : ["%n greep","%n grepe"], + "Favorited" : "As gunsteling ", + "Favorite" : "Gunsteling", + "New folder" : "Nuwe gids", + "Upload file" : "Laai lêer op", + "Not favorited" : "Nie as gunsteling", + "Remove from favorites" : "Verwyder uit gunstelinge", + "Add to favorites" : "Voeg by gunstelinge", + "Added to favorites" : "Tot gunstelinge bygevoeg", + "Removed from favorites" : "Van gunstelinge verwyder", + "You added {file} to your favorites" : "U het {lêer} tot u gunstelinge bygevoeg", + "You removed {file} from your favorites" : "U het {lêer} van u gunstelinge verwyder", + "File changes" : "Lêer veranderinge ", + "Created by {user}" : "Geskep deur {gebruiker}", + "Changed by {user}" : "Verander deur {gebruiker}", + "Deleted by {user}" : "Geskrap deur {gebruiker}", + "Restored by {user}" : "Herstel deur {gebruiker}", + "Renamed by {user}" : "Naam verander deur {gebruiker}", + "Moved by {user}" : "Geskuif deur {gebruiker}", + "\"remote user\"" : "“afstandsgebruiker”", + "You created {file}" : "U het {lêer} geskep", + "{user} created {file}" : "{gebruiker} het {lêer} geskep", + "{file} was created in a public folder" : "{lêer} was in 'n publieke gids geskep", + "You changed {file}" : "U het {lêer} verander", + "{user} changed {file}" : "{gebruiker} het {lêer} verander", + "You deleted {file}" : "U het {lêer} geskrap", + "{user} deleted {file}" : "{gebruiker} het {lêer} geskrap", + "You restored {file}" : "U het {lêer} herstel", + "{user} restored {file}" : "{gebruiker} het {lêer} herstel", + "You renamed {oldfile} to {newfile}" : "U het die naam van {oulêer} na {nuwelêer} verander", + "{user} renamed {oldfile} to {newfile}" : "{gebruiker} het die naam van {oulêer} na {nuwelêer} verander", + "You moved {oldfile} to {newfile}" : "U het {oulêer} na {nuwelêer} geskuif", + "{user} moved {oldfile} to {newfile}" : "{gebruiker} het {oulêer} na {nuwelêer} geskuif", + "Unlimited" : "Onbeperkte", + "Upload (max. %s)" : "Oplaai (maks. %s)", + "File handling" : "Lêerhantering", + "Maximum upload size" : "Maksimum oplaai grootte", + "max. possible: " : "maks. moontlik:", + "Save" : "Stoor", + "%s of %s used" : "%s van %s gebruik", + "%s used" : "%s gebruik", + "Settings" : "Instellings", + "Show hidden files" : "Vertoon verborge lêers ", + "WebDAV" : "WebDAV", + "Cancel upload" : "Kanselleer oplaai", + "No files in here" : "Geen lêers hierbinne nie", + "No entries found in this folder" : "Geen inskrwyings in hierdie vouer gevind", + "Select all" : "Merk alles", + "Upload too large" : "Oplaai te groot", + "No favorites yet" : "Tans geen gunstelinge ", + "Shared with you" : "Met u gedeel", + "Shared with others" : "Gedeel met ander", + "Shared by link" : "Gedeel per skakel", + "Tags" : "Merkers", + "Deleted files" : "Geskrapte lêers", + "Text file" : "Tekslêer", + "New text file.txt" : "Nuwe tekslêer.txt", + "Move" : "Skuif" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 1712d9e7b58..539dc0ba686 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -76,7 +76,7 @@ OC.L10N.register( "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"], "View in folder" : "Visualizza nella cartella", "Copied!" : "Copiato!", - "Copy direct link (only works for users who have access to this file/folder)" : "Copia link diretto (funziona solo per utenti che hanno accesso a questo file / cartella)", + "Copy direct link (only works for users who have access to this file/folder)" : "Copia collegamento diretto (funziona solo per utenti che hanno accesso a questo file/cartella)", "Path" : "Percorso", "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 59442e6d58c..bc6827ddc63 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -74,7 +74,7 @@ "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"], "View in folder" : "Visualizza nella cartella", "Copied!" : "Copiato!", - "Copy direct link (only works for users who have access to this file/folder)" : "Copia link diretto (funziona solo per utenti che hanno accesso a questo file / cartella)", + "Copy direct link (only works for users who have access to this file/folder)" : "Copia collegamento diretto (funziona solo per utenti che hanno accesso a questo file/cartella)", "Path" : "Percorso", "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index 30b4092c50d..f474b2429b6 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -25,6 +25,7 @@ OC.L10N.register( "Download" : "Pobierz", "Rename" : "Zmień nazwę", "Move or copy" : "Przenieś lub kopiuj", + "Copy" : "Kopiuj", "Target folder" : "Folder docelowy", "Delete" : "Usuń", "Disconnect storage" : "Odłącz magazyn", @@ -99,12 +100,18 @@ OC.L10N.register( "Moved by {user}" : "Przeniesione przez {user}", "\"remote user\"" : "\"użytkownik zdalny\"", "You created {file}" : "Utworzyłeś {file}", + "You created an encrypted file in {file}" : "Stworzyłeś zaszyfrowany plik w {file}", "{user} created {file}" : "{user} utworzył {file}", + "{user} created an encrypted file in {file}" : "{user} utworzył zaszyfrowany plik w {file}", "{file} was created in a public folder" : "{file} został utworzony w folderze publicznym", "You changed {file}" : "Zmieniłeś {file}", + "You changed an encrypted file in {file}" : "Zmieniłeś zaszyfrowany plik w {file}", "{user} changed {file}" : "{user} zmienił {file}", + "{user} changed an encrypted file in {file}" : "{user} zmienił zaszyfrowany plik w {file}", "You deleted {file}" : "Usunąłeś {file}", + "You deleted an encrypted file in {file}" : "Usunąłeś zaszyfrowany plik w {file}", "{user} deleted {file}" : "{user} usunął {file}", + "{user} deleted an encrypted file in {file}" : "{user} usunął zaszyfrowany plik w {file}", "You restored {file}" : "Przywróciłeś {file}", "{user} restored {file}" : "{user} przywrócił {file}", "You renamed {oldfile} to {newfile}" : "Zmieniłeś {oldfile} na {newfile}", diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index da93dd54258..187cc6a79d0 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -23,6 +23,7 @@ "Download" : "Pobierz", "Rename" : "Zmień nazwę", "Move or copy" : "Przenieś lub kopiuj", + "Copy" : "Kopiuj", "Target folder" : "Folder docelowy", "Delete" : "Usuń", "Disconnect storage" : "Odłącz magazyn", @@ -97,12 +98,18 @@ "Moved by {user}" : "Przeniesione przez {user}", "\"remote user\"" : "\"użytkownik zdalny\"", "You created {file}" : "Utworzyłeś {file}", + "You created an encrypted file in {file}" : "Stworzyłeś zaszyfrowany plik w {file}", "{user} created {file}" : "{user} utworzył {file}", + "{user} created an encrypted file in {file}" : "{user} utworzył zaszyfrowany plik w {file}", "{file} was created in a public folder" : "{file} został utworzony w folderze publicznym", "You changed {file}" : "Zmieniłeś {file}", + "You changed an encrypted file in {file}" : "Zmieniłeś zaszyfrowany plik w {file}", "{user} changed {file}" : "{user} zmienił {file}", + "{user} changed an encrypted file in {file}" : "{user} zmienił zaszyfrowany plik w {file}", "You deleted {file}" : "Usunąłeś {file}", + "You deleted an encrypted file in {file}" : "Usunąłeś zaszyfrowany plik w {file}", "{user} deleted {file}" : "{user} usunął {file}", + "{user} deleted an encrypted file in {file}" : "{user} usunął zaszyfrowany plik w {file}", "You restored {file}" : "Przywróciłeś {file}", "{user} restored {file}" : "{user} przywrócił {file}", "You renamed {oldfile} to {newfile}" : "Zmieniłeś {oldfile} na {newfile}", diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js index c609ee92197..4d74625a007 100644 --- a/apps/files/l10n/sk.js +++ b/apps/files/l10n/sk.js @@ -25,6 +25,7 @@ OC.L10N.register( "Download" : "Sťahovanie", "Rename" : "Premenovať", "Move or copy" : "Presunúť alebo kopírovať", + "Copy" : "Kopírovať", "Target folder" : "Cieľový priečinok", "Delete" : "Zmazať", "Disconnect storage" : "Odpojiť úložisko", diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json index 59d387b91b1..304a9e8dd79 100644 --- a/apps/files/l10n/sk.json +++ b/apps/files/l10n/sk.json @@ -23,6 +23,7 @@ "Download" : "Sťahovanie", "Rename" : "Premenovať", "Move or copy" : "Presunúť alebo kopírovať", + "Copy" : "Kopírovať", "Target folder" : "Cieľový priečinok", "Delete" : "Zmazať", "Disconnect storage" : "Odpojiť úložisko", diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 9833f2512cb..4d1569741d3 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -25,6 +25,7 @@ OC.L10N.register( "Download" : "下載", "Rename" : "重新命名", "Move or copy" : "移動或複製", + "Copy" : "複製", "Target folder" : "目標資料夾", "Delete" : "刪除", "Disconnect storage" : "斷開儲存空間連接", @@ -62,8 +63,11 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案", "_Uploading %n file_::_Uploading %n files_" : ["正在上傳 %n 個檔案"], "New" : "新增", + "{used} of {quota} used" : "已使用 {quota} 當中的 {used}", + "{used} used" : "已使用 {used}", "\"{name}\" is an invalid file name." : "{name} 是無效的檔名", "File name cannot be empty." : "檔名不能為空", + "\"/\" is not allowed inside a file name." : "不允許檔名中出現 \"/\"", "\"{name}\" is not an allowed filetype" : "\"{name}\" 是不允許的檔案類型", "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的儲存空間已滿，沒有辦法再更新或是同步檔案！", "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！", @@ -96,12 +100,18 @@ OC.L10N.register( "Moved by {user}" : "由 {user} 移動", "\"remote user\"" : "「遠端用戶」", "You created {file}" : "您建立了 {file}", + "You created an encrypted file in {file}" : "您在 {file} 建立了一個加密的檔案", "{user} created {file}" : "{user} 建立了 {file}", + "{user} created an encrypted file in {file}" : "{user} 在 {file} 建立了一個加密的檔案", "{file} was created in a public folder" : "{file} 已建立於共享資料夾", "You changed {file}" : "您變更了 {file}", + "You changed an encrypted file in {file}" : "您在 {file} 修改了一個加密的檔案", "{user} changed {file}" : "{user} 變更了 {file}", + "{user} changed an encrypted file in {file}" : "{user} 在 {file} 修改了一個加密的檔案", "You deleted {file}" : "您刪除了 {file}", + "You deleted an encrypted file in {file}" : "您在 {file} 刪除了一個加密的檔案", "{user} deleted {file}" : "{user} 刪除了 {file}", + "{user} deleted an encrypted file in {file}" : "{user} 在 {file} 刪除了一個加密的檔案", "You restored {file}" : "您還原了 {file}", "{user} restored {file}" : "{user} 還原了 {file}", "You renamed {oldfile} to {newfile}" : "您變更 {oldfile} 為 {newfile}", @@ -143,6 +153,10 @@ OC.L10N.register( "Tags" : "標籤", "Deleted files" : "回收桶", "Text file" : "文字檔", - "New text file.txt" : "新文字檔.txt" + "New text file.txt" : "新文字檔.txt", + "Move" : "移動", + "A new file or folder has been <strong>deleted</strong>" : "一個新的檔案或資料夾已經被<strong>刪除</strong>", + "A new file or folder has been <strong>restored</strong>" : "一個新的檔案或資料夾已經被<strong>還原</strong>", + "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個地址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">透過 WebDAV 存取您的檔案</a>" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index 3ef15cbd79f..b1403be8cb3 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -23,6 +23,7 @@ "Download" : "下載", "Rename" : "重新命名", "Move or copy" : "移動或複製", + "Copy" : "複製", "Target folder" : "目標資料夾", "Delete" : "刪除", "Disconnect storage" : "斷開儲存空間連接", @@ -60,8 +61,11 @@ "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案", "_Uploading %n file_::_Uploading %n files_" : ["正在上傳 %n 個檔案"], "New" : "新增", + "{used} of {quota} used" : "已使用 {quota} 當中的 {used}", + "{used} used" : "已使用 {used}", "\"{name}\" is an invalid file name." : "{name} 是無效的檔名", "File name cannot be empty." : "檔名不能為空", + "\"/\" is not allowed inside a file name." : "不允許檔名中出現 \"/\"", "\"{name}\" is not an allowed filetype" : "\"{name}\" 是不允許的檔案類型", "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的儲存空間已滿，沒有辦法再更新或是同步檔案！", "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！", @@ -94,12 +98,18 @@ "Moved by {user}" : "由 {user} 移動", "\"remote user\"" : "「遠端用戶」", "You created {file}" : "您建立了 {file}", + "You created an encrypted file in {file}" : "您在 {file} 建立了一個加密的檔案", "{user} created {file}" : "{user} 建立了 {file}", + "{user} created an encrypted file in {file}" : "{user} 在 {file} 建立了一個加密的檔案", "{file} was created in a public folder" : "{file} 已建立於共享資料夾", "You changed {file}" : "您變更了 {file}", + "You changed an encrypted file in {file}" : "您在 {file} 修改了一個加密的檔案", "{user} changed {file}" : "{user} 變更了 {file}", + "{user} changed an encrypted file in {file}" : "{user} 在 {file} 修改了一個加密的檔案", "You deleted {file}" : "您刪除了 {file}", + "You deleted an encrypted file in {file}" : "您在 {file} 刪除了一個加密的檔案", "{user} deleted {file}" : "{user} 刪除了 {file}", + "{user} deleted an encrypted file in {file}" : "{user} 在 {file} 刪除了一個加密的檔案", "You restored {file}" : "您還原了 {file}", "{user} restored {file}" : "{user} 還原了 {file}", "You renamed {oldfile} to {newfile}" : "您變更 {oldfile} 為 {newfile}", @@ -141,6 +151,10 @@ "Tags" : "標籤", "Deleted files" : "回收桶", "Text file" : "文字檔", - "New text file.txt" : "新文字檔.txt" + "New text file.txt" : "新文字檔.txt", + "Move" : "移動", + "A new file or folder has been <strong>deleted</strong>" : "一個新的檔案或資料夾已經被<strong>刪除</strong>", + "A new file or folder has been <strong>restored</strong>" : "一個新的檔案或資料夾已經被<strong>還原</strong>", + "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個地址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">透過 WebDAV 存取您的檔案</a>" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_external/3rdparty/.gitignore b/apps/files_external/3rdparty/.gitignore index a7913dd4308..ce8b521ff54 100644 --- a/apps/files_external/3rdparty/.gitignore +++ b/apps/files_external/3rdparty/.gitignore @@ -1,6 +1,7 @@ example.php icewind/smb/tests icewind/smb/install_libsmbclient.sh +icewind/smb/Makefile icewind/smb/.travis.yml icewind/smb/.scrutinizer.yml icewind/streams/tests diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json index b556de7c395..9655a8f1564 100644 --- a/apps/files_external/3rdparty/composer.json +++ b/apps/files_external/3rdparty/composer.json @@ -8,8 +8,7 @@ "classmap-authoritative": true }, "require": { - "icewind/smb": "2.0.4", - "icewind/streams": "0.5.2" + "icewind/streams": "0.5.2", + "icewind/smb": "2.0.5" } } - diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock index 2ec6ee94c8d..f3987e2c1e3 100644 --- a/apps/files_external/3rdparty/composer.lock +++ b/apps/files_external/3rdparty/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "8b87ff18cd1c30945c631607fbfbf8b7", + "content-hash": "53a1e7ab19e98c20c720cab0340bc56a", "packages": [ { "name": "icewind/smb", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd" + "reference": "b888dd81bd05532677e1469849d9065011256a33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/f258947a6f840cc9655ba81744872f9bb292a7dd", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/b888dd81bd05532677e1469849d9065011256a33", + "reference": "b888dd81bd05532677e1469849d9065011256a33", "shasum": "" }, "require": { @@ -45,7 +45,7 @@ } ], "description": "php wrapper for smbclient and libsmbclient-php", - "time": "2018-01-19T14:36:36+00:00" + "time": "2018-03-28T13:51:31+00:00" }, { "name": "icewind/streams", diff --git a/apps/files_external/3rdparty/composer/autoload_classmap.php b/apps/files_external/3rdparty/composer/autoload_classmap.php index d51895234b4..b4a1d64eb0f 100644 --- a/apps/files_external/3rdparty/composer/autoload_classmap.php +++ b/apps/files_external/3rdparty/composer/autoload_classmap.php @@ -72,20 +72,21 @@ return array( 'Icewind\\Streams\\PathWrapper' => $vendorDir . '/icewind/streams/src/PathWrapper.php', 'Icewind\\Streams\\RetryWrapper' => $vendorDir . '/icewind/streams/src/RetryWrapper.php', 'Icewind\\Streams\\SeekableWrapper' => $vendorDir . '/icewind/streams/src/SeekableWrapper.php', - 'Icewind\\Streams\\Tests\\CallbackWrapper' => $vendorDir . '/icewind/streams/tests/CallbackWrapper.php', + 'Icewind\\Streams\\Tests\\CallbackWrapperTest' => $vendorDir . '/icewind/streams/tests/CallbackWrapperTest.php', + 'Icewind\\Streams\\Tests\\CountWrapperTest' => $vendorDir . '/icewind/streams/tests/CountWrapperTest.php', 'Icewind\\Streams\\Tests\\DirectoryFilter' => $vendorDir . '/icewind/streams/tests/DirectoryFilter.php', 'Icewind\\Streams\\Tests\\DirectoryWrapper' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperDummy' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperNull' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\FailWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\IteratorDirectory' => $vendorDir . '/icewind/streams/tests/IteratorDirectory.php', - 'Icewind\\Streams\\Tests\\NullWrapper' => $vendorDir . '/icewind/streams/tests/NullWrapper.php', + 'Icewind\\Streams\\Tests\\NullWrapperTest' => $vendorDir . '/icewind/streams/tests/NullWrapperTest.php', 'Icewind\\Streams\\Tests\\PartialWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\PathWrapper' => $vendorDir . '/icewind/streams/tests/PathWrapper.php', - 'Icewind\\Streams\\Tests\\RetryWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', + 'Icewind\\Streams\\Tests\\RetryWrapperTest' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\SeekableWrapper' => $vendorDir . '/icewind/streams/tests/SeekableWrapper.php', 'Icewind\\Streams\\Tests\\UrlCallBack' => $vendorDir . '/icewind/streams/tests/UrlCallBack.php', - 'Icewind\\Streams\\Tests\\Wrapper' => $vendorDir . '/icewind/streams/tests/Wrapper.php', + 'Icewind\\Streams\\Tests\\WrapperTest' => $vendorDir . '/icewind/streams/tests/WrapperTest.php', 'Icewind\\Streams\\Url' => $vendorDir . '/icewind/streams/src/Url.php', 'Icewind\\Streams\\UrlCallback' => $vendorDir . '/icewind/streams/src/UrlCallBack.php', 'Icewind\\Streams\\Wrapper' => $vendorDir . '/icewind/streams/src/Wrapper.php', diff --git a/apps/files_external/3rdparty/composer/autoload_static.php b/apps/files_external/3rdparty/composer/autoload_static.php index 51739b6b6cd..68698ad1bf8 100644 --- a/apps/files_external/3rdparty/composer/autoload_static.php +++ b/apps/files_external/3rdparty/composer/autoload_static.php @@ -102,20 +102,21 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3 'Icewind\\Streams\\PathWrapper' => __DIR__ . '/..' . '/icewind/streams/src/PathWrapper.php', 'Icewind\\Streams\\RetryWrapper' => __DIR__ . '/..' . '/icewind/streams/src/RetryWrapper.php', 'Icewind\\Streams\\SeekableWrapper' => __DIR__ . '/..' . '/icewind/streams/src/SeekableWrapper.php', - 'Icewind\\Streams\\Tests\\CallbackWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/CallbackWrapper.php', + 'Icewind\\Streams\\Tests\\CallbackWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/CallbackWrapperTest.php', + 'Icewind\\Streams\\Tests\\CountWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/CountWrapperTest.php', 'Icewind\\Streams\\Tests\\DirectoryFilter' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryFilter.php', 'Icewind\\Streams\\Tests\\DirectoryWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperDummy' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperNull' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\FailWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\IteratorDirectory' => __DIR__ . '/..' . '/icewind/streams/tests/IteratorDirectory.php', - 'Icewind\\Streams\\Tests\\NullWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/NullWrapper.php', + 'Icewind\\Streams\\Tests\\NullWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/NullWrapperTest.php', 'Icewind\\Streams\\Tests\\PartialWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\PathWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/PathWrapper.php', - 'Icewind\\Streams\\Tests\\RetryWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', + 'Icewind\\Streams\\Tests\\RetryWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\SeekableWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/SeekableWrapper.php', 'Icewind\\Streams\\Tests\\UrlCallBack' => __DIR__ . '/..' . '/icewind/streams/tests/UrlCallBack.php', - 'Icewind\\Streams\\Tests\\Wrapper' => __DIR__ . '/..' . '/icewind/streams/tests/Wrapper.php', + 'Icewind\\Streams\\Tests\\WrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/WrapperTest.php', 'Icewind\\Streams\\Url' => __DIR__ . '/..' . '/icewind/streams/src/Url.php', 'Icewind\\Streams\\UrlCallback' => __DIR__ . '/..' . '/icewind/streams/src/UrlCallBack.php', 'Icewind\\Streams\\Wrapper' => __DIR__ . '/..' . '/icewind/streams/src/Wrapper.php', diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json index 640bebc9175..0ae6be99ffd 100644 --- a/apps/files_external/3rdparty/composer/installed.json +++ b/apps/files_external/3rdparty/composer/installed.json @@ -1,17 +1,17 @@ [ { "name": "icewind/smb", - "version": "v2.0.4", - "version_normalized": "2.0.4.0", + "version": "v2.0.5", + "version_normalized": "2.0.5.0", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd" + "reference": "b888dd81bd05532677e1469849d9065011256a33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/f258947a6f840cc9655ba81744872f9bb292a7dd", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/b888dd81bd05532677e1469849d9065011256a33", + "reference": "b888dd81bd05532677e1469849d9065011256a33", "shasum": "" }, "require": { @@ -21,9 +21,9 @@ "require-dev": { "phpunit/phpunit": "^4.8" }, - "time": "2018-01-19T14:36:36+00:00", + "time": "2018-03-28T13:51:31+00:00", "type": "library", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-4": { "Icewind\\SMB\\": "src/", diff --git a/apps/files_external/3rdparty/icewind/smb/src/Connection.php b/apps/files_external/3rdparty/icewind/smb/src/Connection.php index 0196231b082..661a361ec54 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Connection.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Connection.php @@ -34,10 +34,14 @@ class Connection extends RawConnection { parent::write($input . PHP_EOL); } + /** + * @throws ConnectException + */ public function clearTillPrompt() { $this->write(''); do { $promptLine = $this->readLine(); + $this->parser->checkConnectionError($promptLine); } while (!$this->isPrompt($promptLine)); $this->write(''); $this->readLine(); diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php new file mode 100644 index 00000000000..f12bb3a3489 --- /dev/null +++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php @@ -0,0 +1,10 @@ +<?php +/** + * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Licensed under the MIT license: + * http://opensource.org/licenses/MIT + */ + +namespace Icewind\SMB\Exception; + +class InvalidArgumentException extends InvalidRequestException {} diff --git a/apps/files_external/3rdparty/icewind/smb/src/Parser.php b/apps/files_external/3rdparty/icewind/smb/src/Parser.php index c6515002657..a30032178b1 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Parser.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Parser.php @@ -81,6 +81,7 @@ class Parser { * @throws AuthenticationException * @throws InvalidHostException * @throws NoLoginServerException + * @throws AccessDeniedException */ public function checkConnectionError($line) { $line = rtrim($line, ')'); @@ -99,6 +100,9 @@ class Parser { if (substr($line, -26) === ErrorCodes::NoLogonServers) { throw new NoLoginServerException('No login server'); } + if (substr($line, -23) === ErrorCodes::AccessDenied) { + throw new AccessDeniedException('Access denied'); + } } public function parseMode($mode) { @@ -133,7 +137,7 @@ class Parser { return [ 'mtime' => strtotime($data['write_time']), 'mode' => hexdec(substr($data['attributes'], strpos($data['attributes'], '('), -1)), - 'size' => isset($data['stream']) ? (int)explode(' ', $data['stream'])[1] : 0 + 'size' => isset($data['stream']) ? (int)(explode(' ', $data['stream'])[1]) : 0 ]; } diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js index 94277458b2e..83eeded4bde 100644 --- a/apps/files_external/l10n/sk.js +++ b/apps/files_external/l10n/sk.js @@ -119,8 +119,11 @@ OC.L10N.register( "Delete" : "Zmazať", "Allow users to mount external storage" : "Povoliť používateľom pripojiť externé úložiská", "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská", + "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s", + "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s", "OpenStack" : "OpenStack", "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach", "Are you sure you want to delete this external storage" : "Naozaj chcete zmazať toto externé úložisko?" diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json index 8fc84346148..0a84c569dfb 100644 --- a/apps/files_external/l10n/sk.json +++ b/apps/files_external/l10n/sk.json @@ -117,8 +117,11 @@ "Delete" : "Zmazať", "Allow users to mount external storage" : "Povoliť používateľom pripojiť externé úložiská", "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská", + "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s", + "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s", "OpenStack" : "OpenStack", "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach", "Are you sure you want to delete this external storage" : "Naozaj chcete zmazať toto externé úložisko?" diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php index e09591b37c0..dc1018f88a5 100644 --- a/apps/files_sharing/lib/ShareBackend/File.php +++ b/apps/files_sharing/lib/ShareBackend/File.php @@ -207,8 +207,15 @@ class File implements \OCP\Share_Backend_File_Dependent { if (isset($source['parent'])) { $parent = $source['parent']; while (isset($parent)) { - $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1); - $item = $query->execute(array($parent))->fetchRow(); + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $qb->select('parent', 'uid_owner') + ->from('share') + ->where( + $qb->expr()->eq('id', $qb->createNamedParameter($parent)) + ); + $result = $qb->execute(); + $item = $result->fetch(); + $result->closeCursor(); if (isset($item['parent'])) { $parent = $item['parent']; } else { diff --git a/apps/files_sharing/lib/ShareBackend/Folder.php b/apps/files_sharing/lib/ShareBackend/Folder.php index c48a26300a2..8cd639d047d 100644 --- a/apps/files_sharing/lib/ShareBackend/Folder.php +++ b/apps/files_sharing/lib/ShareBackend/Folder.php @@ -41,6 +41,9 @@ class Folder extends File implements \OCP\Share_Backend_Collection { public function getParents($itemSource, $shareWith = null, $owner = null) { $result = array(); $parent = $this->getParentId($itemSource); + + $userManager = \OC::$server->getUserManager(); + while ($parent) { $shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner); if ($shares) { @@ -49,8 +52,11 @@ class Folder extends File implements \OCP\Share_Backend_Collection { $share['collection']['path'] = $name; $share['collection']['item_type'] = 'folder'; $share['file_path'] = $name; - $displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']); - $displayNameShareWith = \OCP\User::getDisplayName($share['share_with']); + + $ownerUser = $userManager->get($share['uid_owner']); + $displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName(); + $shareWithUser = $userManager->get($share['share_with']); + $displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName(); $share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner']; $share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner']; @@ -70,35 +76,62 @@ class Folder extends File implements \OCP\Share_Backend_Collection { * @return mixed parent ID or null */ private function getParentId($child) { - $query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); - $result = $query->execute(array($child)); - $row = $result->fetchRow(); + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $qb->select('parent') + ->from('filecache') + ->where( + $qb->expr()->eq('fileid', $qb->createNamedParameter($child)) + ); + $result = $qb->execute(); + $row = $result->fetch(); + $result->closeCursor(); return $row ? $row['parent'] : null; } public function getChildren($itemSource) { $children = array(); $parents = array($itemSource); - $query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?'); - $result = $query->execute(array('httpd/unix-directory')); + + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $qb->select('id') + ->from('mimetypes') + ->where( + $qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory')) + ); + $result = $qb->execute(); + $row = $result->fetch(); + $result->closeCursor(); + if ($row = $result->fetchRow()) { $mimetype = (int) $row['id']; } else { $mimetype = -1; } while (!empty($parents)) { - $parents = "'".implode("','", $parents)."'"; - $query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`' - .' WHERE `parent` IN ('.$parents.')'); - $result = $query->execute(); + + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + + $parents = array_map(function($parent) use ($qb) { + return $qb->createNamedParameter($parent); + }, $parents); + + $qb->select('`fileid', 'name', '`mimetype') + ->from('filecache') + ->where( + $qb->expr()->in('parent', $parents) + ); + + $result = $qb->execute(); + $parents = array(); - while ($file = $result->fetchRow()) { + while ($file = $result->fetch()) { $children[] = array('source' => $file['fileid'], 'file_path' => $file['name']); // If a child folder is found look inside it if ((int) $file['mimetype'] === $mimetype) { $parents[] = $file['fileid']; } } + $result->closeCursor(); } return $children; } diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php index 9b60255ed97..ca649768d71 100644 --- a/apps/files_sharing/tests/ShareTest.php +++ b/apps/files_sharing/tests/ShareTest.php @@ -63,10 +63,6 @@ class ShareTest extends TestCase { self::$tempStorage = null; - // clear database table - $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`'); - $query->execute(); - parent::tearDown(); } diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index 3b1ccb71a94..e49b696e68a 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -120,8 +120,9 @@ abstract class TestCase extends \Test\TestCase { } protected function tearDown() { - $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`'); - $query->execute(); + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $qb->delete('share'); + $qb->execute(); parent::tearDown(); } @@ -206,16 +207,15 @@ abstract class TestCase extends \Test\TestCase { * @return array with: item_source, share_type, share_with, item_type, permissions */ protected function getShareFromId($shareID) { - $sql = 'SELECT `item_source`, `share_type`, `share_with`, `item_type`, `permissions` FROM `*PREFIX*share` WHERE `id` = ?'; - $args = array($shareID); - $query = \OCP\DB::prepare($sql); - $result = $query->execute($args); - - $share = Null; - - if ($result) { - $share = $result->fetchRow(); - } + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $qb->select('item_source', '`share_type', 'share_with', 'item_type', 'permissions') + ->from('share') + ->where( + $qb->expr()->eq('id', $qb->createNamedParameter($shareID)) + ); + $result = $qb->execute(); + $share = $result->fetch(); + $result->closeCursor(); return $share; diff --git a/apps/files_versions/l10n/he.js b/apps/files_versions/l10n/he.js index 0003a2fee17..09e655c422f 100644 --- a/apps/files_versions/l10n/he.js +++ b/apps/files_versions/l10n/he.js @@ -5,6 +5,8 @@ OC.L10N.register( "Versions" : "גרסאות", "Failed to revert {file} to revision {timestamp}." : "נכשל אחזור {file} לגרסה {timestamp}.", "_%n byte_::_%n bytes_" : ["%n בייט","%n בייטים"], - "Restore" : "שחזור" + "Restore" : "שחזור", + "No earlier versions available" : "אין גרסאות קודמות זמינות", + "More versions …" : "גרסאות נוספות…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_versions/l10n/he.json b/apps/files_versions/l10n/he.json index d7cbb74d802..380df68f971 100644 --- a/apps/files_versions/l10n/he.json +++ b/apps/files_versions/l10n/he.json @@ -3,6 +3,8 @@ "Versions" : "גרסאות", "Failed to revert {file} to revision {timestamp}." : "נכשל אחזור {file} לגרסה {timestamp}.", "_%n byte_::_%n bytes_" : ["%n בייט","%n בייטים"], - "Restore" : "שחזור" + "Restore" : "שחזור", + "No earlier versions available" : "אין גרסאות קודמות זמינות", + "More versions …" : "גרסאות נוספות…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/oauth2/l10n/he.js b/apps/oauth2/l10n/he.js new file mode 100644 index 00000000000..250205239a8 --- /dev/null +++ b/apps/oauth2/l10n/he.js @@ -0,0 +1,14 @@ +OC.L10N.register( + "oauth2", + { + "OAuth 2.0" : "OAuth 2.0", + "OAuth 2.0 clients" : "לקוחות OAuth 2.0", + "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 מאפשר לשירותים חיצוניים לבקש גישה אל %s.", + "Name" : "שם", + "Redirection URI" : "כתובת הפנייה", + "Client Identifier" : "זיהוי לקו", + "Secret" : "סוד", + "Add client" : "הוספת לקוחי", + "Add" : "הוספה" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/oauth2/l10n/he.json b/apps/oauth2/l10n/he.json new file mode 100644 index 00000000000..09505d77302 --- /dev/null +++ b/apps/oauth2/l10n/he.json @@ -0,0 +1,12 @@ +{ "translations": { + "OAuth 2.0" : "OAuth 2.0", + "OAuth 2.0 clients" : "לקוחות OAuth 2.0", + "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 מאפשר לשירותים חיצוניים לבקש גישה אל %s.", + "Name" : "שם", + "Redirection URI" : "כתובת הפנייה", + "Client Identifier" : "זיהוי לקו", + "Secret" : "סוד", + "Add client" : "הוספת לקוחי", + "Add" : "הוספה" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/oauth2/l10n/sk.js b/apps/oauth2/l10n/sk.js index 5de3a2a5144..977ffe779a0 100644 --- a/apps/oauth2/l10n/sk.js +++ b/apps/oauth2/l10n/sk.js @@ -1,6 +1,7 @@ OC.L10N.register( "oauth2", { + "OAuth 2.0" : "OAuth 2.0", "OAuth 2.0 clients" : "klienti OAuth 2.0", "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 umožňuje externým službám vyžiadať prístup k %s.", "Name" : "Názov", diff --git a/apps/oauth2/l10n/sk.json b/apps/oauth2/l10n/sk.json index bb8e9db4caf..bc0e014f859 100644 --- a/apps/oauth2/l10n/sk.json +++ b/apps/oauth2/l10n/sk.json @@ -1,4 +1,5 @@ { "translations": { + "OAuth 2.0" : "OAuth 2.0", "OAuth 2.0 clients" : "klienti OAuth 2.0", "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 umožňuje externým službám vyžiadať prístup k %s.", "Name" : "Názov", diff --git a/apps/oauth2/l10n/zh_TW.js b/apps/oauth2/l10n/zh_TW.js index 2eda8ab0a98..3a8d4c21c6c 100644 --- a/apps/oauth2/l10n/zh_TW.js +++ b/apps/oauth2/l10n/zh_TW.js @@ -1,13 +1,14 @@ OC.L10N.register( "oauth2", { - "OAuth 2.0 clients" : "OAuth 2.0 用戶端", - "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0允許其他裝置存取 %s.", + "OAuth 2.0" : "OAuth 2.0", + "OAuth 2.0 clients" : "OAuth 2.0 客戶端", + "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 允許其他裝置存取 %s", "Name" : "名稱", - "Redirection URI" : "URI轉向", - "Client Identifier" : "用戶辨識", - "Secret" : "秘密", - "Add client" : "新增用戶", + "Redirection URI" : "重導向 URI", + "Client Identifier" : "用戶識別", + "Secret" : "秘密口令 (Secret)", + "Add client" : "新增客戶端", "Add" : "新增" }, "nplurals=1; plural=0;"); diff --git a/apps/oauth2/l10n/zh_TW.json b/apps/oauth2/l10n/zh_TW.json index 7bdcfd0833e..c125265fdb5 100644 --- a/apps/oauth2/l10n/zh_TW.json +++ b/apps/oauth2/l10n/zh_TW.json @@ -1,11 +1,12 @@ { "translations": { - "OAuth 2.0 clients" : "OAuth 2.0 用戶端", - "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0允許其他裝置存取 %s.", + "OAuth 2.0" : "OAuth 2.0", + "OAuth 2.0 clients" : "OAuth 2.0 客戶端", + "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 允許其他裝置存取 %s", "Name" : "名稱", - "Redirection URI" : "URI轉向", - "Client Identifier" : "用戶辨識", - "Secret" : "秘密", - "Add client" : "新增用戶", + "Redirection URI" : "重導向 URI", + "Client Identifier" : "用戶識別", + "Secret" : "秘密口令 (Secret)", + "Add client" : "新增客戶端", "Add" : "新增" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/theming/l10n/af.js b/apps/theming/l10n/af.js index cb94e465c09..d0074943d6b 100644 --- a/apps/theming/l10n/af.js +++ b/apps/theming/l10n/af.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Ontbrekende tydelike gids", "No file uploaded" : "Geen lêer opgelaai", "Unsupported image type" : "Onondersteunde beeldtipe", - "You are already using a custom theme" : "U gebruik reeds ’n pasgemaakte tema", "Name" : "Naam", "Reset to default" : "Herstel na verstek", "Web address" : "Webadres", @@ -27,6 +26,7 @@ OC.L10N.register( "Login image" : "Aantekenbeeld", "Upload new login background" : "Laai nuwe aantekenagtergrond op", "Remove background image" : "Verwyder agtergrondbeeld", + "You are already using a custom theme" : "U gebruik reeds ’n pasgemaakte tema", "reset to default" : "herstel na verstek", "There is no error, the file uploaded with success" : "Geen fout is teëgekom nie, die lêer is met suksesvol opgelaai", "The uploaded file was only partially uploaded" : "Die opgelaaide lêer is slegs gedeeltelik opgelaai" diff --git a/apps/theming/l10n/af.json b/apps/theming/l10n/af.json index ff48d10853b..2893d111ded 100644 --- a/apps/theming/l10n/af.json +++ b/apps/theming/l10n/af.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Ontbrekende tydelike gids", "No file uploaded" : "Geen lêer opgelaai", "Unsupported image type" : "Onondersteunde beeldtipe", - "You are already using a custom theme" : "U gebruik reeds ’n pasgemaakte tema", "Name" : "Naam", "Reset to default" : "Herstel na verstek", "Web address" : "Webadres", @@ -25,6 +24,7 @@ "Login image" : "Aantekenbeeld", "Upload new login background" : "Laai nuwe aantekenagtergrond op", "Remove background image" : "Verwyder agtergrondbeeld", + "You are already using a custom theme" : "U gebruik reeds ’n pasgemaakte tema", "reset to default" : "herstel na verstek", "There is no error, the file uploaded with success" : "Geen fout is teëgekom nie, die lêer is met suksesvol opgelaai", "The uploaded file was only partially uploaded" : "Die opgelaaide lêer is slegs gedeeltelik opgelaai" diff --git a/apps/theming/l10n/ar.js b/apps/theming/l10n/ar.js index 00e5054f8c7..ddf7b4c4558 100644 --- a/apps/theming/l10n/ar.js +++ b/apps/theming/l10n/ar.js @@ -13,7 +13,6 @@ OC.L10N.register( "Missing a temporary folder" : "المجلد المؤقت غير موجود", "No file uploaded" : "لم يتم رفع الملف", "Unsupported image type" : "صيغة الصورة غير مقبولة", - "You are already using a custom theme" : "انت تستعمل قالب مخصص", "Theming" : "تخصيص القالب", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "السمات تجعل من الممكن بسهولة تخصيص الشكل والمظهر لنموذجك ودعم العملاء. سيكون هذا مرئيا لجميع المستخدمين.", "Name" : "الاسم", @@ -27,6 +26,7 @@ OC.L10N.register( "Login image" : "صورة الدخول", "Upload new login background" : "تحميل خلفية جديدة للدخول", "Remove background image" : "إزالة صورة الخلفية", + "You are already using a custom theme" : "انت تستعمل قالب مخصص", "reset to default" : "إلغاء كل التغييرات", "Failed to write file to disk." : "خطأ في الكتابة على القرص الصلب." }, diff --git a/apps/theming/l10n/ar.json b/apps/theming/l10n/ar.json index 7e809c2d6de..16f3027613b 100644 --- a/apps/theming/l10n/ar.json +++ b/apps/theming/l10n/ar.json @@ -11,7 +11,6 @@ "Missing a temporary folder" : "المجلد المؤقت غير موجود", "No file uploaded" : "لم يتم رفع الملف", "Unsupported image type" : "صيغة الصورة غير مقبولة", - "You are already using a custom theme" : "انت تستعمل قالب مخصص", "Theming" : "تخصيص القالب", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "السمات تجعل من الممكن بسهولة تخصيص الشكل والمظهر لنموذجك ودعم العملاء. سيكون هذا مرئيا لجميع المستخدمين.", "Name" : "الاسم", @@ -25,6 +24,7 @@ "Login image" : "صورة الدخول", "Upload new login background" : "تحميل خلفية جديدة للدخول", "Remove background image" : "إزالة صورة الخلفية", + "You are already using a custom theme" : "انت تستعمل قالب مخصص", "reset to default" : "إلغاء كل التغييرات", "Failed to write file to disk." : "خطأ في الكتابة على القرص الصلب." },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" diff --git a/apps/theming/l10n/ast.js b/apps/theming/l10n/ast.js index 0926fc24acf..6268908327c 100644 --- a/apps/theming/l10n/ast.js +++ b/apps/theming/l10n/ast.js @@ -11,7 +11,6 @@ OC.L10N.register( "No file was uploaded" : "Nun se xubieron fichjeros", "No file uploaded" : "Nun se xubieron ficheros", "Unsupported image type" : "Triba non sofitada d'imaxe", - "You are already using a custom theme" : "Yá tas usando un tema personalizáu", "Name" : "Nome", "Web address" : "Direición web", "Web address https://…" : "Direición web https://…", @@ -22,6 +21,7 @@ OC.L10N.register( "Login image" : "Imaxe d'aniciu de sesión", "Upload new login background" : "Xubir fondu nuevu d'aniciu de sesión", "Remove background image" : "Desaniciar imaxe de fondu", + "You are already using a custom theme" : "Yá tas usando un tema personalizáu", "reset to default" : "reafitar", "Failed to write file to disk." : "Fallu al escribir el ficheru nel discu" }, diff --git a/apps/theming/l10n/ast.json b/apps/theming/l10n/ast.json index 865b1619801..a711e659ca6 100644 --- a/apps/theming/l10n/ast.json +++ b/apps/theming/l10n/ast.json @@ -9,7 +9,6 @@ "No file was uploaded" : "Nun se xubieron fichjeros", "No file uploaded" : "Nun se xubieron ficheros", "Unsupported image type" : "Triba non sofitada d'imaxe", - "You are already using a custom theme" : "Yá tas usando un tema personalizáu", "Name" : "Nome", "Web address" : "Direición web", "Web address https://…" : "Direición web https://…", @@ -20,6 +19,7 @@ "Login image" : "Imaxe d'aniciu de sesión", "Upload new login background" : "Xubir fondu nuevu d'aniciu de sesión", "Remove background image" : "Desaniciar imaxe de fondu", + "You are already using a custom theme" : "Yá tas usando un tema personalizáu", "reset to default" : "reafitar", "Failed to write file to disk." : "Fallu al escribir el ficheru nel discu" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/theming/l10n/bg.js b/apps/theming/l10n/bg.js index 76300d63cea..939408d1964 100644 --- a/apps/theming/l10n/bg.js +++ b/apps/theming/l10n/bg.js @@ -10,7 +10,6 @@ OC.L10N.register( "The given color is invalid" : "Избраният цвят е невалиден", "No file uploaded" : "Няма качен файл", "Unsupported image type" : "Неподдържан тип изображение", - "You are already using a custom theme" : "Вие вече използвате персонализирана тема", "Theming" : "Теми", "Name" : "Име", "Web address" : "Уеб адрес", @@ -21,6 +20,7 @@ OC.L10N.register( "Upload new logo" : "Качване на ново лого", "Login image" : "Изображение при вписване", "Upload new login background" : "Качване на нов фон за входа", + "You are already using a custom theme" : "Вие вече използвате персонализирана тема", "reset to default" : "възстановяване към стандартни" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/theming/l10n/bg.json b/apps/theming/l10n/bg.json index e6f21eb7f70..3b0db9e4a96 100644 --- a/apps/theming/l10n/bg.json +++ b/apps/theming/l10n/bg.json @@ -8,7 +8,6 @@ "The given color is invalid" : "Избраният цвят е невалиден", "No file uploaded" : "Няма качен файл", "Unsupported image type" : "Неподдържан тип изображение", - "You are already using a custom theme" : "Вие вече използвате персонализирана тема", "Theming" : "Теми", "Name" : "Име", "Web address" : "Уеб адрес", @@ -19,6 +18,7 @@ "Upload new logo" : "Качване на ново лого", "Login image" : "Изображение при вписване", "Upload new login background" : "Качване на нов фон за входа", + "You are already using a custom theme" : "Вие вече използвате персонализирана тема", "reset to default" : "възстановяване към стандартни" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/l10n/ca.js b/apps/theming/l10n/ca.js index 878056036b7..f0b24291eda 100644 --- a/apps/theming/l10n/ca.js +++ b/apps/theming/l10n/ca.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "El color donat no és vàlid", "No file uploaded" : "No s'ha carregat cap fitxer", "Unsupported image type" : "Tipus d'imatge no compatible", - "You are already using a custom theme" : "Ja esteu utilitzant un tema personalitzat", "Theming" : "Adaptació de temes", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "L'adaptació de temes permet personalitzar fàcilment l'aspecte de la vostra instància i els clients compatibles. Això serà visible per a tots els usuaris.", "Name" : "Nom", @@ -25,6 +24,7 @@ OC.L10N.register( "Login image" : "Login logo", "Upload new login background" : "Carregar nou fons d'inici de sessió", "Remove background image" : "Elimina la imatge de fons", + "You are already using a custom theme" : "Ja esteu utilitzant un tema personalitzat", "reset to default" : "restablir a configuració predeterminada" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/theming/l10n/ca.json b/apps/theming/l10n/ca.json index 6036d885f2e..c26241baaf4 100644 --- a/apps/theming/l10n/ca.json +++ b/apps/theming/l10n/ca.json @@ -9,7 +9,6 @@ "The given color is invalid" : "El color donat no és vàlid", "No file uploaded" : "No s'ha carregat cap fitxer", "Unsupported image type" : "Tipus d'imatge no compatible", - "You are already using a custom theme" : "Ja esteu utilitzant un tema personalitzat", "Theming" : "Adaptació de temes", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "L'adaptació de temes permet personalitzar fàcilment l'aspecte de la vostra instància i els clients compatibles. Això serà visible per a tots els usuaris.", "Name" : "Nom", @@ -23,6 +22,7 @@ "Login image" : "Login logo", "Upload new login background" : "Carregar nou fons d'inici de sessió", "Remove background image" : "Elimina la imatge de fons", + "You are already using a custom theme" : "Ja esteu utilitzant un tema personalitzat", "reset to default" : "restablir a configuració predeterminada" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/l10n/cs.js b/apps/theming/l10n/cs.js index a8fd82c5721..3d56fef0d2e 100644 --- a/apps/theming/l10n/cs.js +++ b/apps/theming/l10n/cs.js @@ -16,7 +16,6 @@ OC.L10N.register( "Missing a temporary folder" : "Chybí adresář pro dočasné soubory", "No file uploaded" : "Nenahrán žádný soubor", "Unsupported image type" : "Nepodporovaný typ obrázku", - "You are already using a custom theme" : "Již používáte vlastní motiv", "Theming" : "Motivy", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Motivy umožňují jednoduché přizpůsobení vzhledu vaší instance a podporovaných klientů. Tato přizpůsobení uvidí všichni uživatelé.", "Name" : "Název", @@ -31,6 +30,7 @@ OC.L10N.register( "Upload new login background" : "Nahrát nové přihlašovací pozadí", "Remove background image" : "Odebrat obrázek pozadí", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Nainstalujte rozšíření Imagemagick PHP s podporou obrázků SVG, které automaticky generuje favicony na základě nahraného loga a barvy.", + "You are already using a custom theme" : "Již používáte vlastní motiv", "reset to default" : "obnovit výchozí", "There is no error, the file uploaded with success" : "Nenastala žádná chyba, soubor byl úspěšně nahrán", "The uploaded file was only partially uploaded" : "Nahraný soubor byl nahrán pouze částečně", diff --git a/apps/theming/l10n/cs.json b/apps/theming/l10n/cs.json index b59f1e44654..6040528d3da 100644 --- a/apps/theming/l10n/cs.json +++ b/apps/theming/l10n/cs.json @@ -14,7 +14,6 @@ "Missing a temporary folder" : "Chybí adresář pro dočasné soubory", "No file uploaded" : "Nenahrán žádný soubor", "Unsupported image type" : "Nepodporovaný typ obrázku", - "You are already using a custom theme" : "Již používáte vlastní motiv", "Theming" : "Motivy", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Motivy umožňují jednoduché přizpůsobení vzhledu vaší instance a podporovaných klientů. Tato přizpůsobení uvidí všichni uživatelé.", "Name" : "Název", @@ -29,6 +28,7 @@ "Upload new login background" : "Nahrát nové přihlašovací pozadí", "Remove background image" : "Odebrat obrázek pozadí", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Nainstalujte rozšíření Imagemagick PHP s podporou obrázků SVG, které automaticky generuje favicony na základě nahraného loga a barvy.", + "You are already using a custom theme" : "Již používáte vlastní motiv", "reset to default" : "obnovit výchozí", "There is no error, the file uploaded with success" : "Nenastala žádná chyba, soubor byl úspěšně nahrán", "The uploaded file was only partially uploaded" : "Nahraný soubor byl nahrán pouze částečně", diff --git a/apps/theming/l10n/da.js b/apps/theming/l10n/da.js index 6ab7b8f2663..cd91d9ecde3 100644 --- a/apps/theming/l10n/da.js +++ b/apps/theming/l10n/da.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Manglende midlertidig mappe.", "No file uploaded" : "Ingen fil uploadet", "Unsupported image type" : "Ikke-understøttet billede format", - "You are already using a custom theme" : "Du bruger allerede et brugerdefineret tema", "Theming" : "Temaer", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming gør det muligt nemt at tilpasse udseendet på din installation og understøttede klienter. Dette vil være synlig for alle brugere.", "Name" : "Navn", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Upload nyt login billede", "Remove background image" : "Fjern baggrundsbillede", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installer Imagemagick PHP udvidelsen med SVG support for automatisk at genererer favikoner baseret på the uploadede logo og farver.", + "You are already using a custom theme" : "Du bruger allerede et brugerdefineret tema", "reset to default" : "nulstil til standardindstillinger ", "There is no error, the file uploaded with success" : "Der skete ingen fejl, filen blev succesfuldt uploadet", "The uploaded file was only partially uploaded" : "Filen blev kun delvist uploadet.", diff --git a/apps/theming/l10n/da.json b/apps/theming/l10n/da.json index 3579da8f4a1..9d6035c748f 100644 --- a/apps/theming/l10n/da.json +++ b/apps/theming/l10n/da.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Manglende midlertidig mappe.", "No file uploaded" : "Ingen fil uploadet", "Unsupported image type" : "Ikke-understøttet billede format", - "You are already using a custom theme" : "Du bruger allerede et brugerdefineret tema", "Theming" : "Temaer", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming gør det muligt nemt at tilpasse udseendet på din installation og understøttede klienter. Dette vil være synlig for alle brugere.", "Name" : "Navn", @@ -28,6 +27,7 @@ "Upload new login background" : "Upload nyt login billede", "Remove background image" : "Fjern baggrundsbillede", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installer Imagemagick PHP udvidelsen med SVG support for automatisk at genererer favikoner baseret på the uploadede logo og farver.", + "You are already using a custom theme" : "Du bruger allerede et brugerdefineret tema", "reset to default" : "nulstil til standardindstillinger ", "There is no error, the file uploaded with success" : "Der skete ingen fejl, filen blev succesfuldt uploadet", "The uploaded file was only partially uploaded" : "Filen blev kun delvist uploadet.", diff --git a/apps/theming/l10n/de.js b/apps/theming/l10n/de.js index dfd7ea4deec..6435fb7bead 100644 --- a/apps/theming/l10n/de.js +++ b/apps/theming/l10n/de.js @@ -20,7 +20,7 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Eine PHP-Erweiterung hat das Hochladen der Datei gestoppt", "No file uploaded" : "Keine Datei hochgeladen", "Unsupported image type" : "Nicht unterstütztes Bild-Format", - "You are already using a custom theme" : "Du benutzt bereits ein eigenes Thema", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Du benutzt bereits ein benutzerdefiniertes Theme. Eine App für Themes würde dies überschreiben.", "Theming" : "Theming", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming ermöglicht es auf einfache Weise das Aussehen Deiner Installation und Clients anzupassen. Die Änderungen wirken sich auf alle Benutzer aus.", "Name" : "Name", @@ -35,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Neuen Anmelde-Hintergrund hochladen", "Remove background image" : "Entferne Hintergrundbild", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installiere die Imagemagick PHP-Erweiterung mit Unterstützung für SVG-Bilder, um automatisch Favoriten-Icons auf Basis des hochgeladenen Icons und der Farbe zu erstellen.", + "You are already using a custom theme" : "Du benutzt bereits ein eigenes Thema", "reset to default" : "Auf Standard zurücksetzen", "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", diff --git a/apps/theming/l10n/de.json b/apps/theming/l10n/de.json index ead02f1d4c7..80f36772bab 100644 --- a/apps/theming/l10n/de.json +++ b/apps/theming/l10n/de.json @@ -18,7 +18,7 @@ "A PHP extension stopped the file upload" : "Eine PHP-Erweiterung hat das Hochladen der Datei gestoppt", "No file uploaded" : "Keine Datei hochgeladen", "Unsupported image type" : "Nicht unterstütztes Bild-Format", - "You are already using a custom theme" : "Du benutzt bereits ein eigenes Thema", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Du benutzt bereits ein benutzerdefiniertes Theme. Eine App für Themes würde dies überschreiben.", "Theming" : "Theming", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming ermöglicht es auf einfache Weise das Aussehen Deiner Installation und Clients anzupassen. Die Änderungen wirken sich auf alle Benutzer aus.", "Name" : "Name", @@ -33,6 +33,7 @@ "Upload new login background" : "Neuen Anmelde-Hintergrund hochladen", "Remove background image" : "Entferne Hintergrundbild", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installiere die Imagemagick PHP-Erweiterung mit Unterstützung für SVG-Bilder, um automatisch Favoriten-Icons auf Basis des hochgeladenen Icons und der Farbe zu erstellen.", + "You are already using a custom theme" : "Du benutzt bereits ein eigenes Thema", "reset to default" : "Auf Standard zurücksetzen", "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", diff --git a/apps/theming/l10n/de_DE.js b/apps/theming/l10n/de_DE.js index 951a63ebe63..022566c2ee3 100644 --- a/apps/theming/l10n/de_DE.js +++ b/apps/theming/l10n/de_DE.js @@ -20,7 +20,7 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Eine PHP-Erweiterung hat das Hochladen der Datei gestoppt", "No file uploaded" : "Keine Datei hochgeladen", "Unsupported image type" : "Nicht unterstütztes Bild-Format", - "You are already using a custom theme" : "Sie benutzen bereits ein eigenes Thema", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Sie benutzen bereits ein benutzerdefiniertes Theme. Eine App für Themes würde dies überschreiben.", "Theming" : "Theming", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming ermöglicht es auf einfache Weise das Aussehen Ihrer Installation und Clients anzupassen. Die Änderungen wirken sich auf alle Benutzer aus.", "Name" : "Name", @@ -35,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Neuen Anmelde-Hintergrund hochladen", "Remove background image" : "Entferne Hintergrundbild", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installieren Sie die Imagemagick PHP-Erweiterung mit Unterstützung für SVG-Bilder, um automatisch Favoriten-Icons auf Basis des hochgeladenen Icons und der Farbe zu erstellen.", + "You are already using a custom theme" : "Sie benutzen bereits ein eigenes Thema", "reset to default" : "Auf Standard zurücksetzen", "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", diff --git a/apps/theming/l10n/de_DE.json b/apps/theming/l10n/de_DE.json index 921903aad7d..2cb934e738f 100644 --- a/apps/theming/l10n/de_DE.json +++ b/apps/theming/l10n/de_DE.json @@ -18,7 +18,7 @@ "A PHP extension stopped the file upload" : "Eine PHP-Erweiterung hat das Hochladen der Datei gestoppt", "No file uploaded" : "Keine Datei hochgeladen", "Unsupported image type" : "Nicht unterstütztes Bild-Format", - "You are already using a custom theme" : "Sie benutzen bereits ein eigenes Thema", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Sie benutzen bereits ein benutzerdefiniertes Theme. Eine App für Themes würde dies überschreiben.", "Theming" : "Theming", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming ermöglicht es auf einfache Weise das Aussehen Ihrer Installation und Clients anzupassen. Die Änderungen wirken sich auf alle Benutzer aus.", "Name" : "Name", @@ -33,6 +33,7 @@ "Upload new login background" : "Neuen Anmelde-Hintergrund hochladen", "Remove background image" : "Entferne Hintergrundbild", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installieren Sie die Imagemagick PHP-Erweiterung mit Unterstützung für SVG-Bilder, um automatisch Favoriten-Icons auf Basis des hochgeladenen Icons und der Farbe zu erstellen.", + "You are already using a custom theme" : "Sie benutzen bereits ein eigenes Thema", "reset to default" : "Auf Standard zurücksetzen", "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", diff --git a/apps/theming/l10n/el.js b/apps/theming/l10n/el.js index 462c89eafff..c1ec988c1f3 100644 --- a/apps/theming/l10n/el.js +++ b/apps/theming/l10n/el.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Λείπει κάποιος προσωρινός φάκελος", "No file uploaded" : "Δεν έχει μεταφορτωθεί αρχείο", "Unsupported image type" : "Μη υποστηριζόμενος τύπος εικόνας", - "You are already using a custom theme" : "Χρησιμοποιείτε ήδη προσαρμοσμένο θέμα", "Theming" : "Προσαρμογή θέματος", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Η προσαρμογή θέματος καθιστά δυνατή την εύκολη προσαρμογή της εμφάνισης της εμφάνισης της εγκατάστασής σας καθώς και των υποστηριζόμενων πελατών. Αυτή θα είναι ορατή για όλους τους χρήστες.", "Name" : "Όνομα", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Μεταφόρτωση νέου παρασκηνίου εισόδου", "Remove background image" : "Αφαίρεση εικόνας παρασκηνίου", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Εγκαταστήστε την επέκταση PHP Imagemagick με υποστήριξη SVG εικόνων, για να γίνει αυτόματη δημιουργία favicon βασισμένο πάνω στο μεταφορτωμένο λογότυπο και χρώμα.", + "You are already using a custom theme" : "Χρησιμοποιείτε ήδη προσαρμοσμένο θέμα", "reset to default" : "επαναφορά στα προεπιλεγμένα", "There is no error, the file uploaded with success" : "Δεν υπάρχει σφάλμα, το αρχείο μεταφορτώθηκε με επιτυχία", "The uploaded file was only partially uploaded" : "Το μεταφορτωμένο αρχείο μεταφορτώθηκε εν μέρει", diff --git a/apps/theming/l10n/el.json b/apps/theming/l10n/el.json index f6d1c8e11a9..09dbe8f0428 100644 --- a/apps/theming/l10n/el.json +++ b/apps/theming/l10n/el.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Λείπει κάποιος προσωρινός φάκελος", "No file uploaded" : "Δεν έχει μεταφορτωθεί αρχείο", "Unsupported image type" : "Μη υποστηριζόμενος τύπος εικόνας", - "You are already using a custom theme" : "Χρησιμοποιείτε ήδη προσαρμοσμένο θέμα", "Theming" : "Προσαρμογή θέματος", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Η προσαρμογή θέματος καθιστά δυνατή την εύκολη προσαρμογή της εμφάνισης της εμφάνισης της εγκατάστασής σας καθώς και των υποστηριζόμενων πελατών. Αυτή θα είναι ορατή για όλους τους χρήστες.", "Name" : "Όνομα", @@ -28,6 +27,7 @@ "Upload new login background" : "Μεταφόρτωση νέου παρασκηνίου εισόδου", "Remove background image" : "Αφαίρεση εικόνας παρασκηνίου", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Εγκαταστήστε την επέκταση PHP Imagemagick με υποστήριξη SVG εικόνων, για να γίνει αυτόματη δημιουργία favicon βασισμένο πάνω στο μεταφορτωμένο λογότυπο και χρώμα.", + "You are already using a custom theme" : "Χρησιμοποιείτε ήδη προσαρμοσμένο θέμα", "reset to default" : "επαναφορά στα προεπιλεγμένα", "There is no error, the file uploaded with success" : "Δεν υπάρχει σφάλμα, το αρχείο μεταφορτώθηκε με επιτυχία", "The uploaded file was only partially uploaded" : "Το μεταφορτωμένο αρχείο μεταφορτώθηκε εν μέρει", diff --git a/apps/theming/l10n/en_GB.js b/apps/theming/l10n/en_GB.js index 9da73c75305..211eb6dccc1 100644 --- a/apps/theming/l10n/en_GB.js +++ b/apps/theming/l10n/en_GB.js @@ -20,7 +20,6 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "A PHP extension stopped the file upload", "No file uploaded" : "No file uploaded", "Unsupported image type" : "Unsupported image type", - "You are already using a custom theme" : "You are already using a custom theme", "Theming" : "Theming", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming makes it possible to easily customise the look and feel of your instance and supported clients. This will be visible for all users.", "Name" : "Name", @@ -35,6 +34,7 @@ OC.L10N.register( "Upload new login background" : "Upload new login background", "Remove background image" : "Remove background image", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color.", + "You are already using a custom theme" : "You are already using a custom theme", "reset to default" : "reset to default", "There is no error, the file uploaded with success" : "There is no error, the file uploaded with success", "The uploaded file was only partially uploaded" : "The uploaded file was only partially uploaded", diff --git a/apps/theming/l10n/en_GB.json b/apps/theming/l10n/en_GB.json index 5a64a942a6d..21c26cb1c2f 100644 --- a/apps/theming/l10n/en_GB.json +++ b/apps/theming/l10n/en_GB.json @@ -18,7 +18,6 @@ "A PHP extension stopped the file upload" : "A PHP extension stopped the file upload", "No file uploaded" : "No file uploaded", "Unsupported image type" : "Unsupported image type", - "You are already using a custom theme" : "You are already using a custom theme", "Theming" : "Theming", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming makes it possible to easily customise the look and feel of your instance and supported clients. This will be visible for all users.", "Name" : "Name", @@ -33,6 +32,7 @@ "Upload new login background" : "Upload new login background", "Remove background image" : "Remove background image", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color.", + "You are already using a custom theme" : "You are already using a custom theme", "reset to default" : "reset to default", "There is no error, the file uploaded with success" : "There is no error, the file uploaded with success", "The uploaded file was only partially uploaded" : "The uploaded file was only partially uploaded", diff --git a/apps/theming/l10n/es.js b/apps/theming/l10n/es.js index e1f7cd6eca9..325cee972ca 100644 --- a/apps/theming/l10n/es.js +++ b/apps/theming/l10n/es.js @@ -10,14 +10,17 @@ OC.L10N.register( "The given web address is too long" : "La dirección provista es muy larga", "The given slogan is too long" : "El eslogan provisto es muy largo", "The given color is invalid" : "El color provisto es inválido", + "The file was uploaded" : "Se ha subido el archivo", "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "El archivo para subir excede la directiva upload_max_filesize en php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo para subir excede la directiva MAX_FILE_SIZE que se especifió en el formulario HTML", "The file was only partially uploaded" : "El archivo se ha subido parcialmente", "No file was uploaded" : "No se ha subido ningún archivo", "Missing a temporary folder" : "Falta una carpeta temporal", + "Could not write file to disk" : "No se puede escribir el archivo en el disco", + "A PHP extension stopped the file upload" : "Una extensión PHP ha cancelado la subida de archivos", "No file uploaded" : "No se ha subido archivo", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Ya estás usando un tema personalizado. La configuración de la aplicación de temas puede ser sobrescrita por el.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Los temas hacen posible personalizar fácilmente la apariencia de tu instancia y los clientes soportados. Esto será visible para todos los usuarios.", "Name" : "Nombre", @@ -32,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Subir una nueva imagen de fondo", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión de PHP Imagemagick con soporte para imágenes SVG para generar automáticamente faviconos basados en el logo y color subidos.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a configuración inicial", "There is no error, the file uploaded with success" : "No ha habido errores, el archivo ha subido satisfactoriamente", "The uploaded file was only partially uploaded" : "El archivo para subir ha sido solo parcialmente subido", diff --git a/apps/theming/l10n/es.json b/apps/theming/l10n/es.json index d8d2cc502f3..e091d8d1b56 100644 --- a/apps/theming/l10n/es.json +++ b/apps/theming/l10n/es.json @@ -8,14 +8,17 @@ "The given web address is too long" : "La dirección provista es muy larga", "The given slogan is too long" : "El eslogan provisto es muy largo", "The given color is invalid" : "El color provisto es inválido", + "The file was uploaded" : "Se ha subido el archivo", "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "El archivo para subir excede la directiva upload_max_filesize en php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo para subir excede la directiva MAX_FILE_SIZE que se especifió en el formulario HTML", "The file was only partially uploaded" : "El archivo se ha subido parcialmente", "No file was uploaded" : "No se ha subido ningún archivo", "Missing a temporary folder" : "Falta una carpeta temporal", + "Could not write file to disk" : "No se puede escribir el archivo en el disco", + "A PHP extension stopped the file upload" : "Una extensión PHP ha cancelado la subida de archivos", "No file uploaded" : "No se ha subido archivo", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Ya estás usando un tema personalizado. La configuración de la aplicación de temas puede ser sobrescrita por el.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Los temas hacen posible personalizar fácilmente la apariencia de tu instancia y los clientes soportados. Esto será visible para todos los usuarios.", "Name" : "Nombre", @@ -30,6 +33,7 @@ "Upload new login background" : "Subir una nueva imagen de fondo", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión de PHP Imagemagick con soporte para imágenes SVG para generar automáticamente faviconos basados en el logo y color subidos.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a configuración inicial", "There is no error, the file uploaded with success" : "No ha habido errores, el archivo ha subido satisfactoriamente", "The uploaded file was only partially uploaded" : "El archivo para subir ha sido solo parcialmente subido", diff --git a/apps/theming/l10n/es_419.js b/apps/theming/l10n/es_419.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_419.js +++ b/apps/theming/l10n/es_419.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_419.json b/apps/theming/l10n/es_419.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_419.json +++ b/apps/theming/l10n/es_419.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_AR.js b/apps/theming/l10n/es_AR.js index 4d13f6062bd..45ad11b077e 100644 --- a/apps/theming/l10n/es_AR.js +++ b/apps/theming/l10n/es_AR.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "El color dado es inválido", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Usted ya se encuentra usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve su instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -25,6 +24,7 @@ OC.L10N.register( "Login image" : "Imágen de inicio de sesión", "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", + "You are already using a custom theme" : "Usted ya se encuentra usando un tema personalizado", "reset to default" : "restaurar a predeterminado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/theming/l10n/es_AR.json b/apps/theming/l10n/es_AR.json index eddb55bef38..fca7aff2c2e 100644 --- a/apps/theming/l10n/es_AR.json +++ b/apps/theming/l10n/es_AR.json @@ -9,7 +9,6 @@ "The given color is invalid" : "El color dado es inválido", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Usted ya se encuentra usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve su instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -23,6 +22,7 @@ "Login image" : "Imágen de inicio de sesión", "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", + "You are already using a custom theme" : "Usted ya se encuentra usando un tema personalizado", "reset to default" : "restaurar a predeterminado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/l10n/es_CL.js b/apps/theming/l10n/es_CL.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_CL.js +++ b/apps/theming/l10n/es_CL.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_CL.json b/apps/theming/l10n/es_CL.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_CL.json +++ b/apps/theming/l10n/es_CL.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_CO.js b/apps/theming/l10n/es_CO.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_CO.js +++ b/apps/theming/l10n/es_CO.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_CO.json b/apps/theming/l10n/es_CO.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_CO.json +++ b/apps/theming/l10n/es_CO.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_CR.js b/apps/theming/l10n/es_CR.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_CR.js +++ b/apps/theming/l10n/es_CR.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_CR.json b/apps/theming/l10n/es_CR.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_CR.json +++ b/apps/theming/l10n/es_CR.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_DO.js b/apps/theming/l10n/es_DO.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_DO.js +++ b/apps/theming/l10n/es_DO.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_DO.json b/apps/theming/l10n/es_DO.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_DO.json +++ b/apps/theming/l10n/es_DO.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_EC.js b/apps/theming/l10n/es_EC.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_EC.js +++ b/apps/theming/l10n/es_EC.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_EC.json b/apps/theming/l10n/es_EC.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_EC.json +++ b/apps/theming/l10n/es_EC.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_GT.js b/apps/theming/l10n/es_GT.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_GT.js +++ b/apps/theming/l10n/es_GT.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_GT.json b/apps/theming/l10n/es_GT.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_GT.json +++ b/apps/theming/l10n/es_GT.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_HN.js b/apps/theming/l10n/es_HN.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_HN.js +++ b/apps/theming/l10n/es_HN.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_HN.json b/apps/theming/l10n/es_HN.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_HN.json +++ b/apps/theming/l10n/es_HN.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_MX.js b/apps/theming/l10n/es_MX.js index 6afea9f0940..fe5f2f28f46 100644 --- a/apps/theming/l10n/es_MX.js +++ b/apps/theming/l10n/es_MX.js @@ -20,7 +20,6 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Una extensión de PHP detuvo la carga del archivo", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -35,6 +34,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_MX.json b/apps/theming/l10n/es_MX.json index 31f4534ebc2..2b39ddc99ec 100644 --- a/apps/theming/l10n/es_MX.json +++ b/apps/theming/l10n/es_MX.json @@ -18,7 +18,6 @@ "A PHP extension stopped the file upload" : "Una extensión de PHP detuvo la carga del archivo", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -33,6 +32,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_NI.js b/apps/theming/l10n/es_NI.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_NI.js +++ b/apps/theming/l10n/es_NI.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_NI.json b/apps/theming/l10n/es_NI.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_NI.json +++ b/apps/theming/l10n/es_NI.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PA.js b/apps/theming/l10n/es_PA.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_PA.js +++ b/apps/theming/l10n/es_PA.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PA.json b/apps/theming/l10n/es_PA.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_PA.json +++ b/apps/theming/l10n/es_PA.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PE.js b/apps/theming/l10n/es_PE.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_PE.js +++ b/apps/theming/l10n/es_PE.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PE.json b/apps/theming/l10n/es_PE.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_PE.json +++ b/apps/theming/l10n/es_PE.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PR.js b/apps/theming/l10n/es_PR.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_PR.js +++ b/apps/theming/l10n/es_PR.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PR.json b/apps/theming/l10n/es_PR.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_PR.json +++ b/apps/theming/l10n/es_PR.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PY.js b/apps/theming/l10n/es_PY.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_PY.js +++ b/apps/theming/l10n/es_PY.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_PY.json b/apps/theming/l10n/es_PY.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_PY.json +++ b/apps/theming/l10n/es_PY.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_SV.js b/apps/theming/l10n/es_SV.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_SV.js +++ b/apps/theming/l10n/es_SV.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_SV.json b/apps/theming/l10n/es_SV.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_SV.json +++ b/apps/theming/l10n/es_SV.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_UY.js b/apps/theming/l10n/es_UY.js index cdd4775f0b5..a5c28e1ee77 100644 --- a/apps/theming/l10n/es_UY.js +++ b/apps/theming/l10n/es_UY.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/es_UY.json b/apps/theming/l10n/es_UY.json index b8394b9026a..6099c9a9c1e 100644 --- a/apps/theming/l10n/es_UY.json +++ b/apps/theming/l10n/es_UY.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta una carpeta temporal", "No file uploaded" : "No hay archivos cargados", "Unsupported image type" : "Tipo de imagen no soportado", - "You are already using a custom theme" : "Ya estás usando un tema personalizado", "Theming" : "Tematizar", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve tu instancia y clientes soportados. Esto será visible para todos los usuarios. ", "Name" : "Nombre", @@ -28,6 +27,7 @@ "Upload new login background" : "Cargar nueva imagen de fondo para inicio de sesión", "Remove background image" : "Eliminar imagen de fondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instala la extensión Imagemagick de PHP con soporte a imagenes SVG para generar los favicons en automático con base en el logotipo cargado y el color.", + "You are already using a custom theme" : "Ya estás usando un tema personalizado", "reset to default" : "restaurar a predeterminado", "There is no error, the file uploaded with success" : "No hay errores, el archivo se cargó exitosamente", "The uploaded file was only partially uploaded" : "La carga del archivo solo se realizó parcialmente", diff --git a/apps/theming/l10n/et_EE.js b/apps/theming/l10n/et_EE.js index 4b5abd9904d..4b7474b6675 100644 --- a/apps/theming/l10n/et_EE.js +++ b/apps/theming/l10n/et_EE.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Ajutine kausta on puudu", "No file uploaded" : "Faili ei laetud üles", "Unsupported image type" : "Pildi tüüp pole toetatud", - "You are already using a custom theme" : "Kohandatud teema on juba kasutusel", "Theming" : "Teemad", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teemad võimaldavad lihtsalt serveriinstantsi ja toetatud klientide välimus muuta. See on näha kõigile kasutajatele.", "Name" : "Nimi", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Lae üles uus avalehe taustapilt", "Remove background image" : "Eemalda taustapilt", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Paigalda Imagemagick PHP laiendus SVG piltide toega, et üleslaetud logo ja värvi põhjal automaatselt faviconid genereerida. ", + "You are already using a custom theme" : "Kohandatud teema on juba kasutusel", "reset to default" : "taasta vaikeseaded", "There is no error, the file uploaded with success" : "Vigu pole, fail laetu edukalt üles", "The uploaded file was only partially uploaded" : "Üleslatud fail laeti üles ainult osaliselt", diff --git a/apps/theming/l10n/et_EE.json b/apps/theming/l10n/et_EE.json index 56625bfee84..f8d45cd2e7b 100644 --- a/apps/theming/l10n/et_EE.json +++ b/apps/theming/l10n/et_EE.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Ajutine kausta on puudu", "No file uploaded" : "Faili ei laetud üles", "Unsupported image type" : "Pildi tüüp pole toetatud", - "You are already using a custom theme" : "Kohandatud teema on juba kasutusel", "Theming" : "Teemad", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teemad võimaldavad lihtsalt serveriinstantsi ja toetatud klientide välimus muuta. See on näha kõigile kasutajatele.", "Name" : "Nimi", @@ -28,6 +27,7 @@ "Upload new login background" : "Lae üles uus avalehe taustapilt", "Remove background image" : "Eemalda taustapilt", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Paigalda Imagemagick PHP laiendus SVG piltide toega, et üleslaetud logo ja värvi põhjal automaatselt faviconid genereerida. ", + "You are already using a custom theme" : "Kohandatud teema on juba kasutusel", "reset to default" : "taasta vaikeseaded", "There is no error, the file uploaded with success" : "Vigu pole, fail laetu edukalt üles", "The uploaded file was only partially uploaded" : "Üleslatud fail laeti üles ainult osaliselt", diff --git a/apps/theming/l10n/fi.js b/apps/theming/l10n/fi.js index 70bddbe21f0..942b2f781ae 100644 --- a/apps/theming/l10n/fi.js +++ b/apps/theming/l10n/fi.js @@ -19,7 +19,6 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "PHP-laajennus pysäytti tiedoston lähettämisen", "No file uploaded" : "Ei tiedostoa lähetetty", "Unsupported image type" : "Ei-tuettu kuvatiedostomuoto", - "You are already using a custom theme" : "Käytät jo kustomoitua ulkoasua", "Theming" : "Teema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teeman avulla voit helposti kustomoida web-käyttöliittymän ja tuettujen sovelluksien ulkonäköä ja tuntumaa. Teema näkyy kaikille käyttäjille.", "Name" : "Nimi", @@ -33,6 +32,7 @@ OC.L10N.register( "Login image" : "Kirjautumissivun kuva", "Upload new login background" : "Lähetä uusi kirjautumissivun taustakuva", "Remove background image" : "Poista taustakuva", + "You are already using a custom theme" : "Käytät jo kustomoitua ulkoasua", "reset to default" : "palauta oletukseksi", "There is no error, the file uploaded with success" : "Ei virhettä, tiedosto lähetettiin onnistuneesti", "The uploaded file was only partially uploaded" : "Lähetetty tiedosto lähetettiin vain osittain", diff --git a/apps/theming/l10n/fi.json b/apps/theming/l10n/fi.json index 97f2229bd05..53fea953b9f 100644 --- a/apps/theming/l10n/fi.json +++ b/apps/theming/l10n/fi.json @@ -17,7 +17,6 @@ "A PHP extension stopped the file upload" : "PHP-laajennus pysäytti tiedoston lähettämisen", "No file uploaded" : "Ei tiedostoa lähetetty", "Unsupported image type" : "Ei-tuettu kuvatiedostomuoto", - "You are already using a custom theme" : "Käytät jo kustomoitua ulkoasua", "Theming" : "Teema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teeman avulla voit helposti kustomoida web-käyttöliittymän ja tuettujen sovelluksien ulkonäköä ja tuntumaa. Teema näkyy kaikille käyttäjille.", "Name" : "Nimi", @@ -31,6 +30,7 @@ "Login image" : "Kirjautumissivun kuva", "Upload new login background" : "Lähetä uusi kirjautumissivun taustakuva", "Remove background image" : "Poista taustakuva", + "You are already using a custom theme" : "Käytät jo kustomoitua ulkoasua", "reset to default" : "palauta oletukseksi", "There is no error, the file uploaded with success" : "Ei virhettä, tiedosto lähetettiin onnistuneesti", "The uploaded file was only partially uploaded" : "Lähetetty tiedosto lähetettiin vain osittain", diff --git a/apps/theming/l10n/fr.js b/apps/theming/l10n/fr.js index 8f5fa1a9bc1..41da238b982 100644 --- a/apps/theming/l10n/fr.js +++ b/apps/theming/l10n/fr.js @@ -20,7 +20,6 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Une extension PHP a arrêté le téléversement du fichier", "No file uploaded" : "Aucun fichier téléversé", "Unsupported image type" : "Ce type d'image n'est pas pris en charge", - "You are already using a custom theme" : "Vous utilisez déjà un thème personnalisé", "Theming" : "Personnaliser l'apparence", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Cette extension permet de personnaliser facilement l'apparence de votre instance et des clients supportés. La personnalisation de l'apparence sera visible par tous les utilisateurs.", "Name" : "Nom", @@ -35,6 +34,7 @@ OC.L10N.register( "Upload new login background" : "Téléverser un nouvel arrière-plan de connexion", "Remove background image" : "Supprimer l'image en arrière-plan", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installez l'extension PHP Imagemagick avec le support pour les images SVG afin de générer automatiquement les favicons sur base du logo téléversé et de la couleur.", + "You are already using a custom theme" : "Vous utilisez déjà un thème personnalisé", "reset to default" : "Restaurer les valeurs par défaut", "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été téléversé avec succès", "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement téléversé", diff --git a/apps/theming/l10n/fr.json b/apps/theming/l10n/fr.json index 2f468a5c22c..f46fda707ae 100644 --- a/apps/theming/l10n/fr.json +++ b/apps/theming/l10n/fr.json @@ -18,7 +18,6 @@ "A PHP extension stopped the file upload" : "Une extension PHP a arrêté le téléversement du fichier", "No file uploaded" : "Aucun fichier téléversé", "Unsupported image type" : "Ce type d'image n'est pas pris en charge", - "You are already using a custom theme" : "Vous utilisez déjà un thème personnalisé", "Theming" : "Personnaliser l'apparence", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Cette extension permet de personnaliser facilement l'apparence de votre instance et des clients supportés. La personnalisation de l'apparence sera visible par tous les utilisateurs.", "Name" : "Nom", @@ -33,6 +32,7 @@ "Upload new login background" : "Téléverser un nouvel arrière-plan de connexion", "Remove background image" : "Supprimer l'image en arrière-plan", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installez l'extension PHP Imagemagick avec le support pour les images SVG afin de générer automatiquement les favicons sur base du logo téléversé et de la couleur.", + "You are already using a custom theme" : "Vous utilisez déjà un thème personnalisé", "reset to default" : "Restaurer les valeurs par défaut", "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été téléversé avec succès", "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement téléversé", diff --git a/apps/theming/l10n/hu.js b/apps/theming/l10n/hu.js index dd159fa0ad1..f3ade1c2d24 100644 --- a/apps/theming/l10n/hu.js +++ b/apps/theming/l10n/hu.js @@ -16,7 +16,6 @@ OC.L10N.register( "Missing a temporary folder" : "Átmeneti mappa hiányzik", "No file uploaded" : "Nincs fájl feltöltve", "Unsupported image type" : "Nem támogatott képtípus", - "You are already using a custom theme" : "Már egyedi témát használ", "Theming" : "Témázás", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "A témák lehetőve teszik, hogy könnyedén személyre szabja a kinézetét az oldalnak, és a támogatott klienseknek. Ez minden felhasználó számára látható lesz.", "Name" : "Név", @@ -31,6 +30,7 @@ OC.L10N.register( "Upload new login background" : "Új bejelentkező kép feltöltése", "Remove background image" : "Háttérkép eltávolítása", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Telepítsd az Imagemagick PHP kiterjesztést SVG kép támogatással a feltöltött logóból és színből való automatikus favikon generáláshoz.", + "You are already using a custom theme" : "Már egyedi témát használ", "reset to default" : "Visszaállítás alapértelmezettre", "There is no error, the file uploaded with success" : "Nincs hiba, a feltöltés sikeres", "The uploaded file was only partially uploaded" : "Csak részben került feltöltésre a fájl", diff --git a/apps/theming/l10n/hu.json b/apps/theming/l10n/hu.json index 7746605f3f6..cb1195c1783 100644 --- a/apps/theming/l10n/hu.json +++ b/apps/theming/l10n/hu.json @@ -14,7 +14,6 @@ "Missing a temporary folder" : "Átmeneti mappa hiányzik", "No file uploaded" : "Nincs fájl feltöltve", "Unsupported image type" : "Nem támogatott képtípus", - "You are already using a custom theme" : "Már egyedi témát használ", "Theming" : "Témázás", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "A témák lehetőve teszik, hogy könnyedén személyre szabja a kinézetét az oldalnak, és a támogatott klienseknek. Ez minden felhasználó számára látható lesz.", "Name" : "Név", @@ -29,6 +28,7 @@ "Upload new login background" : "Új bejelentkező kép feltöltése", "Remove background image" : "Háttérkép eltávolítása", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Telepítsd az Imagemagick PHP kiterjesztést SVG kép támogatással a feltöltött logóból és színből való automatikus favikon generáláshoz.", + "You are already using a custom theme" : "Már egyedi témát használ", "reset to default" : "Visszaállítás alapértelmezettre", "There is no error, the file uploaded with success" : "Nincs hiba, a feltöltés sikeres", "The uploaded file was only partially uploaded" : "Csak részben került feltöltésre a fájl", diff --git a/apps/theming/l10n/is.js b/apps/theming/l10n/is.js index cac75748d81..57948f63684 100644 --- a/apps/theming/l10n/is.js +++ b/apps/theming/l10n/is.js @@ -16,7 +16,6 @@ OC.L10N.register( "Missing a temporary folder" : "Vantar bráðabirgðamöppu", "No file uploaded" : "Engin skrá var send inn", "Unsupported image type" : "Óstudd gerð myndar", - "You are already using a custom theme" : "Þú ert nú þegar að nota sérsniðið þema", "Theming" : "Þemu", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Þemu gera þér kleift að breyta útliti og hegðun þíns eintaks af viðmótinu auk studdra biðlaraforrita. Það verður sýnilegt öllum notendum.", "Name" : "Heiti", @@ -31,6 +30,7 @@ OC.L10N.register( "Upload new login background" : "Senda inn nýjan bakgrunn innskráningar", "Remove background image" : "Fjarlægja bakgrunnsmynd", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Settu inn Imagemagick PHP forritsviðaukann með stuðningi við SVG-myndir til að útbúa sjálfvirkt veftáknmyndir byggðar á innsendu táknmerki og lit.", + "You are already using a custom theme" : "Þú ert nú þegar að nota sérsniðið þema", "reset to default" : "endurstilla á sjálfgefið", "There is no error, the file uploaded with success" : "Engin villa, innsending heppnaðist", "The uploaded file was only partially uploaded" : "Einungis hluti af innsendri skrá skilaði sér", diff --git a/apps/theming/l10n/is.json b/apps/theming/l10n/is.json index f4daea94ce2..29f5eed372a 100644 --- a/apps/theming/l10n/is.json +++ b/apps/theming/l10n/is.json @@ -14,7 +14,6 @@ "Missing a temporary folder" : "Vantar bráðabirgðamöppu", "No file uploaded" : "Engin skrá var send inn", "Unsupported image type" : "Óstudd gerð myndar", - "You are already using a custom theme" : "Þú ert nú þegar að nota sérsniðið þema", "Theming" : "Þemu", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Þemu gera þér kleift að breyta útliti og hegðun þíns eintaks af viðmótinu auk studdra biðlaraforrita. Það verður sýnilegt öllum notendum.", "Name" : "Heiti", @@ -29,6 +28,7 @@ "Upload new login background" : "Senda inn nýjan bakgrunn innskráningar", "Remove background image" : "Fjarlægja bakgrunnsmynd", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Settu inn Imagemagick PHP forritsviðaukann með stuðningi við SVG-myndir til að útbúa sjálfvirkt veftáknmyndir byggðar á innsendu táknmerki og lit.", + "You are already using a custom theme" : "Þú ert nú þegar að nota sérsniðið þema", "reset to default" : "endurstilla á sjálfgefið", "There is no error, the file uploaded with success" : "Engin villa, innsending heppnaðist", "The uploaded file was only partially uploaded" : "Einungis hluti af innsendri skrá skilaði sér", diff --git a/apps/theming/l10n/it.js b/apps/theming/l10n/it.js index 38336fa644c..b4b593ac690 100644 --- a/apps/theming/l10n/it.js +++ b/apps/theming/l10n/it.js @@ -20,7 +20,7 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Un'estensione PHP ha fermato il caricamento del file", "No file uploaded" : "Nessun file caricato", "Unsupported image type" : "Tipo di immagine non supportato", - "You are already using a custom theme" : "Stai già usando un tema personalizzato", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Stai già utilizzando un tema personalizzato. Le impostazioni dell'applicazione dei temi potrebbero essere sovrascritte.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "La gestione dei temi rende semplice la personalizzazione dell'aspetto della tua istanza e dei client supportati. Ciò sarà visibile a tutti gli utenti.", "Name" : "Nome", @@ -35,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Carica nuovo sfondo di accesso", "Remove background image" : "Rimuovi immagine di sfondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installa l'estensione Imagemacick di PHP con supporto per le immagini SVG per generare automaticamente favicon basate sul logo caricato e sul colore.", + "You are already using a custom theme" : "Stai già usando un tema personalizzato", "reset to default" : "ripristina valori predefiniti", "There is no error, the file uploaded with success" : "Non ci sono errori, il file è stato caricato correttamente", "The uploaded file was only partially uploaded" : "Il file è stato caricato solo parzialmente", diff --git a/apps/theming/l10n/it.json b/apps/theming/l10n/it.json index 421762f0c20..e430f2791f5 100644 --- a/apps/theming/l10n/it.json +++ b/apps/theming/l10n/it.json @@ -18,7 +18,7 @@ "A PHP extension stopped the file upload" : "Un'estensione PHP ha fermato il caricamento del file", "No file uploaded" : "Nessun file caricato", "Unsupported image type" : "Tipo di immagine non supportato", - "You are already using a custom theme" : "Stai già usando un tema personalizzato", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Stai già utilizzando un tema personalizzato. Le impostazioni dell'applicazione dei temi potrebbero essere sovrascritte.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "La gestione dei temi rende semplice la personalizzazione dell'aspetto della tua istanza e dei client supportati. Ciò sarà visibile a tutti gli utenti.", "Name" : "Nome", @@ -33,6 +33,7 @@ "Upload new login background" : "Carica nuovo sfondo di accesso", "Remove background image" : "Rimuovi immagine di sfondo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installa l'estensione Imagemacick di PHP con supporto per le immagini SVG per generare automaticamente favicon basate sul logo caricato e sul colore.", + "You are already using a custom theme" : "Stai già usando un tema personalizzato", "reset to default" : "ripristina valori predefiniti", "There is no error, the file uploaded with success" : "Non ci sono errori, il file è stato caricato correttamente", "The uploaded file was only partially uploaded" : "Il file è stato caricato solo parzialmente", diff --git a/apps/theming/l10n/ja.js b/apps/theming/l10n/ja.js index a7394662ead..df03dc04d3f 100644 --- a/apps/theming/l10n/ja.js +++ b/apps/theming/l10n/ja.js @@ -14,7 +14,6 @@ OC.L10N.register( "Missing a temporary folder" : "一時領域フォルダーがありません", "No file uploaded" : "ファイルがアップロードされていません", "Unsupported image type" : "サポートされていない画像形式です", - "You are already using a custom theme" : "あなたは既にカスタムテーマを利用しています", "Theming" : "テーマ", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "テーマではあなたのインスタンスとサポートされたクライアントのルック＆フィールを簡単に変更できます。この変更は全てのユーザが対象となります。", "Name" : "名前", @@ -28,6 +27,7 @@ OC.L10N.register( "Login image" : "ログイン画像", "Upload new login background" : "新しいログイン背景画像をアップロード", "Remove background image" : "背景画像を削除", + "You are already using a custom theme" : "あなたは既にカスタムテーマを利用しています", "reset to default" : "デフォルトに戻す", "There is no error, the file uploaded with success" : "ファイルはエラーなくアップロードされました", "Failed to write file to disk." : "ファイルをディスクに書き込めませんでした", diff --git a/apps/theming/l10n/ja.json b/apps/theming/l10n/ja.json index 879fe17b09f..772f9e259fb 100644 --- a/apps/theming/l10n/ja.json +++ b/apps/theming/l10n/ja.json @@ -12,7 +12,6 @@ "Missing a temporary folder" : "一時領域フォルダーがありません", "No file uploaded" : "ファイルがアップロードされていません", "Unsupported image type" : "サポートされていない画像形式です", - "You are already using a custom theme" : "あなたは既にカスタムテーマを利用しています", "Theming" : "テーマ", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "テーマではあなたのインスタンスとサポートされたクライアントのルック＆フィールを簡単に変更できます。この変更は全てのユーザが対象となります。", "Name" : "名前", @@ -26,6 +25,7 @@ "Login image" : "ログイン画像", "Upload new login background" : "新しいログイン背景画像をアップロード", "Remove background image" : "背景画像を削除", + "You are already using a custom theme" : "あなたは既にカスタムテーマを利用しています", "reset to default" : "デフォルトに戻す", "There is no error, the file uploaded with success" : "ファイルはエラーなくアップロードされました", "Failed to write file to disk." : "ファイルをディスクに書き込めませんでした", diff --git a/apps/theming/l10n/ka_GE.js b/apps/theming/l10n/ka_GE.js index d51ff0dfecf..9ced9526a92 100644 --- a/apps/theming/l10n/ka_GE.js +++ b/apps/theming/l10n/ka_GE.js @@ -16,7 +16,6 @@ OC.L10N.register( "Missing a temporary folder" : "დროებითი დირექტორია არ არსებობს", "No file uploaded" : "ფაილი არ იქნა ატვირთული", "Unsupported image type" : "ამ სურათის სახეობა არაა მხარდაჭერილი", - "You are already using a custom theme" : "თქვენ პერზონალიზირებულ ვიზუალურ თემას უკვე იყენებთ", "Theming" : "ვიზუალური თემები", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "ვიზუალური თემები საშუალებას გაძლევთ თქვენს ინსტანციას და მხარდაჭერილ კლიენტებს მარტივად გაუწიოთ გამოსახულებას პერსონალიზაცია. ეს გამოჩნდება ყველა მომხმარებელთან.", "Name" : "სახელი", @@ -31,6 +30,7 @@ OC.L10N.register( "Upload new login background" : "ლოგინის ახალი ფონის ატვირთვა", "Remove background image" : "ფონური სურათის მოშორება", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "SVG სურთების მხარდაჭერის მქონე Imagemagick PHP გაფართოების დაყენება ფავიკონებს ატვირთული ლოგოსა და ფერის მიხევით დააგენერირებს ავტომატურად.", + "You are already using a custom theme" : "თქვენ პერზონალიზირებულ ვიზუალურ თემას უკვე იყენებთ", "reset to default" : "დაბრუნება საწყისზე", "There is no error, the file uploaded with success" : "ეს არაა შეცდომა, ფაილი წარმატებით აიტვირთა", "The uploaded file was only partially uploaded" : "ფაილი აიტვირთა მხოლოდ ნაწილობრივ", diff --git a/apps/theming/l10n/ka_GE.json b/apps/theming/l10n/ka_GE.json index 1b639ae1d31..4f9c81895ea 100644 --- a/apps/theming/l10n/ka_GE.json +++ b/apps/theming/l10n/ka_GE.json @@ -14,7 +14,6 @@ "Missing a temporary folder" : "დროებითი დირექტორია არ არსებობს", "No file uploaded" : "ფაილი არ იქნა ატვირთული", "Unsupported image type" : "ამ სურათის სახეობა არაა მხარდაჭერილი", - "You are already using a custom theme" : "თქვენ პერზონალიზირებულ ვიზუალურ თემას უკვე იყენებთ", "Theming" : "ვიზუალური თემები", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "ვიზუალური თემები საშუალებას გაძლევთ თქვენს ინსტანციას და მხარდაჭერილ კლიენტებს მარტივად გაუწიოთ გამოსახულებას პერსონალიზაცია. ეს გამოჩნდება ყველა მომხმარებელთან.", "Name" : "სახელი", @@ -29,6 +28,7 @@ "Upload new login background" : "ლოგინის ახალი ფონის ატვირთვა", "Remove background image" : "ფონური სურათის მოშორება", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "SVG სურთების მხარდაჭერის მქონე Imagemagick PHP გაფართოების დაყენება ფავიკონებს ატვირთული ლოგოსა და ფერის მიხევით დააგენერირებს ავტომატურად.", + "You are already using a custom theme" : "თქვენ პერზონალიზირებულ ვიზუალურ თემას უკვე იყენებთ", "reset to default" : "დაბრუნება საწყისზე", "There is no error, the file uploaded with success" : "ეს არაა შეცდომა, ფაილი წარმატებით აიტვირთა", "The uploaded file was only partially uploaded" : "ფაილი აიტვირთა მხოლოდ ნაწილობრივ", diff --git a/apps/theming/l10n/ko.js b/apps/theming/l10n/ko.js index 95927e9da12..872d1973464 100644 --- a/apps/theming/l10n/ko.js +++ b/apps/theming/l10n/ko.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "임시 폴더 없음", "No file uploaded" : "업로드한 파일 없음", "Unsupported image type" : "지원하지 않는 사진 형식", - "You are already using a custom theme" : "이미 사용자 정의 테마 사용 중", "Theming" : "테마", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "테마를 사용하여 내 인스턴스와 지원하는 클라이언트의 모습을 변경할 수 있습니다. 테마는 모든 사용자에게 적용됩니다.", "Name" : "이름", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "새 로그인 배경 업로드", "Remove background image" : "배경 그림 삭제", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "업로드한 로고와 색으로부터 자동으로 파비콘을 생성하려면 PHP Imagemagick 확장 기능 및 SVG 형식 그림 지원을 설치하십시오.", + "You are already using a custom theme" : "이미 사용자 정의 테마 사용 중", "reset to default" : "기본값으로 초기화", "There is no error, the file uploaded with success" : "오류 없음, 파일 업로드 성공", "The uploaded file was only partially uploaded" : "파일이 일부분만 업로드됨", diff --git a/apps/theming/l10n/ko.json b/apps/theming/l10n/ko.json index 9b367272beb..5f3e5deab3d 100644 --- a/apps/theming/l10n/ko.json +++ b/apps/theming/l10n/ko.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "임시 폴더 없음", "No file uploaded" : "업로드한 파일 없음", "Unsupported image type" : "지원하지 않는 사진 형식", - "You are already using a custom theme" : "이미 사용자 정의 테마 사용 중", "Theming" : "테마", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "테마를 사용하여 내 인스턴스와 지원하는 클라이언트의 모습을 변경할 수 있습니다. 테마는 모든 사용자에게 적용됩니다.", "Name" : "이름", @@ -28,6 +27,7 @@ "Upload new login background" : "새 로그인 배경 업로드", "Remove background image" : "배경 그림 삭제", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "업로드한 로고와 색으로부터 자동으로 파비콘을 생성하려면 PHP Imagemagick 확장 기능 및 SVG 형식 그림 지원을 설치하십시오.", + "You are already using a custom theme" : "이미 사용자 정의 테마 사용 중", "reset to default" : "기본값으로 초기화", "There is no error, the file uploaded with success" : "오류 없음, 파일 업로드 성공", "The uploaded file was only partially uploaded" : "파일이 일부분만 업로드됨", diff --git a/apps/theming/l10n/lt_LT.js b/apps/theming/l10n/lt_LT.js index 7208e111c4f..4d5bacf2817 100644 --- a/apps/theming/l10n/lt_LT.js +++ b/apps/theming/l10n/lt_LT.js @@ -5,19 +5,28 @@ OC.L10N.register( "Saved" : "Įrašyta", "Admin" : "Administravimas", "a safe home for all your data" : "saugūs namai visiems jūsų duomenims", + "Name cannot be empty" : "Pavadinimas negali būti tuščias", "The given name is too long" : "Nurodytas pavadinimas yra per ilgas", "The given web address is too long" : "Nurodytas adresas yra per ilgas", "The given slogan is too long" : "Nurodytas šūkis yra per ilgas", "The given color is invalid" : "Nurodyta spalva yra neteisinga", + "The file was uploaded" : "Failas buvo įkeltas", + "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Įkeliamas failas viršija upload_max_filesize direktyvą, esančią faile php.ini", + "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Įkeliamas failas viršija MAX_FILE_SIZE direktyvą, kuri buvo nurodyta HTML formoje", + "The file was only partially uploaded" : "Failas buvo tik dalinai įkeltas", + "No file was uploaded" : "Nebuvo įkeltas joks failas", + "Missing a temporary folder" : "Trūksta laikinojo aplanko", + "Could not write file to disk" : "Nepavyko įrašyti failą į diską", + "A PHP extension stopped the file upload" : "PHP plėtinys sustabdė failo įkėlimą", "No file uploaded" : "Neįkeltas joks failas", "Unsupported image type" : "Nepalaikomas paveikslo tipas", - "You are already using a custom theme" : "Jūs jau naudojate tinkintą temą", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Jūs jau naudojate tinkintą temą. Temų programėlės nustatymai gali būti perrašyti tos temos.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Temos leidžia lengvai tinkinti jūsų egzemplioriaus ir palaikomų klientų išvaizdą ir turinį. Tai bus matoma visiems naudotojams. ", "Name" : "Pavadinimas", "Reset to default" : "Atstatyti į numatytąją", "Web address" : "Saityno adresas", - "Web address https://…" : "Saityno adresas https://…", + "Web address https://…" : "Saityno adresas https://…", "Slogan" : "Šūkis", "Color" : "Spalva", "Logo" : "Logotipas", @@ -25,6 +34,12 @@ OC.L10N.register( "Login image" : "Prisijungimo paveikslas", "Upload new login background" : "Įkelti naują prisijungimo foną", "Remove background image" : "Šalinti foninį paveikslą", - "reset to default" : "atstatyta į numatytąją" + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Norėdami automatiškai generuoti svetainės piktogramą remiantis įkeltu logotipu ir spalva, įdiekite Imagemagick PHP plėtinį su SVG paveikslų palaikymu.", + "You are already using a custom theme" : "Jūs jau naudojate tinkintą temą", + "reset to default" : "atstatyta į numatytąją", + "There is no error, the file uploaded with success" : "Klaidų nėra, failas buvo sėkmingai įkeltas", + "The uploaded file was only partially uploaded" : "Įkeliamas failas buvo tik dalinai įkeltas", + "Failed to write file to disk." : "Nepavyko įrašyti failą į diską.", + "A PHP extension stopped the file upload." : "PHP plėtinys sustabdė failo įkėlimą." }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/theming/l10n/lt_LT.json b/apps/theming/l10n/lt_LT.json index 4d858cfe66d..2dd75243c9e 100644 --- a/apps/theming/l10n/lt_LT.json +++ b/apps/theming/l10n/lt_LT.json @@ -3,19 +3,28 @@ "Saved" : "Įrašyta", "Admin" : "Administravimas", "a safe home for all your data" : "saugūs namai visiems jūsų duomenims", + "Name cannot be empty" : "Pavadinimas negali būti tuščias", "The given name is too long" : "Nurodytas pavadinimas yra per ilgas", "The given web address is too long" : "Nurodytas adresas yra per ilgas", "The given slogan is too long" : "Nurodytas šūkis yra per ilgas", "The given color is invalid" : "Nurodyta spalva yra neteisinga", + "The file was uploaded" : "Failas buvo įkeltas", + "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Įkeliamas failas viršija upload_max_filesize direktyvą, esančią faile php.ini", + "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Įkeliamas failas viršija MAX_FILE_SIZE direktyvą, kuri buvo nurodyta HTML formoje", + "The file was only partially uploaded" : "Failas buvo tik dalinai įkeltas", + "No file was uploaded" : "Nebuvo įkeltas joks failas", + "Missing a temporary folder" : "Trūksta laikinojo aplanko", + "Could not write file to disk" : "Nepavyko įrašyti failą į diską", + "A PHP extension stopped the file upload" : "PHP plėtinys sustabdė failo įkėlimą", "No file uploaded" : "Neįkeltas joks failas", "Unsupported image type" : "Nepalaikomas paveikslo tipas", - "You are already using a custom theme" : "Jūs jau naudojate tinkintą temą", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Jūs jau naudojate tinkintą temą. Temų programėlės nustatymai gali būti perrašyti tos temos.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Temos leidžia lengvai tinkinti jūsų egzemplioriaus ir palaikomų klientų išvaizdą ir turinį. Tai bus matoma visiems naudotojams. ", "Name" : "Pavadinimas", "Reset to default" : "Atstatyti į numatytąją", "Web address" : "Saityno adresas", - "Web address https://…" : "Saityno adresas https://…", + "Web address https://…" : "Saityno adresas https://…", "Slogan" : "Šūkis", "Color" : "Spalva", "Logo" : "Logotipas", @@ -23,6 +32,12 @@ "Login image" : "Prisijungimo paveikslas", "Upload new login background" : "Įkelti naują prisijungimo foną", "Remove background image" : "Šalinti foninį paveikslą", - "reset to default" : "atstatyta į numatytąją" + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Norėdami automatiškai generuoti svetainės piktogramą remiantis įkeltu logotipu ir spalva, įdiekite Imagemagick PHP plėtinį su SVG paveikslų palaikymu.", + "You are already using a custom theme" : "Jūs jau naudojate tinkintą temą", + "reset to default" : "atstatyta į numatytąją", + "There is no error, the file uploaded with success" : "Klaidų nėra, failas buvo sėkmingai įkeltas", + "The uploaded file was only partially uploaded" : "Įkeliamas failas buvo tik dalinai įkeltas", + "Failed to write file to disk." : "Nepavyko įrašyti failą į diską.", + "A PHP extension stopped the file upload." : "PHP plėtinys sustabdė failo įkėlimą." },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/theming/l10n/lv.js b/apps/theming/l10n/lv.js index b4d012e5c63..6aaa3864368 100644 --- a/apps/theming/l10n/lv.js +++ b/apps/theming/l10n/lv.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "Norādītā krāsa ir nederīga", "No file uploaded" : "Nav augšupielādēta datne", "Unsupported image type" : "Neatbalstīts attēla tips", - "You are already using a custom theme" : "Tu jau izmanto pielāgotu tēmu", "Theming" : "Dizains", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Tēmošana padara iespējamu viegli pielāgot savas instances un atbalstošo klientaplikāciju izskatu un sajūtu. Tas būs redzams visiem lietotājiem.", "Name" : "Nosaukums", @@ -25,6 +24,7 @@ OC.L10N.register( "Login image" : "Pieslēgšanās fona attēls", "Upload new login background" : "Augšupielādēt jaunu pieslēgšanās fona attēlu", "Remove background image" : "Noņemt fona attēlu", + "You are already using a custom theme" : "Tu jau izmanto pielāgotu tēmu", "reset to default" : "Atiestatīt" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/theming/l10n/lv.json b/apps/theming/l10n/lv.json index 3a2e29f8d88..bf67f89547c 100644 --- a/apps/theming/l10n/lv.json +++ b/apps/theming/l10n/lv.json @@ -9,7 +9,6 @@ "The given color is invalid" : "Norādītā krāsa ir nederīga", "No file uploaded" : "Nav augšupielādēta datne", "Unsupported image type" : "Neatbalstīts attēla tips", - "You are already using a custom theme" : "Tu jau izmanto pielāgotu tēmu", "Theming" : "Dizains", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Tēmošana padara iespējamu viegli pielāgot savas instances un atbalstošo klientaplikāciju izskatu un sajūtu. Tas būs redzams visiem lietotājiem.", "Name" : "Nosaukums", @@ -23,6 +22,7 @@ "Login image" : "Pieslēgšanās fona attēls", "Upload new login background" : "Augšupielādēt jaunu pieslēgšanās fona attēlu", "Remove background image" : "Noņemt fona attēlu", + "You are already using a custom theme" : "Tu jau izmanto pielāgotu tēmu", "reset to default" : "Atiestatīt" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/theming/l10n/mn.js b/apps/theming/l10n/mn.js index c250147dec1..942ea752eab 100644 --- a/apps/theming/l10n/mn.js +++ b/apps/theming/l10n/mn.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "Өнгө буруу байна", "No file uploaded" : "Файл илгээгдсэнгүй", "Unsupported image type" : "Дэмжигдэхгүй зургийн төрөл байна", - "You are already using a custom theme" : "Та тусгай загварчлал ашиглаж байна", "Theming" : "Загварчлал", "Name" : "Нэр", "Reset to default" : "Анхны байдлаар сэргээх", @@ -24,6 +23,7 @@ OC.L10N.register( "Login image" : "Нэвтрэх зураг", "Upload new login background" : "Нэвтрэх ханын зураг байршуулах", "Remove background image" : "Ханын зургийг хасах", + "You are already using a custom theme" : "Та тусгай загварчлал ашиглаж байна", "reset to default" : "анхныхаар сэргээх" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/theming/l10n/mn.json b/apps/theming/l10n/mn.json index e2a8438b43c..bce38de201b 100644 --- a/apps/theming/l10n/mn.json +++ b/apps/theming/l10n/mn.json @@ -9,7 +9,6 @@ "The given color is invalid" : "Өнгө буруу байна", "No file uploaded" : "Файл илгээгдсэнгүй", "Unsupported image type" : "Дэмжигдэхгүй зургийн төрөл байна", - "You are already using a custom theme" : "Та тусгай загварчлал ашиглаж байна", "Theming" : "Загварчлал", "Name" : "Нэр", "Reset to default" : "Анхны байдлаар сэргээх", @@ -22,6 +21,7 @@ "Login image" : "Нэвтрэх зураг", "Upload new login background" : "Нэвтрэх ханын зураг байршуулах", "Remove background image" : "Ханын зургийг хасах", + "You are already using a custom theme" : "Та тусгай загварчлал ашиглаж байна", "reset to default" : "анхныхаар сэргээх" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/l10n/nb.js b/apps/theming/l10n/nb.js index 7fa376b70e6..cb2fa08f604 100644 --- a/apps/theming/l10n/nb.js +++ b/apps/theming/l10n/nb.js @@ -10,13 +10,13 @@ OC.L10N.register( "The given web address is too long" : "Nettadressen er for lang", "The given slogan is too long" : "Slagordet er for langt", "The given color is invalid" : "Fargen er ugyldig", + "The file was uploaded" : "Filen ble lastet opp", "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Filen er større enn grensen satt i upload_max_filesize i php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Filen du prøvde å laste opp er større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet", "No file was uploaded" : "Ingen filer ble lastet opp", "Missing a temporary folder" : "Mangler midlertidig mappe", "No file uploaded" : "Ingen fil lastet opp", "Unsupported image type" : "Filtypen støttes ikke", - "You are already using a custom theme" : "Du bruker allerede en egendefinert drakt", "Theming" : "Draktvalg", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Draktvalg gjør det enkelt å tilpasse utseende og følelsen av din installasjon og støttede klienter. Dette vil bli synlig for alle brukere.", "Name" : "Navn", @@ -31,6 +31,7 @@ OC.L10N.register( "Upload new login background" : "Last opp ny innloggingsbakgrunn", "Remove background image" : "Fjern bakgrunnsbilde", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installer PHP-utvidelsen Imagemagick med støtte for SVG-bilder for å opprette favikoner automatisk basert på opplastet logo og farge.", + "You are already using a custom theme" : "Du bruker allerede en egendefinert drakt", "reset to default" : "tilbakestill til forvalg", "There is no error, the file uploaded with success" : "Det er ingen feil, filen ble lastet opp", "The uploaded file was only partially uploaded" : "Filen ble bare delvis lastet opp", diff --git a/apps/theming/l10n/nb.json b/apps/theming/l10n/nb.json index 718436cb503..b23bbdcfe95 100644 --- a/apps/theming/l10n/nb.json +++ b/apps/theming/l10n/nb.json @@ -8,13 +8,13 @@ "The given web address is too long" : "Nettadressen er for lang", "The given slogan is too long" : "Slagordet er for langt", "The given color is invalid" : "Fargen er ugyldig", + "The file was uploaded" : "Filen ble lastet opp", "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Filen er større enn grensen satt i upload_max_filesize i php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Filen du prøvde å laste opp er større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet", "No file was uploaded" : "Ingen filer ble lastet opp", "Missing a temporary folder" : "Mangler midlertidig mappe", "No file uploaded" : "Ingen fil lastet opp", "Unsupported image type" : "Filtypen støttes ikke", - "You are already using a custom theme" : "Du bruker allerede en egendefinert drakt", "Theming" : "Draktvalg", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Draktvalg gjør det enkelt å tilpasse utseende og følelsen av din installasjon og støttede klienter. Dette vil bli synlig for alle brukere.", "Name" : "Navn", @@ -29,6 +29,7 @@ "Upload new login background" : "Last opp ny innloggingsbakgrunn", "Remove background image" : "Fjern bakgrunnsbilde", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installer PHP-utvidelsen Imagemagick med støtte for SVG-bilder for å opprette favikoner automatisk basert på opplastet logo og farge.", + "You are already using a custom theme" : "Du bruker allerede en egendefinert drakt", "reset to default" : "tilbakestill til forvalg", "There is no error, the file uploaded with success" : "Det er ingen feil, filen ble lastet opp", "The uploaded file was only partially uploaded" : "Filen ble bare delvis lastet opp", diff --git a/apps/theming/l10n/nl.js b/apps/theming/l10n/nl.js index d8bcef139c7..0c21293c80f 100644 --- a/apps/theming/l10n/nl.js +++ b/apps/theming/l10n/nl.js @@ -17,7 +17,6 @@ OC.L10N.register( "Missing a temporary folder" : "Er ontbreekt een tijdelijke map", "No file uploaded" : "Geen bestand geüpload", "Unsupported image type" : "Afbeeldingstype wordt niet ondersteund", - "You are already using a custom theme" : "Je gebruikt al een maatwerkthema", "Theming" : "Uiterlijk", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Thematiseren maakt het mogelijk om uiterlijk en gevoel van je systeem en ondersteunde clients aan te passen. Dit wordt zichtbaar voor alle gebruikers.", "Name" : "Naam", @@ -32,6 +31,7 @@ OC.L10N.register( "Upload new login background" : "Uploaden nieuwe inlog achtergrond", "Remove background image" : "Achtergrond beeld verwijderen", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installeer de Imagemagick PHP extensie met ondersteuning voor SVG afbeeldingen om automatisch favicons te genereren op basis van het geuploade logo en kleur.", + "You are already using a custom theme" : "Je gebruikt al een maatwerkthema", "reset to default" : "herstellen naar standaard", "There is no error, the file uploaded with success" : "Er trad geen fout op, het bestand is succesvol geüpload", "The uploaded file was only partially uploaded" : "Het bestand is slechts gedeeltelijk geüpload", diff --git a/apps/theming/l10n/nl.json b/apps/theming/l10n/nl.json index 237541f9289..5a75caf8446 100644 --- a/apps/theming/l10n/nl.json +++ b/apps/theming/l10n/nl.json @@ -15,7 +15,6 @@ "Missing a temporary folder" : "Er ontbreekt een tijdelijke map", "No file uploaded" : "Geen bestand geüpload", "Unsupported image type" : "Afbeeldingstype wordt niet ondersteund", - "You are already using a custom theme" : "Je gebruikt al een maatwerkthema", "Theming" : "Uiterlijk", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Thematiseren maakt het mogelijk om uiterlijk en gevoel van je systeem en ondersteunde clients aan te passen. Dit wordt zichtbaar voor alle gebruikers.", "Name" : "Naam", @@ -30,6 +29,7 @@ "Upload new login background" : "Uploaden nieuwe inlog achtergrond", "Remove background image" : "Achtergrond beeld verwijderen", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installeer de Imagemagick PHP extensie met ondersteuning voor SVG afbeeldingen om automatisch favicons te genereren op basis van het geuploade logo en kleur.", + "You are already using a custom theme" : "Je gebruikt al een maatwerkthema", "reset to default" : "herstellen naar standaard", "There is no error, the file uploaded with success" : "Er trad geen fout op, het bestand is succesvol geüpload", "The uploaded file was only partially uploaded" : "Het bestand is slechts gedeeltelijk geüpload", diff --git a/apps/theming/l10n/pl.js b/apps/theming/l10n/pl.js index 08a2b519838..0b9413bd2c7 100644 --- a/apps/theming/l10n/pl.js +++ b/apps/theming/l10n/pl.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Brak folderu tymczasowego", "No file uploaded" : "Nie wysłano pliku", "Unsupported image type" : "Nieobsługiwany typ zdjęcia", - "You are already using a custom theme" : "Używasz już motywu niestandarowego", "Theming" : "Motyw", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Motywy pozwalają na łatwą personalizację wyglądu Twojej instancji i wspieranych klientów. Efekty będą widoczne dla wszystkich użytkowników.", "Name" : "Nazwa", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Wyślij nowe tło ekranu logowania", "Remove background image" : "Usuń obraz tła", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Aby wygenerować favicon oparte o wysłane logo i kolor, zainstaluj rozszerzenie PHP Imagemagick z obsługą SVG.", + "You are already using a custom theme" : "Używasz już motywu niestandarowego", "reset to default" : "przywróć domyślne", "There is no error, the file uploaded with success" : "Brak błędów, plik wysłano poprawnie.", "The uploaded file was only partially uploaded" : "Załadowany plik został wysłany tylko częściowo.", diff --git a/apps/theming/l10n/pl.json b/apps/theming/l10n/pl.json index dc1c1d7be8a..067681d03f6 100644 --- a/apps/theming/l10n/pl.json +++ b/apps/theming/l10n/pl.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Brak folderu tymczasowego", "No file uploaded" : "Nie wysłano pliku", "Unsupported image type" : "Nieobsługiwany typ zdjęcia", - "You are already using a custom theme" : "Używasz już motywu niestandarowego", "Theming" : "Motyw", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Motywy pozwalają na łatwą personalizację wyglądu Twojej instancji i wspieranych klientów. Efekty będą widoczne dla wszystkich użytkowników.", "Name" : "Nazwa", @@ -28,6 +27,7 @@ "Upload new login background" : "Wyślij nowe tło ekranu logowania", "Remove background image" : "Usuń obraz tła", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Aby wygenerować favicon oparte o wysłane logo i kolor, zainstaluj rozszerzenie PHP Imagemagick z obsługą SVG.", + "You are already using a custom theme" : "Używasz już motywu niestandarowego", "reset to default" : "przywróć domyślne", "There is no error, the file uploaded with success" : "Brak błędów, plik wysłano poprawnie.", "The uploaded file was only partially uploaded" : "Załadowany plik został wysłany tylko częściowo.", diff --git a/apps/theming/l10n/pt_BR.js b/apps/theming/l10n/pt_BR.js index d5d229a79e3..0cebf02c69b 100644 --- a/apps/theming/l10n/pt_BR.js +++ b/apps/theming/l10n/pt_BR.js @@ -20,7 +20,7 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Uma extensão PHP parou o envio do arquivo", "No file uploaded" : "Nenhum arquivo enviado", "Unsupported image type" : "Tipo de imagem não suportado", - "You are already using a custom theme" : "Você já está usando um tema personalizado", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Você já está usando um tema personalizado. As configurações do aplicativo Theming podem ser sobrescritas por isso.", "Theming" : "Personalização", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Criar e alterar temas torna possível personalizar facilmente o Nextcloud e clientes suportados. Isso será visível para todos os usuários.", "Name" : "Nome", @@ -35,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Enviar nova imagem de fundo para o login", "Remove background image" : "Excluir a imagem de fundo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instale a extensão PHP Imagemagick com suporte a imagens SVG para gerar favicons automaticamente, com base no logotipo e na cor enviados.", + "You are already using a custom theme" : "Você já está usando um tema personalizado", "reset to default" : "restaurar ao padrão", "There is no error, the file uploaded with success" : "Sem erros. Arquivo enviado com sucesso", "The uploaded file was only partially uploaded" : "O arquivo foi enviado parcialmente", diff --git a/apps/theming/l10n/pt_BR.json b/apps/theming/l10n/pt_BR.json index 0a4b6eba17a..7fd9150fd09 100644 --- a/apps/theming/l10n/pt_BR.json +++ b/apps/theming/l10n/pt_BR.json @@ -18,7 +18,7 @@ "A PHP extension stopped the file upload" : "Uma extensão PHP parou o envio do arquivo", "No file uploaded" : "Nenhum arquivo enviado", "Unsupported image type" : "Tipo de imagem não suportado", - "You are already using a custom theme" : "Você já está usando um tema personalizado", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Você já está usando um tema personalizado. As configurações do aplicativo Theming podem ser sobrescritas por isso.", "Theming" : "Personalização", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Criar e alterar temas torna possível personalizar facilmente o Nextcloud e clientes suportados. Isso será visível para todos os usuários.", "Name" : "Nome", @@ -33,6 +33,7 @@ "Upload new login background" : "Enviar nova imagem de fundo para o login", "Remove background image" : "Excluir a imagem de fundo", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instale a extensão PHP Imagemagick com suporte a imagens SVG para gerar favicons automaticamente, com base no logotipo e na cor enviados.", + "You are already using a custom theme" : "Você já está usando um tema personalizado", "reset to default" : "restaurar ao padrão", "There is no error, the file uploaded with success" : "Sem erros. Arquivo enviado com sucesso", "The uploaded file was only partially uploaded" : "O arquivo foi enviado parcialmente", diff --git a/apps/theming/l10n/pt_PT.js b/apps/theming/l10n/pt_PT.js index 7081872c727..add385f5ce8 100644 --- a/apps/theming/l10n/pt_PT.js +++ b/apps/theming/l10n/pt_PT.js @@ -15,7 +15,6 @@ OC.L10N.register( "Missing a temporary folder" : "Falta uma pasta temporária", "No file uploaded" : "Nenhum ficheiro carregado", "Unsupported image type" : "Tipo de imagem não suportado", - "You are already using a custom theme" : "Já está a usar um tema personalizado", "Theming" : "Temática", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "A tematização possibilita a fácil personalização da aparência da sua instância e clientes suportados. Isto será visível para todos os utilizadores", "Name" : "Nome", @@ -30,6 +29,7 @@ OC.L10N.register( "Upload new login background" : "Carregar imagem de segundo plano de Login", "Remove background image" : "Remover imagem de segundo plano", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instale a extensão PHP Imagemagick com suporte para imagens SVG para gerar automaticamente favicons com base na cor e no logotipo carregado.", + "You are already using a custom theme" : "Já está a usar um tema personalizado", "reset to default" : "restaurar valor padrão", "There is no error, the file uploaded with success" : "Não ocorreu nenhum erro, o ficheiro foi carregado com sucesso", "The uploaded file was only partially uploaded" : "O ficheiro escolhido foi apenas parcialmente carregado", diff --git a/apps/theming/l10n/pt_PT.json b/apps/theming/l10n/pt_PT.json index 10c5ce4b725..0ce97a8df20 100644 --- a/apps/theming/l10n/pt_PT.json +++ b/apps/theming/l10n/pt_PT.json @@ -13,7 +13,6 @@ "Missing a temporary folder" : "Falta uma pasta temporária", "No file uploaded" : "Nenhum ficheiro carregado", "Unsupported image type" : "Tipo de imagem não suportado", - "You are already using a custom theme" : "Já está a usar um tema personalizado", "Theming" : "Temática", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "A tematização possibilita a fácil personalização da aparência da sua instância e clientes suportados. Isto será visível para todos os utilizadores", "Name" : "Nome", @@ -28,6 +27,7 @@ "Upload new login background" : "Carregar imagem de segundo plano de Login", "Remove background image" : "Remover imagem de segundo plano", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Instale a extensão PHP Imagemagick com suporte para imagens SVG para gerar automaticamente favicons com base na cor e no logotipo carregado.", + "You are already using a custom theme" : "Já está a usar um tema personalizado", "reset to default" : "restaurar valor padrão", "There is no error, the file uploaded with success" : "Não ocorreu nenhum erro, o ficheiro foi carregado com sucesso", "The uploaded file was only partially uploaded" : "O ficheiro escolhido foi apenas parcialmente carregado", diff --git a/apps/theming/l10n/ru.js b/apps/theming/l10n/ru.js index 7f50546cf6a..f1d50580aa5 100644 --- a/apps/theming/l10n/ru.js +++ b/apps/theming/l10n/ru.js @@ -17,7 +17,6 @@ OC.L10N.register( "Missing a temporary folder" : "Отсутствует временный каталог", "No file uploaded" : "Нет загруженных файлов", "Unsupported image type" : "Неподдерживаемый тип изображения", - "You are already using a custom theme" : "Вы уже используете настраиваемую тему", "Theming" : "Темы оформления", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Темы оформление позволяют легко настроить внешний вид вашего сервера и поддерживаемых клиентов. Это будет доступно для всех пользователей.", "Name" : "Название", @@ -32,6 +31,7 @@ OC.L10N.register( "Upload new login background" : "Загрузить новый фон для экрана входа в систему", "Remove background image" : "Убрать фоновое изображение ", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Для автоматической генерации favicon на основе загруженного логотипа и цвета нужно установить PHP расширение Imagemagick с поддержкой изображений SVG ", + "You are already using a custom theme" : "Вы уже используете настраиваемую тему", "reset to default" : "сброс до настроек по-умолчанию", "There is no error, the file uploaded with success" : "Файл загружен успешно. Ошибок нет.", "The uploaded file was only partially uploaded" : "Файл загружен лишь частично", diff --git a/apps/theming/l10n/ru.json b/apps/theming/l10n/ru.json index 4df828b0836..6eae1f40b33 100644 --- a/apps/theming/l10n/ru.json +++ b/apps/theming/l10n/ru.json @@ -15,7 +15,6 @@ "Missing a temporary folder" : "Отсутствует временный каталог", "No file uploaded" : "Нет загруженных файлов", "Unsupported image type" : "Неподдерживаемый тип изображения", - "You are already using a custom theme" : "Вы уже используете настраиваемую тему", "Theming" : "Темы оформления", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Темы оформление позволяют легко настроить внешний вид вашего сервера и поддерживаемых клиентов. Это будет доступно для всех пользователей.", "Name" : "Название", @@ -30,6 +29,7 @@ "Upload new login background" : "Загрузить новый фон для экрана входа в систему", "Remove background image" : "Убрать фоновое изображение ", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Для автоматической генерации favicon на основе загруженного логотипа и цвета нужно установить PHP расширение Imagemagick с поддержкой изображений SVG ", + "You are already using a custom theme" : "Вы уже используете настраиваемую тему", "reset to default" : "сброс до настроек по-умолчанию", "There is no error, the file uploaded with success" : "Файл загружен успешно. Ошибок нет.", "The uploaded file was only partially uploaded" : "Файл загружен лишь частично", diff --git a/apps/theming/l10n/sk.js b/apps/theming/l10n/sk.js index f6506537d74..c07c3bd6733 100644 --- a/apps/theming/l10n/sk.js +++ b/apps/theming/l10n/sk.js @@ -10,13 +10,13 @@ OC.L10N.register( "The given web address is too long" : "Zadaná web adresa je príliš dlhá", "The given slogan is too long" : "Zadaný slogan je príliš dlhý", "The given color is invalid" : "Zadaná farba nie je platná", + "The file was uploaded" : "Súbor bol nahraný", "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Nahraný súbor prekročil limit nastavený v upload_max_filesize v súbore php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.", "No file was uploaded" : "Nenahral sa žiadny súbor", "Missing a temporary folder" : "Chýba priečinok pre dočasné súbory", "No file uploaded" : "Žiadny súbor nebol nahraný", "Unsupported image type" : "Typ obrázka nie je podporovaný", - "You are already using a custom theme" : "Už používate upravený vzhľad", "Theming" : "Zmena vzhľadu", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Zmena vzhľadu umožňuje ľahko upraviť pocit z vašej inštalácie a podporovaných klientov. Toto bude viditeľné pre všetkých klientov.", "Name" : "Názov", @@ -31,6 +31,7 @@ OC.L10N.register( "Upload new login background" : "Nahrať nové prihlasovacie pozadie", "Remove background image" : "Odstrániť obrázok pozadia", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Ak chcete automaticky generovať favikony na základe nahraného loga a farby, nainštalujte rozšírenie Imagemagick PHP s podporou pre SVG obrázky.", + "You are already using a custom theme" : "Už používate upravený vzhľad", "reset to default" : "nastaviť predvolené", "There is no error, the file uploaded with success" : "Nenastala žiadna chyba, súbor bol úspešne nahraný", "The uploaded file was only partially uploaded" : "Ukladaný súbor sa nahral len čiastočne", diff --git a/apps/theming/l10n/sk.json b/apps/theming/l10n/sk.json index 2b27656ef01..649c93010ea 100644 --- a/apps/theming/l10n/sk.json +++ b/apps/theming/l10n/sk.json @@ -8,13 +8,13 @@ "The given web address is too long" : "Zadaná web adresa je príliš dlhá", "The given slogan is too long" : "Zadaný slogan je príliš dlhý", "The given color is invalid" : "Zadaná farba nie je platná", + "The file was uploaded" : "Súbor bol nahraný", "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Nahraný súbor prekročil limit nastavený v upload_max_filesize v súbore php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.", "No file was uploaded" : "Nenahral sa žiadny súbor", "Missing a temporary folder" : "Chýba priečinok pre dočasné súbory", "No file uploaded" : "Žiadny súbor nebol nahraný", "Unsupported image type" : "Typ obrázka nie je podporovaný", - "You are already using a custom theme" : "Už používate upravený vzhľad", "Theming" : "Zmena vzhľadu", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Zmena vzhľadu umožňuje ľahko upraviť pocit z vašej inštalácie a podporovaných klientov. Toto bude viditeľné pre všetkých klientov.", "Name" : "Názov", @@ -29,6 +29,7 @@ "Upload new login background" : "Nahrať nové prihlasovacie pozadie", "Remove background image" : "Odstrániť obrázok pozadia", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Ak chcete automaticky generovať favikony na základe nahraného loga a farby, nainštalujte rozšírenie Imagemagick PHP s podporou pre SVG obrázky.", + "You are already using a custom theme" : "Už používate upravený vzhľad", "reset to default" : "nastaviť predvolené", "There is no error, the file uploaded with success" : "Nenastala žiadna chyba, súbor bol úspešne nahraný", "The uploaded file was only partially uploaded" : "Ukladaný súbor sa nahral len čiastočne", diff --git a/apps/theming/l10n/sl.js b/apps/theming/l10n/sl.js index e18087c5644..5475cc8241b 100644 --- a/apps/theming/l10n/sl.js +++ b/apps/theming/l10n/sl.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "Izbrana barva je neveljavna", "No file uploaded" : "Ni naložene datoteke", "Unsupported image type" : "Nepodprt tip datoteke", - "You are already using a custom theme" : "Ti že uporabljaš lastno temo", "Theming" : "Teme", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teme omogočajo, da enostavno prilagodiš izgled in občutek svojega strežnika in podprtih strank. To bodo videli vsi uporabniki.", "Name" : "Ime", @@ -25,6 +24,7 @@ OC.L10N.register( "Login image" : "Slika ob prijavi", "Upload new login background" : "Naloži novo ozadje za prijavo", "Remove background image" : "Odstrani sliko ozadja", + "You are already using a custom theme" : "Ti že uporabljaš lastno temo", "reset to default" : "ponastavi na privzeto" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/theming/l10n/sl.json b/apps/theming/l10n/sl.json index 1c18ff196e8..3a37919e76e 100644 --- a/apps/theming/l10n/sl.json +++ b/apps/theming/l10n/sl.json @@ -9,7 +9,6 @@ "The given color is invalid" : "Izbrana barva je neveljavna", "No file uploaded" : "Ni naložene datoteke", "Unsupported image type" : "Nepodprt tip datoteke", - "You are already using a custom theme" : "Ti že uporabljaš lastno temo", "Theming" : "Teme", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teme omogočajo, da enostavno prilagodiš izgled in občutek svojega strežnika in podprtih strank. To bodo videli vsi uporabniki.", "Name" : "Ime", @@ -23,6 +22,7 @@ "Login image" : "Slika ob prijavi", "Upload new login background" : "Naloži novo ozadje za prijavo", "Remove background image" : "Odstrani sliko ozadja", + "You are already using a custom theme" : "Ti že uporabljaš lastno temo", "reset to default" : "ponastavi na privzeto" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/theming/l10n/sq.js b/apps/theming/l10n/sq.js index 02d6833bb17..55f0eac5e54 100644 --- a/apps/theming/l10n/sq.js +++ b/apps/theming/l10n/sq.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "Ngjyra e dhënë është invalide ", "No file uploaded" : "Asnjë skedar i ngarkuar", "Unsupported image type" : "Lloj imazhi i pa suportuar", - "You are already using a custom theme" : "Ju jeni duke përdorur një temë të zakonshme tashmë", "Theming" : "Duke vendosur theme-n", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming bën të mundur për të përshtatur lehtësisht pamjen dhe ndjenjën e instancës suaj dhe klientëve të mbështetur. Kjo do të jetë e dukshme për të gjithë përdoruesit.", "Name" : "Emri", @@ -25,6 +24,7 @@ OC.L10N.register( "Login image" : "Imazhi i hyrjes", "Upload new login background" : "Ngarko background të ri hyrjeje", "Remove background image" : "Hiqni imazhin në sfond", + "You are already using a custom theme" : "Ju jeni duke përdorur një temë të zakonshme tashmë", "reset to default" : "rivendos tek të paracaktuarat" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/theming/l10n/sq.json b/apps/theming/l10n/sq.json index cc731d84ef7..281fe7f8013 100644 --- a/apps/theming/l10n/sq.json +++ b/apps/theming/l10n/sq.json @@ -9,7 +9,6 @@ "The given color is invalid" : "Ngjyra e dhënë është invalide ", "No file uploaded" : "Asnjë skedar i ngarkuar", "Unsupported image type" : "Lloj imazhi i pa suportuar", - "You are already using a custom theme" : "Ju jeni duke përdorur një temë të zakonshme tashmë", "Theming" : "Duke vendosur theme-n", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming bën të mundur për të përshtatur lehtësisht pamjen dhe ndjenjën e instancës suaj dhe klientëve të mbështetur. Kjo do të jetë e dukshme për të gjithë përdoruesit.", "Name" : "Emri", @@ -23,6 +22,7 @@ "Login image" : "Imazhi i hyrjes", "Upload new login background" : "Ngarko background të ri hyrjeje", "Remove background image" : "Hiqni imazhin në sfond", + "You are already using a custom theme" : "Ju jeni duke përdorur një temë të zakonshme tashmë", "reset to default" : "rivendos tek të paracaktuarat" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/l10n/sr.js b/apps/theming/l10n/sr.js index e1d76f99f89..9ba3df16b53 100644 --- a/apps/theming/l10n/sr.js +++ b/apps/theming/l10n/sr.js @@ -20,7 +20,7 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "PHP екстензија је зауставила отпремање фајла", "No file uploaded" : "Ниједан фајл није отпремљен", "Unsupported image type" : "Неподржани тип слике", - "You are already using a custom theme" : "Већ користите прилагођену тему", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Већ користите прилагођену тему. Подешавања ове апликације ће можда бити пребрисана тиме.", "Theming" : "Теме", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Теме Вам омогућавају да лако измените изглед Ваше инстанце и подржаних клијената. Ово ће бити видљиво свим корисницима.", "Name" : "Име", @@ -35,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Отпремите нову позадину на пријави", "Remove background image" : "Уклони позадину", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Инсталирајте Imagemagick PHP екстензију која подржава SVG слике, да аутоматски направи иконе од отпремљеног логоа и боје.", + "You are already using a custom theme" : "Већ користите прилагођену тему", "reset to default" : "ресетуј на подразумевано", "There is no error, the file uploaded with success" : "Нема грешке, фајл је отпремљен успешно", "The uploaded file was only partially uploaded" : "Отпремани фајл је само делимично отпремљен", diff --git a/apps/theming/l10n/sr.json b/apps/theming/l10n/sr.json index e07c53c6438..735302d718c 100644 --- a/apps/theming/l10n/sr.json +++ b/apps/theming/l10n/sr.json @@ -18,7 +18,7 @@ "A PHP extension stopped the file upload" : "PHP екстензија је зауставила отпремање фајла", "No file uploaded" : "Ниједан фајл није отпремљен", "Unsupported image type" : "Неподржани тип слике", - "You are already using a custom theme" : "Већ користите прилагођену тему", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Већ користите прилагођену тему. Подешавања ове апликације ће можда бити пребрисана тиме.", "Theming" : "Теме", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Теме Вам омогућавају да лако измените изглед Ваше инстанце и подржаних клијената. Ово ће бити видљиво свим корисницима.", "Name" : "Име", @@ -33,6 +33,7 @@ "Upload new login background" : "Отпремите нову позадину на пријави", "Remove background image" : "Уклони позадину", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Инсталирајте Imagemagick PHP екстензију која подржава SVG слике, да аутоматски направи иконе од отпремљеног логоа и боје.", + "You are already using a custom theme" : "Већ користите прилагођену тему", "reset to default" : "ресетуј на подразумевано", "There is no error, the file uploaded with success" : "Нема грешке, фајл је отпремљен успешно", "The uploaded file was only partially uploaded" : "Отпремани фајл је само делимично отпремљен", diff --git a/apps/theming/l10n/sv.js b/apps/theming/l10n/sv.js index b3721645904..d56503dcf1b 100644 --- a/apps/theming/l10n/sv.js +++ b/apps/theming/l10n/sv.js @@ -16,7 +16,6 @@ OC.L10N.register( "Missing a temporary folder" : "Saknar en temporär mapp", "No file uploaded" : "Ingen fil uppladdad", "Unsupported image type" : "Filtypen är ej giltig", - "You are already using a custom theme" : "Du använder redan ett annat tema", "Theming" : "Teman", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teman gör det möjligt att enkelt skräddarsy utseendet på ditt moln. Detta kommer att synas för alla användare.", "Name" : "Namn", @@ -30,6 +29,7 @@ OC.L10N.register( "Login image" : "Inloggningsbild", "Upload new login background" : "Ladda upp ny bakgrundsbild", "Remove background image" : "Ta bort bakgrundsbild", + "You are already using a custom theme" : "Du använder redan ett annat tema", "reset to default" : "Återställ till standard", "There is no error, the file uploaded with success" : "Det finns inga fel, uppladdning av filen lyckades ", "The uploaded file was only partially uploaded" : "Den uppladdade filen laddades bara upp delvis", diff --git a/apps/theming/l10n/sv.json b/apps/theming/l10n/sv.json index 825fa117fa0..8a37792fed8 100644 --- a/apps/theming/l10n/sv.json +++ b/apps/theming/l10n/sv.json @@ -14,7 +14,6 @@ "Missing a temporary folder" : "Saknar en temporär mapp", "No file uploaded" : "Ingen fil uppladdad", "Unsupported image type" : "Filtypen är ej giltig", - "You are already using a custom theme" : "Du använder redan ett annat tema", "Theming" : "Teman", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Teman gör det möjligt att enkelt skräddarsy utseendet på ditt moln. Detta kommer att synas för alla användare.", "Name" : "Namn", @@ -28,6 +27,7 @@ "Login image" : "Inloggningsbild", "Upload new login background" : "Ladda upp ny bakgrundsbild", "Remove background image" : "Ta bort bakgrundsbild", + "You are already using a custom theme" : "Du använder redan ett annat tema", "reset to default" : "Återställ till standard", "There is no error, the file uploaded with success" : "Det finns inga fel, uppladdning av filen lyckades ", "The uploaded file was only partially uploaded" : "Den uppladdade filen laddades bara upp delvis", diff --git a/apps/theming/l10n/tr.js b/apps/theming/l10n/tr.js index 4b4060da89f..287678c3765 100644 --- a/apps/theming/l10n/tr.js +++ b/apps/theming/l10n/tr.js @@ -20,7 +20,7 @@ OC.L10N.register( "A PHP extension stopped the file upload" : "Bir PHP eklentisi dosyanın yüklenmesini engelledi", "No file uploaded" : "Herhangi bir dosya yüklenmemiş", "Unsupported image type" : "Görsel türü desteklenmiyor", - "You are already using a custom theme" : "Zaten özel bir tema kullanıyorsunuz", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Zaten özel bir tema kullanıyorsunuz. Tema uygulaması ayarları bu değer ile değiştirilebilir.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Temalar kullandığınız kopyanın ve desteklenen istemcilerin genel görünümün kolayca değiştirilmesini sağlar. Tüm kullanıcılara görüntülenir.", "Name" : "Ad", @@ -35,6 +35,7 @@ OC.L10N.register( "Upload new login background" : "Yeni oturum açma art alanı yükle", "Remove background image" : "Art alan görselini kaldır", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Yüklenen logo ve renge göre otomatik olarak favicon üretilmesi için Imagemagick PHP eklentisini SVG desteği ile kurun.", + "You are already using a custom theme" : "Zaten özel bir tema kullanıyorsunuz", "reset to default" : "varsayılana dön", "There is no error, the file uploaded with success" : "Herhangi bir sorun yok, dosya yüklendi", "The uploaded file was only partially uploaded" : "Dosyanın yalnızca bir bölümü yüklenebildi", diff --git a/apps/theming/l10n/tr.json b/apps/theming/l10n/tr.json index bf5578c9df7..d4c587eb181 100644 --- a/apps/theming/l10n/tr.json +++ b/apps/theming/l10n/tr.json @@ -18,7 +18,7 @@ "A PHP extension stopped the file upload" : "Bir PHP eklentisi dosyanın yüklenmesini engelledi", "No file uploaded" : "Herhangi bir dosya yüklenmemiş", "Unsupported image type" : "Görsel türü desteklenmiyor", - "You are already using a custom theme" : "Zaten özel bir tema kullanıyorsunuz", + "You are already using a custom theme. Theming app settings might be overwritten by that." : "Zaten özel bir tema kullanıyorsunuz. Tema uygulaması ayarları bu değer ile değiştirilebilir.", "Theming" : "Tema", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Temalar kullandığınız kopyanın ve desteklenen istemcilerin genel görünümün kolayca değiştirilmesini sağlar. Tüm kullanıcılara görüntülenir.", "Name" : "Ad", @@ -33,6 +33,7 @@ "Upload new login background" : "Yeni oturum açma art alanı yükle", "Remove background image" : "Art alan görselini kaldır", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Yüklenen logo ve renge göre otomatik olarak favicon üretilmesi için Imagemagick PHP eklentisini SVG desteği ile kurun.", + "You are already using a custom theme" : "Zaten özel bir tema kullanıyorsunuz", "reset to default" : "varsayılana dön", "There is no error, the file uploaded with success" : "Herhangi bir sorun yok, dosya yüklendi", "The uploaded file was only partially uploaded" : "Dosyanın yalnızca bir bölümü yüklenebildi", diff --git a/apps/theming/l10n/vi.js b/apps/theming/l10n/vi.js index ca8fc05e3d4..0d075921df0 100644 --- a/apps/theming/l10n/vi.js +++ b/apps/theming/l10n/vi.js @@ -11,7 +11,6 @@ OC.L10N.register( "The given color is invalid" : "Màu đã chọn không hợp lệ", "No file uploaded" : "Không có tệp nào được tải lên", "Unsupported image type" : "Loại hình ảnh không được hỗ trợ", - "You are already using a custom theme" : "Bạn đã sử dụng một chủ đề tuỳ chỉnh", "Theming" : "Điều chỉnh giao diện", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Điều chỉnh giao diện cho phép bạn có thể dễ dàng tùy biến bố cục trình bày của hệ thống. Khi thực hiện nó sẽ hiện hữu đối với tất cả người dùng", "Name" : "Tên", @@ -25,6 +24,7 @@ OC.L10N.register( "Login image" : "Hình ảnh trang đăng nhập", "Upload new login background" : "Tải lên ảnh nền trang đăng nhập mới", "Remove background image" : "Xóa bỏ ảnh nền", + "You are already using a custom theme" : "Bạn đã sử dụng một chủ đề tuỳ chỉnh", "reset to default" : "đặt lại về mặc định" }, "nplurals=1; plural=0;"); diff --git a/apps/theming/l10n/vi.json b/apps/theming/l10n/vi.json index 42134d76551..d38c77971be 100644 --- a/apps/theming/l10n/vi.json +++ b/apps/theming/l10n/vi.json @@ -9,7 +9,6 @@ "The given color is invalid" : "Màu đã chọn không hợp lệ", "No file uploaded" : "Không có tệp nào được tải lên", "Unsupported image type" : "Loại hình ảnh không được hỗ trợ", - "You are already using a custom theme" : "Bạn đã sử dụng một chủ đề tuỳ chỉnh", "Theming" : "Điều chỉnh giao diện", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Điều chỉnh giao diện cho phép bạn có thể dễ dàng tùy biến bố cục trình bày của hệ thống. Khi thực hiện nó sẽ hiện hữu đối với tất cả người dùng", "Name" : "Tên", @@ -23,6 +22,7 @@ "Login image" : "Hình ảnh trang đăng nhập", "Upload new login background" : "Tải lên ảnh nền trang đăng nhập mới", "Remove background image" : "Xóa bỏ ảnh nền", + "You are already using a custom theme" : "Bạn đã sử dụng một chủ đề tuỳ chỉnh", "reset to default" : "đặt lại về mặc định" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/theming/l10n/zh_CN.js b/apps/theming/l10n/zh_CN.js index ddf54f22df2..3fa45380d61 100644 --- a/apps/theming/l10n/zh_CN.js +++ b/apps/theming/l10n/zh_CN.js @@ -16,7 +16,6 @@ OC.L10N.register( "Missing a temporary folder" : "缺少临时文件夹", "No file uploaded" : "文件没有上传", "Unsupported image type" : "不支持图片格式", - "You are already using a custom theme" : "你已经在使用自定义主题", "Theming" : "主题", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "主题使得方便地定制你的实例的外观和体验成为可能。所有用户都可以使用。", "Name" : "名字", @@ -31,6 +30,7 @@ OC.L10N.register( "Upload new login background" : "上传新登录背景", "Remove background image" : "删除背景图片", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "安装支持SVG图像的PHP扩展Imagemagick，根据上传的logo和颜色自动生成收藏图标。", + "You are already using a custom theme" : "你已经在使用自定义主题", "reset to default" : "重置默认", "There is no error, the file uploaded with success" : "没有错误，文件已上传成功", "The uploaded file was only partially uploaded" : "上传的文件只有部分已上传", diff --git a/apps/theming/l10n/zh_CN.json b/apps/theming/l10n/zh_CN.json index b7ab4f898bb..332671cbec1 100644 --- a/apps/theming/l10n/zh_CN.json +++ b/apps/theming/l10n/zh_CN.json @@ -14,7 +14,6 @@ "Missing a temporary folder" : "缺少临时文件夹", "No file uploaded" : "文件没有上传", "Unsupported image type" : "不支持图片格式", - "You are already using a custom theme" : "你已经在使用自定义主题", "Theming" : "主题", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "主题使得方便地定制你的实例的外观和体验成为可能。所有用户都可以使用。", "Name" : "名字", @@ -29,6 +28,7 @@ "Upload new login background" : "上传新登录背景", "Remove background image" : "删除背景图片", "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "安装支持SVG图像的PHP扩展Imagemagick，根据上传的logo和颜色自动生成收藏图标。", + "You are already using a custom theme" : "你已经在使用自定义主题", "reset to default" : "重置默认", "There is no error, the file uploaded with success" : "没有错误，文件已上传成功", "The uploaded file was only partially uploaded" : "上传的文件只有部分已上传", diff --git a/apps/theming/l10n/zh_TW.js b/apps/theming/l10n/zh_TW.js index 9f10def8456..30e4fa38dc9 100644 --- a/apps/theming/l10n/zh_TW.js +++ b/apps/theming/l10n/zh_TW.js @@ -12,7 +12,6 @@ OC.L10N.register( "The given color is invalid" : "指定的顏色無效", "No file uploaded" : "未上傳檔案", "Unsupported image type" : "不支援的圖片類型", - "You are already using a custom theme" : "您正在使用自訂主題", "Theming" : "佈景主題", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "使用佈景主題來客製化網頁界面和客戶端程式的外觀（並非所有客戶端程式都支援佈景主題），外觀將會套用至所有使用者。", "Name" : "名稱", @@ -26,6 +25,7 @@ OC.L10N.register( "Login image" : "登入圖片", "Upload new login background" : "上傳新的登入頁背景", "Remove background image" : "移除背景圖片", + "You are already using a custom theme" : "您正在使用自訂主題", "reset to default" : "恢復預設值" }, "nplurals=1; plural=0;"); diff --git a/apps/theming/l10n/zh_TW.json b/apps/theming/l10n/zh_TW.json index 3e4bdb34366..1d8bcfe8eeb 100644 --- a/apps/theming/l10n/zh_TW.json +++ b/apps/theming/l10n/zh_TW.json @@ -10,7 +10,6 @@ "The given color is invalid" : "指定的顏色無效", "No file uploaded" : "未上傳檔案", "Unsupported image type" : "不支援的圖片類型", - "You are already using a custom theme" : "您正在使用自訂主題", "Theming" : "佈景主題", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "使用佈景主題來客製化網頁界面和客戶端程式的外觀（並非所有客戶端程式都支援佈景主題），外觀將會套用至所有使用者。", "Name" : "名稱", @@ -24,6 +23,7 @@ "Login image" : "登入圖片", "Upload new login background" : "上傳新的登入頁背景", "Remove background image" : "移除背景圖片", + "You are already using a custom theme" : "您正在使用自訂主題", "reset to default" : "恢復預設值" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php index 708bf1914ea..d26a5680637 100644 --- a/apps/theming/lib/Settings/Admin.php +++ b/apps/theming/lib/Settings/Admin.php @@ -67,7 +67,7 @@ class Admin implements ISettings { $theme = $this->config->getSystemValue('theme', ''); if ($theme !== '') { $themable = false; - $errorMessage = $this->l->t('You are already using a custom theme'); + $errorMessage = $this->l->t('You are already using a custom theme. Theming app settings might be overwritten by that.'); } $parameters = [ diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 688878bb50a..ce4ab0abb55 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -320,7 +320,7 @@ class ThemingDefaults extends \OC_Defaults { private function increaseCacheBuster() { $cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0'); $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1); - $this->cacheFactory->createDistributed('theming-')->clear('getScssVariables'); + $this->cacheFactory->createDistributed('theming-')->clear(); } /** diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php index 1dfa5cdc1db..7e489199927 100644 --- a/apps/theming/templates/settings-admin.php +++ b/apps/theming/templates/settings-admin.php @@ -37,7 +37,7 @@ style('theming', 'settings-admin'); <p> <?php p($_['errorMessage']) ?> </p> - <?php } else { ?> + <?php } ?> <div> <label> <span><?php p($l->t('Name')) ?></span> @@ -99,5 +99,4 @@ style('theming', 'settings-admin'); </p> <?php } ?> </div> - <?php } ?> </div> diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php index bb68651d143..ee49cf0f1f6 100644 --- a/apps/theming/tests/Settings/AdminTest.php +++ b/apps/theming/tests/Settings/AdminTest.php @@ -118,8 +118,8 @@ class AdminTest extends TestCase { $this->l10n ->expects($this->once()) ->method('t') - ->with('You are already using a custom theme') - ->willReturn('You are already using a custom theme'); + ->with('You are already using a custom theme. Theming app settings might be overwritten by that.') + ->willReturn('You are already using a custom theme. Theming app settings might be overwritten by that.'); $this->themingDefaults ->expects($this->once()) ->method('getEntity') @@ -143,7 +143,7 @@ class AdminTest extends TestCase { ->willReturn('/my/route'); $params = [ 'themable' => false, - 'errorMessage' => 'You are already using a custom theme', + 'errorMessage' => 'You are already using a custom theme. Theming app settings might be overwritten by that.', 'name' => 'MyEntity', 'url' => 'https://example.com', 'slogan' => 'MySlogan', diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 2e1ad44b7aa..2485a471bf4 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -276,7 +276,7 @@ class ThemingDefaultsTest extends TestCase { $this->cache ->expects($this->once()) ->method('clear') - ->with('getScssVariables'); + ->with(''); $this->template->set('MySetting', 'MyValue'); } diff --git a/apps/twofactor_backupcodes/l10n/af.js b/apps/twofactor_backupcodes/l10n/af.js index 0d287379f87..4879b05cf45 100644 --- a/apps/twofactor_backupcodes/l10n/af.js +++ b/apps/twofactor_backupcodes/l10n/af.js @@ -13,6 +13,7 @@ OC.L10N.register( "You created two-factor backup codes for your account" : "U het tweefaktorrugsteunkodes vir u rekening geskep", "Backup code" : "Rugsteunkode", "Use backup code" : "Gebruik rugsteunkode", + "Two factor backup codes" : "Tweefaktorrugsteunkodes", "Second-factor backup codes" : "Tweedefaktorrugsteunkodes" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/twofactor_backupcodes/l10n/af.json b/apps/twofactor_backupcodes/l10n/af.json index 398bcfa64b1..e8d05027162 100644 --- a/apps/twofactor_backupcodes/l10n/af.json +++ b/apps/twofactor_backupcodes/l10n/af.json @@ -11,6 +11,7 @@ "You created two-factor backup codes for your account" : "U het tweefaktorrugsteunkodes vir u rekening geskep", "Backup code" : "Rugsteunkode", "Use backup code" : "Gebruik rugsteunkode", + "Two factor backup codes" : "Tweefaktorrugsteunkodes", "Second-factor backup codes" : "Tweedefaktorrugsteunkodes" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php index f5b01649bbb..03d1ee0d405 100644 --- a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php +++ b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @author Christoph Wurst <christoph@winzerhof-wurst.at> @@ -49,7 +50,7 @@ class BackupCodesProvider implements IProvider { * @param IL10N $l10n * @param AppManager $appManager */ - public function __construct($appName, BackupCodeStorage $storage, IL10N $l10n, AppManager $appManager) { + public function __construct(string $appName, BackupCodeStorage $storage, IL10N $l10n, AppManager $appManager) { $this->appName = $appName; $this->l10n = $l10n; $this->storage = $storage; @@ -61,7 +62,7 @@ class BackupCodesProvider implements IProvider { * * @return string */ - public function getId() { + public function getId(): string { return 'backup_codes'; } @@ -70,7 +71,7 @@ class BackupCodesProvider implements IProvider { * * @return string */ - public function getDisplayName() { + public function getDisplayName(): string { return $this->l10n->t('Backup code'); } @@ -79,7 +80,7 @@ class BackupCodesProvider implements IProvider { * * @return string */ - public function getDescription() { + public function getDescription(): string { return $this->l10n->t('Use backup code'); } @@ -89,7 +90,7 @@ class BackupCodesProvider implements IProvider { * @param IUser $user * @return Template */ - public function getTemplate(IUser $user) { + public function getTemplate(IUser $user): Template { return new Template('twofactor_backupcodes', 'challenge'); } @@ -98,8 +99,9 @@ class BackupCodesProvider implements IProvider { * * @param IUser $user * @param string $challenge + * @return bool */ - public function verifyChallenge(IUser $user, $challenge) { + public function verifyChallenge(IUser $user, string $challenge): bool { return $this->storage->validateCode($user, $challenge); } @@ -109,7 +111,7 @@ class BackupCodesProvider implements IProvider { * @param IUser $user * @return boolean */ - public function isTwoFactorAuthEnabledForUser(IUser $user) { + public function isTwoFactorAuthEnabledForUser(IUser $user): bool { return $this->storage->hasBackupCodes($user); } @@ -124,7 +126,7 @@ class BackupCodesProvider implements IProvider { * @param IUser $user * @return boolean */ - public function isActive(IUser $user) { + public function isActive(IUser $user): bool { $appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function($appId) { return $appId !== $this->appName; }); diff --git a/apps/updatenotification/l10n/es.js b/apps/updatenotification/l10n/es.js index dd25fb88e19..d4814b301eb 100644 --- a/apps/updatenotification/l10n/es.js +++ b/apps/updatenotification/l10n/es.js @@ -19,6 +19,9 @@ OC.L10N.register( "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "No se ha podido conectar a la appstore o la appstore no ha devuelto ninguna actualización. Busca actualizaciones manualmente o asegúrate de que tu servidor tiene acceso a internet y puede conectarse a la appstore.", "<strong>All</strong> apps have an update for this version available" : "<strong>Todas</strong> las apps tienen disponible una actualización para esta versión", "_<strong>%n</strong> app has no update for this version available_::_<strong>%n</strong> apps have no update for this version available_" : ["<strong>%n</strong> app no tiene actualización disponible para esta versión.","<strong>%n</strong> apps no tienen actualización disponible para esta versión."], + "<strong>production</strong> will always provide the latest patch level, but not update to the next major release immediately. That update usually happens with the second minor release (x.0.2)." : "<strong>production</strong> siempre proporcionará el último nivel de parches, pero no se actualizará a la próxima versión principal de inmediato. Esa actualización generalmente ocurre con la segunda versión menor (x.0.2).", + "<strong>stable</strong> is the most recent stable version. It is suited for production use and will always update to the latest major version." : "<strong>stable</strong> es la versión estable más reciente. Es adecuado para uso en producción y siempre se actualizará a la última versión principal.", + "<strong>beta</strong> is a pre-release version only for testing new features, not for production environments." : "<strong>beta</strong> es una versión preliminar solo para probar nuevas características, no para entornos de producción.", "Could not start updater, please try the manual update" : "No se ha podido iniciar el actualizador. Por favor, prueba a realizar la actualización de forma manual", "Update notifications" : "Actualizar notificaciones", "Channel updated" : "Canal actualizado", diff --git a/apps/updatenotification/l10n/es.json b/apps/updatenotification/l10n/es.json index 135f987897a..5451ff39f2b 100644 --- a/apps/updatenotification/l10n/es.json +++ b/apps/updatenotification/l10n/es.json @@ -17,6 +17,9 @@ "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "No se ha podido conectar a la appstore o la appstore no ha devuelto ninguna actualización. Busca actualizaciones manualmente o asegúrate de que tu servidor tiene acceso a internet y puede conectarse a la appstore.", "<strong>All</strong> apps have an update for this version available" : "<strong>Todas</strong> las apps tienen disponible una actualización para esta versión", "_<strong>%n</strong> app has no update for this version available_::_<strong>%n</strong> apps have no update for this version available_" : ["<strong>%n</strong> app no tiene actualización disponible para esta versión.","<strong>%n</strong> apps no tienen actualización disponible para esta versión."], + "<strong>production</strong> will always provide the latest patch level, but not update to the next major release immediately. That update usually happens with the second minor release (x.0.2)." : "<strong>production</strong> siempre proporcionará el último nivel de parches, pero no se actualizará a la próxima versión principal de inmediato. Esa actualización generalmente ocurre con la segunda versión menor (x.0.2).", + "<strong>stable</strong> is the most recent stable version. It is suited for production use and will always update to the latest major version." : "<strong>stable</strong> es la versión estable más reciente. Es adecuado para uso en producción y siempre se actualizará a la última versión principal.", + "<strong>beta</strong> is a pre-release version only for testing new features, not for production environments." : "<strong>beta</strong> es una versión preliminar solo para probar nuevas características, no para entornos de producción.", "Could not start updater, please try the manual update" : "No se ha podido iniciar el actualizador. Por favor, prueba a realizar la actualización de forma manual", "Update notifications" : "Actualizar notificaciones", "Channel updated" : "Canal actualizado", diff --git a/apps/updatenotification/l10n/sr.js b/apps/updatenotification/l10n/sr.js index 7fc29267ddd..b7f99f9bbcf 100644 --- a/apps/updatenotification/l10n/sr.js +++ b/apps/updatenotification/l10n/sr.js @@ -15,10 +15,13 @@ OC.L10N.register( "A new version is available: <strong>{newVersionString}</strong>" : "Доступна је нова верзија: <strong>{newVersionString}</strong>", "Checked on {lastCheckedDate}" : "Проверено {lastCheckedDate}", "Checking apps for compatible updates" : "Проверавам компатибилна ажурирања за апликације", - "Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "Проверите да у config.php фајлу немате сетовано <samp>appstoreenabled</samp> на \"false\".", - "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "Не могу да се повежем на продавницу апликација или апликација није вратила ниједно ажурирање. Претражите ручно за ажурирања и постарајте се да Ваш сервер има приступ интернету и да се може повезати са продавницом апликација.", + "Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "Проверите да у config.php фајлу немате <samp>appstoreenabled</samp> постављено на „false“.", + "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "Не могу да се повежем на продавницу апликација или продавница нема ниједно ажурирање. Претражите ручно ажурирања или проверите да ли сервер има везу са интернетом", "<strong>All</strong> apps have an update for this version available" : "<strong>Све</strong> апликације имају доступна ажурирања за ову верзију", "_<strong>%n</strong> app has no update for this version available_::_<strong>%n</strong> apps have no update for this version available_" : ["<strong>%n</strong> апликација имају доступна ажурирања за ову верзију","<strong>%n</strong> апликације имају доступна ажурирања за ову верзију","<strong>%n</strong> апликација имају доступна ажурирања за ову верзију"], + "<strong>production</strong> will always provide the latest patch level, but not update to the next major release immediately. That update usually happens with the second minor release (x.0.2)." : "<strong>радна</strong> ће увек давати последњи ниво закрпа али неће се одмах ажурирати на следеће главно издање. То ажурирање се углавном обавља по изласку другог мањег издања (x.0.2).", + "<strong>stable</strong> is the most recent stable version. It is suited for production use and will always update to the latest major version." : "<strong>стабилна</strong> је најновија стабилна верзија. Прикладна за свакодневну радну употребу и увек се ажурира на најновију главну верзију.", + "<strong>beta</strong> is a pre-release version only for testing new features, not for production environments." : "<strong>бета</strong> је пред-издање и служи само за тестирање нових могућности, не за свакодневни рад.", "Could not start updater, please try the manual update" : "Не могу да покренем програм за ажурирање, покушајте ручно ажурирање", "Update notifications" : "Обавештења о ажурирању", "Channel updated" : "Канал ажуриран", diff --git a/apps/updatenotification/l10n/sr.json b/apps/updatenotification/l10n/sr.json index 043a9e3d9ee..2c98a97ac14 100644 --- a/apps/updatenotification/l10n/sr.json +++ b/apps/updatenotification/l10n/sr.json @@ -13,10 +13,13 @@ "A new version is available: <strong>{newVersionString}</strong>" : "Доступна је нова верзија: <strong>{newVersionString}</strong>", "Checked on {lastCheckedDate}" : "Проверено {lastCheckedDate}", "Checking apps for compatible updates" : "Проверавам компатибилна ажурирања за апликације", - "Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "Проверите да у config.php фајлу немате сетовано <samp>appstoreenabled</samp> на \"false\".", - "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "Не могу да се повежем на продавницу апликација или апликација није вратила ниједно ажурирање. Претражите ручно за ажурирања и постарајте се да Ваш сервер има приступ интернету и да се може повезати са продавницом апликација.", + "Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "Проверите да у config.php фајлу немате <samp>appstoreenabled</samp> постављено на „false“.", + "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "Не могу да се повежем на продавницу апликација или продавница нема ниједно ажурирање. Претражите ручно ажурирања или проверите да ли сервер има везу са интернетом", "<strong>All</strong> apps have an update for this version available" : "<strong>Све</strong> апликације имају доступна ажурирања за ову верзију", "_<strong>%n</strong> app has no update for this version available_::_<strong>%n</strong> apps have no update for this version available_" : ["<strong>%n</strong> апликација имају доступна ажурирања за ову верзију","<strong>%n</strong> апликације имају доступна ажурирања за ову верзију","<strong>%n</strong> апликација имају доступна ажурирања за ову верзију"], + "<strong>production</strong> will always provide the latest patch level, but not update to the next major release immediately. That update usually happens with the second minor release (x.0.2)." : "<strong>радна</strong> ће увек давати последњи ниво закрпа али неће се одмах ажурирати на следеће главно издање. То ажурирање се углавном обавља по изласку другог мањег издања (x.0.2).", + "<strong>stable</strong> is the most recent stable version. It is suited for production use and will always update to the latest major version." : "<strong>стабилна</strong> је најновија стабилна верзија. Прикладна за свакодневну радну употребу и увек се ажурира на најновију главну верзију.", + "<strong>beta</strong> is a pre-release version only for testing new features, not for production environments." : "<strong>бета</strong> је пред-издање и служи само за тестирање нових могућности, не за свакодневни рад.", "Could not start updater, please try the manual update" : "Не могу да покренем програм за ажурирање, покушајте ручно ажурирање", "Update notifications" : "Обавештења о ажурирању", "Channel updated" : "Канал ажуриран", diff --git a/apps/user_ldap/l10n/hu.js b/apps/user_ldap/l10n/hu.js index 31bcdaa5585..d796670977f 100644 --- a/apps/user_ldap/l10n/hu.js +++ b/apps/user_ldap/l10n/hu.js @@ -33,6 +33,7 @@ OC.L10N.register( "{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.", + "_{objectsFound} entry available within the provided Base DN_::_{objectsFound} entries available within the provided Base DN_" : ["{objectsFound} bejegyzés érhető el a megadott Base DN-ben","{objectsFound} bejegyzés érhető el a megadott Base DN-ben"], "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", diff --git a/apps/user_ldap/l10n/hu.json b/apps/user_ldap/l10n/hu.json index a8b32b63c53..1d0d5184868 100644 --- a/apps/user_ldap/l10n/hu.json +++ b/apps/user_ldap/l10n/hu.json @@ -31,6 +31,7 @@ "{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.", + "_{objectsFound} entry available within the provided Base DN_::_{objectsFound} entries available within the provided Base DN_" : ["{objectsFound} bejegyzés érhető el a megadott Base DN-ben","{objectsFound} bejegyzés érhető el a megadott Base DN-ben"], "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", diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js index 0c01a1dca94..34100a0d6f0 100644 --- a/apps/user_ldap/l10n/sk.js +++ b/apps/user_ldap/l10n/sk.js @@ -96,7 +96,9 @@ OC.L10N.register( "Back" : "Späť", "Continue" : "Pokračovať", "An internal error occurred." : "Nastala interná chyba.", + "Current password" : "Aktuálne heslo", "New password" : "Nové heslo", + "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", "Wrong password." : "Nesprávne heslo.", "Cancel" : "Zrušiť", "Server" : "Server", diff --git a/apps/user_ldap/l10n/sk.json b/apps/user_ldap/l10n/sk.json index 413ca5fa0e8..41b30d9c1c3 100644 --- a/apps/user_ldap/l10n/sk.json +++ b/apps/user_ldap/l10n/sk.json @@ -94,7 +94,9 @@ "Back" : "Späť", "Continue" : "Pokračovať", "An internal error occurred." : "Nastala interná chyba.", + "Current password" : "Aktuálne heslo", "New password" : "Nové heslo", + "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", "Wrong password." : "Nesprávne heslo.", "Cancel" : "Zrušiť", "Server" : "Server", diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php index fb5b5478102..a4bac9667b9 100644 --- a/apps/user_ldap/lib/Helper.php +++ b/apps/user_ldap/lib/Helper.php @@ -155,7 +155,7 @@ class Helper { $saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\''; } - $query = \OCP\DB::prepare(' + $query = \OC_DB::prepare(' DELETE FROM `*PREFIX*appconfig` WHERE `configkey` LIKE ? diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index c5eff77dbe3..2b57874c62f 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -93,7 +93,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { */ static private function handleKnownGroups($groups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG); - $query = \OCP\DB::prepare(' + $query = \OC_DB::prepare(' UPDATE `*PREFIX*ldap_group_members` SET `owncloudusers` = ? WHERE `owncloudname` = ? @@ -131,7 +131,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { */ static private function handleCreatedGroups($createdGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', \OCP\Util::DEBUG); - $query = \OCP\DB::prepare(' + $query = \OC_DB::prepare(' INSERT INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`) VALUES (?, ?) @@ -153,7 +153,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { */ static private function handleRemovedGroups($removedGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', \OCP\Util::DEBUG); - $query = \OCP\DB::prepare(' + $query = \OC_DB::prepare(' DELETE FROM `*PREFIX*ldap_group_members` WHERE `owncloudname` = ? @@ -212,7 +212,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { if(is_array(self::$groupsFromDB)) { return self::$groupsFromDB; } - $query = \OCP\DB::prepare(' + $query = \OC_DB::prepare(' SELECT `owncloudname`, `owncloudusers` FROM `*PREFIX*ldap_group_members` '); diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 9911aa37e37..5a165305d58 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -489,13 +489,21 @@ class User_LDAPTest extends TestCase { $this->assertEquals(0, count($result)); } + private function getUsers($search = '', $limit = null, $offset = null) { + $users = \OC::$server->getUserManager()->search($search, $limit, $offset); + $uids = array_map(function(IUser $user) { + return $user->getUID(); + }, $users); + return $uids; + } + public function testGetUsersViaAPINoParam() { $access = $this->getAccessMock(); $this->prepareAccessForGetUsers($access); $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); - $result = \OCP\User::getUsers(); + $result = $this->getUsers(); $this->assertEquals(3, count($result)); } @@ -505,7 +513,7 @@ class User_LDAPTest extends TestCase { $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); - $result = \OCP\User::getUsers('', 1, 2); + $result = $this->getUsers('', 1, 2); $this->assertEquals(1, count($result)); } @@ -515,7 +523,7 @@ class User_LDAPTest extends TestCase { $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); - $result = \OCP\User::getUsers('', 2, 1); + $result = $this->getUsers('', 2, 1); $this->assertEquals(2, count($result)); } @@ -525,7 +533,7 @@ class User_LDAPTest extends TestCase { $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); - $result = \OCP\User::getUsers('yo'); + $result = $this->getUsers('yo'); $this->assertEquals(2, count($result)); } @@ -535,7 +543,7 @@ class User_LDAPTest extends TestCase { $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); - $result = \OCP\User::getUsers('nix'); + $result = $this->getUsers('nix'); $this->assertEquals(0, count($result)); } @@ -1085,11 +1093,11 @@ class User_LDAPTest extends TestCase { ->willReturnCallback(function($uuid) { return $uuid . '1'; }); //with displayName - $result = \OCP\User::getDisplayName('gunslinger'); + $result = \OC::$server->getUserManager()->get('gunslinger')->getDisplayName(); $this->assertEquals('Roland Deschain', $result); //empty displayname retrieved - $result = \OCP\User::getDisplayName('newyorker'); + $result = \OC::$server->getUserManager()->get('newyorker') === null ? 'newyorker' : \OC::$server->getUserManager()->get('newyorker')->getDisplayName(); $this->assertEquals('newyorker', $result); } diff --git a/apps/workflowengine/l10n/hu.js b/apps/workflowengine/l10n/hu.js index 25190f7f619..9407bb10a12 100644 --- a/apps/workflowengine/l10n/hu.js +++ b/apps/workflowengine/l10n/hu.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Csoportlista betöltése sikertelen", "Saved" : "Elmentve", "Saving failed:" : "Mentés sikertelen:", "File MIME type" : "Fájl MIME típus", diff --git a/apps/workflowengine/l10n/hu.json b/apps/workflowengine/l10n/hu.json index 9bae6fb384b..b6eebf6e99c 100644 --- a/apps/workflowengine/l10n/hu.json +++ b/apps/workflowengine/l10n/hu.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Csoportlista betöltése sikertelen", "Saved" : "Elmentve", "Saving failed:" : "Mentés sikertelen:", "File MIME type" : "Fájl MIME típus", diff --git a/apps/workflowengine/l10n/lt_LT.js b/apps/workflowengine/l10n/lt_LT.js index 9ba21fa685f..018745d964a 100644 --- a/apps/workflowengine/l10n/lt_LT.js +++ b/apps/workflowengine/l10n/lt_LT.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Nepavyko nuskaityti grupių sąrašo", "Saved" : "Įrašyta", "Saving failed:" : "Įrašymas nepavyko:", "File MIME type" : "Failo MIME tipas", @@ -59,6 +60,7 @@ OC.L10N.register( "Check %s is invalid" : "Neteisingas %s", "Check #%s does not exist" : "#%s neegzistuoja", "Workflow" : "Darbo eiga", + "Files workflow engine" : "Darbo eigos su failais modulis", "Open documentation" : "Atverti dokumentaciją", "Add rule group" : "Pridėti taisyklių grupę", "Short rule description" : "Rodyti taisyklės aprašymą", diff --git a/apps/workflowengine/l10n/lt_LT.json b/apps/workflowengine/l10n/lt_LT.json index 87e615aec8e..4dc641183c6 100644 --- a/apps/workflowengine/l10n/lt_LT.json +++ b/apps/workflowengine/l10n/lt_LT.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Nepavyko nuskaityti grupių sąrašo", "Saved" : "Įrašyta", "Saving failed:" : "Įrašymas nepavyko:", "File MIME type" : "Failo MIME tipas", @@ -57,6 +58,7 @@ "Check %s is invalid" : "Neteisingas %s", "Check #%s does not exist" : "#%s neegzistuoja", "Workflow" : "Darbo eiga", + "Files workflow engine" : "Darbo eigos su failais modulis", "Open documentation" : "Atverti dokumentaciją", "Add rule group" : "Pridėti taisyklių grupę", "Short rule description" : "Rodyti taisyklės aprašymą", diff --git a/config/config.sample.php b/config/config.sample.php index 8595c024e4c..ba5f3d68146 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -782,7 +782,8 @@ $CONFIG = array( * Defaults to * * Desktop client: ``https://nextcloud.com/install/#install-clients`` * * Android client: ``https://play.google.com/store/apps/details?id=com.nextcloud.client`` - * * iOS client : ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` + * * iOS client: ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` + * *iOS client app id: ``1125420102`` */ 'customclient_desktop' => 'https://nextcloud.com/install/#install-clients', @@ -790,7 +791,8 @@ $CONFIG = array( 'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'customclient_ios' => 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', - +'customclient_ios_appid' => + '1125420102', /** * Apps * diff --git a/core/l10n/he.js b/core/l10n/he.js index a054e8b392d..1ddec262f6d 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -175,6 +175,7 @@ OC.L10N.register( "This list is maybe truncated - please refine your search term to see more results." : "יתכן שזו רשימה מקוצרת - נא למקד את ביטוי החיפוש שלך כדי להציג תוצאות נוספות.", "No users or groups found for {search}" : "לא אותרו משתמשים או קבוצות עבור {search}", "No users found for {search}" : "לא אותרו משתמשים עבור {search}", + "An error occurred (\"{message}\"). Please try again" : "אירעה שגיאה (\"{message}\"). נא לנסות שוב", "An error occurred. Please try again" : "אירעה שגיאה. יש לנסות שנית", "{sharee} (group)" : "{sharee} (קבוצה)", "{sharee} (remote)" : "{sharee} (מרוחק)", diff --git a/core/l10n/he.json b/core/l10n/he.json index d14da071219..4629f36a562 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -173,6 +173,7 @@ "This list is maybe truncated - please refine your search term to see more results." : "יתכן שזו רשימה מקוצרת - נא למקד את ביטוי החיפוש שלך כדי להציג תוצאות נוספות.", "No users or groups found for {search}" : "לא אותרו משתמשים או קבוצות עבור {search}", "No users found for {search}" : "לא אותרו משתמשים עבור {search}", + "An error occurred (\"{message}\"). Please try again" : "אירעה שגיאה (\"{message}\"). נא לנסות שוב", "An error occurred. Please try again" : "אירעה שגיאה. יש לנסות שנית", "{sharee} (group)" : "{sharee} (קבוצה)", "{sharee} (remote)" : "{sharee} (מרוחק)", diff --git a/core/l10n/it.js b/core/l10n/it.js index 215973f8bec..86f0c857ec0 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -274,7 +274,7 @@ OC.L10N.register( "Username or email" : "Nome utente o email", "Log in" : "Accedi", "Wrong password." : "Password errata.", - "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Abbiamo rilevato molti tentativi di autenticazione falliti dal tuo indirizzo IP. Di conseguenza il prossimo tentativo è ritardato di 30 secondi.", + "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Abbiamo rilevato molti tentativi di autenticazione non riusciti dal tuo indirizzo IP. Di conseguenza, il prossimo tentativo è ritardato di 30 secondi.", "Stay logged in" : "Rimani collegato", "Forgot password?" : "Hai dimenticato la password?", "Back to login" : "Torna alla schermata di accesso", diff --git a/core/l10n/it.json b/core/l10n/it.json index ccc195c296f..79f154c6b16 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -272,7 +272,7 @@ "Username or email" : "Nome utente o email", "Log in" : "Accedi", "Wrong password." : "Password errata.", - "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Abbiamo rilevato molti tentativi di autenticazione falliti dal tuo indirizzo IP. Di conseguenza il prossimo tentativo è ritardato di 30 secondi.", + "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Abbiamo rilevato molti tentativi di autenticazione non riusciti dal tuo indirizzo IP. Di conseguenza, il prossimo tentativo è ritardato di 30 secondi.", "Stay logged in" : "Rimani collegato", "Forgot password?" : "Hai dimenticato la password?", "Back to login" : "Torna alla schermata di accesso", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index 87b577e599d..c407ae3fae9 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -175,6 +175,7 @@ OC.L10N.register( "This list is maybe truncated - please refine your search term to see more results." : "Этот список может быть показан не полностью - уточните запрос что бы просмотреть больше результатов.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", "No users found for {search}" : "Не найдено пользователей по запросу {search}", + "An error occurred (\"{message}\"). Please try again" : "Произошла ошибка («{message}»). Попробуйте ещё раз", "An error occurred. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "{sharee} (group)" : "{sharee} (группа)", "{sharee} (remote)" : "{sharee} (на другом сервере)", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index d82de17ade1..5451ae73ef6 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -173,6 +173,7 @@ "This list is maybe truncated - please refine your search term to see more results." : "Этот список может быть показан не полностью - уточните запрос что бы просмотреть больше результатов.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", "No users found for {search}" : "Не найдено пользователей по запросу {search}", + "An error occurred (\"{message}\"). Please try again" : "Произошла ошибка («{message}»). Попробуйте ещё раз", "An error occurred. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "{sharee} (group)" : "{sharee} (группа)", "{sharee} (remote)" : "{sharee} (на другом сервере)", diff --git a/core/l10n/sk.js b/core/l10n/sk.js index 67ba06c530e..f7454f10950 100644 --- a/core/l10n/sk.js +++ b/core/l10n/sk.js @@ -56,6 +56,7 @@ OC.L10N.register( "Search contacts …" : "Prehľadať kontakty...", "No contacts found" : "Kontakty nenájdené", "Show all contacts …" : "Zobraziť všetky kontakty...", + "Could not load your contacts" : "Nie je možné načítať Vaše kontakty", "Loading your contacts …" : "Otvárajú sa kontakty...", "Looking for {term} …" : "Hľadá sa výraz {term}...", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pri kontrole integrity kódu sa vyskytli chyby. Viac informácií…</a>", @@ -108,6 +109,8 @@ OC.L10N.register( "So-so password" : "Priemerné heslo", "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", + "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Váš webový server nie je zatiaľ správne nastavený, aby umožnil synchronizáciu súborov, pretože rozhranie WebDAV sa zdá byť nefunkčné.", + "Your web server is not properly set up to resolve \"{url}\". Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Vśš webový server nie je správne nastavený na spracovanie \"{url}\". Viac informácií môžete nájsť v našej <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentácii</a>.", "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached je nakonfigurovaný ako distribuovaná vyrovnávacia pamäť, ale v PHP je nainštalovaný nesprávny modul - \"memcache\". \\OC\\Memcache\\Memcached podporuje len modul \"memcached\", \"memcache\" nie je podporovaný. Viac informácií nájdete na <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki stránke o oboch moduloch</a>.", "Error occurred while checking server setup" : "Počas kontroly nastavenia serveru sa stala chyba", "Shared" : "Sprístupnené", @@ -157,6 +160,7 @@ OC.L10N.register( "This list is maybe truncated - please refine your search term to see more results." : "Tento zoznam môže byť skrátený - upresnite hľadaný výraz, aby ste získali viac výsledkov.", "No users or groups found for {search}" : "Výrazu {search} nezodpovedá žiadny používateľ ani skupina", "No users found for {search}" : "Výrazu {search} nezodpovedá žiadny používateľ", + "An error occurred (\"{message}\"). Please try again" : "Nastala chyba (\"{message}\"). Prosím, skúste znova", "An error occurred. Please try again" : "Nastala chyba. Skúste to prosím znovu", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (remote)" : "{sharee} (vzdialene)", @@ -255,8 +259,10 @@ OC.L10N.register( "Username or email" : "používateľské meno alebo e-mail", "Log in" : "Prihlásiť sa", "Wrong password." : "Nesprávne heslo.", + "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Zaznamenali sme viacnásobné chybné prihlásenie z Vašej IP adresy. Vaše nasledujúce prihlásenie bude pozdržané o 30 sekúnd.", "Stay logged in" : "Zostať prihlásený", "Forgot password?" : "Zabudli ste heslo?", + "Back to login" : "Späť na prihlásenie", "Account access" : "Prístup k účtu", "You are about to grant %s access to your %s account." : "Chystáte sa udeliť %s prístup k svojmu %s účtu.", "Grant access" : "Povoliť prístup", @@ -292,9 +298,15 @@ OC.L10N.register( "This page will refresh itself when the %s instance is available again." : "Táto stránka sa obnoví sama hneď ako bude %s inštancia znovu dostupná.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.", "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.", + "There was an error loading your contacts" : "Pri otváraní kontaktov došlo k chybe", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je zatiaľ správne nastavený, aby umožnil synchronizáciu súborov, pretože rozhranie WebDAV sa zdá byť nefunkčné.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Váš web server nie je správne nastavený, aby správne rozpoznával \"{url}\". Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.", + "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Vzdialený prístup k súborom a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky funkcie, odporúčame povoliť tomuto serveru pripojenie k internetu.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "dev/urandom nie je prístupný na čítanie procesom PHP, čo z bezpečnostných dôvodov nie je odporúčané. Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.", "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Sprístupniť iným ľuďom zadaním používateľa alebo skupiny, federatívneho cloud ID alebo e-mailovej adresy.", "Share with other people by entering a user or group or a federated cloud ID." : "Sprístupniť iným ľuďom zadaním používateľa alebo skupiny, federatívneho cloud ID.", "Share with other people by entering a user or group or an email address." : "Sprístupniť iným ľuďom zadaním používateľa, skupiny alebo e-mailovej adresy.", + "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", "Alternative Logins" : "Alternatívne prihlásenie" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/core/l10n/sk.json b/core/l10n/sk.json index 0d2baf5623c..647f563d1a1 100644 --- a/core/l10n/sk.json +++ b/core/l10n/sk.json @@ -54,6 +54,7 @@ "Search contacts …" : "Prehľadať kontakty...", "No contacts found" : "Kontakty nenájdené", "Show all contacts …" : "Zobraziť všetky kontakty...", + "Could not load your contacts" : "Nie je možné načítať Vaše kontakty", "Loading your contacts …" : "Otvárajú sa kontakty...", "Looking for {term} …" : "Hľadá sa výraz {term}...", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pri kontrole integrity kódu sa vyskytli chyby. Viac informácií…</a>", @@ -106,6 +107,8 @@ "So-so password" : "Priemerné heslo", "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", + "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Váš webový server nie je zatiaľ správne nastavený, aby umožnil synchronizáciu súborov, pretože rozhranie WebDAV sa zdá byť nefunkčné.", + "Your web server is not properly set up to resolve \"{url}\". Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Vśš webový server nie je správne nastavený na spracovanie \"{url}\". Viac informácií môžete nájsť v našej <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentácii</a>.", "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached je nakonfigurovaný ako distribuovaná vyrovnávacia pamäť, ale v PHP je nainštalovaný nesprávny modul - \"memcache\". \\OC\\Memcache\\Memcached podporuje len modul \"memcached\", \"memcache\" nie je podporovaný. Viac informácií nájdete na <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki stránke o oboch moduloch</a>.", "Error occurred while checking server setup" : "Počas kontroly nastavenia serveru sa stala chyba", "Shared" : "Sprístupnené", @@ -155,6 +158,7 @@ "This list is maybe truncated - please refine your search term to see more results." : "Tento zoznam môže byť skrátený - upresnite hľadaný výraz, aby ste získali viac výsledkov.", "No users or groups found for {search}" : "Výrazu {search} nezodpovedá žiadny používateľ ani skupina", "No users found for {search}" : "Výrazu {search} nezodpovedá žiadny používateľ", + "An error occurred (\"{message}\"). Please try again" : "Nastala chyba (\"{message}\"). Prosím, skúste znova", "An error occurred. Please try again" : "Nastala chyba. Skúste to prosím znovu", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (remote)" : "{sharee} (vzdialene)", @@ -253,8 +257,10 @@ "Username or email" : "používateľské meno alebo e-mail", "Log in" : "Prihlásiť sa", "Wrong password." : "Nesprávne heslo.", + "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Zaznamenali sme viacnásobné chybné prihlásenie z Vašej IP adresy. Vaše nasledujúce prihlásenie bude pozdržané o 30 sekúnd.", "Stay logged in" : "Zostať prihlásený", "Forgot password?" : "Zabudli ste heslo?", + "Back to login" : "Späť na prihlásenie", "Account access" : "Prístup k účtu", "You are about to grant %s access to your %s account." : "Chystáte sa udeliť %s prístup k svojmu %s účtu.", "Grant access" : "Povoliť prístup", @@ -290,9 +296,15 @@ "This page will refresh itself when the %s instance is available again." : "Táto stránka sa obnoví sama hneď ako bude %s inštancia znovu dostupná.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.", "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.", + "There was an error loading your contacts" : "Pri otváraní kontaktov došlo k chybe", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je zatiaľ správne nastavený, aby umožnil synchronizáciu súborov, pretože rozhranie WebDAV sa zdá byť nefunkčné.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Váš web server nie je správne nastavený, aby správne rozpoznával \"{url}\". Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.", + "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Vzdialený prístup k súborom a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky funkcie, odporúčame povoliť tomuto serveru pripojenie k internetu.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "dev/urandom nie je prístupný na čítanie procesom PHP, čo z bezpečnostných dôvodov nie je odporúčané. Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.", "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Sprístupniť iným ľuďom zadaním používateľa alebo skupiny, federatívneho cloud ID alebo e-mailovej adresy.", "Share with other people by entering a user or group or a federated cloud ID." : "Sprístupniť iným ľuďom zadaním používateľa alebo skupiny, federatívneho cloud ID.", "Share with other people by entering a user or group or an email address." : "Sprístupniť iným ľuďom zadaním používateľa, skupiny alebo e-mailovej adresy.", + "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", "Alternative Logins" : "Alternatívne prihlásenie" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index 00ea534387f..a0d36656e68 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -49,7 +49,7 @@ OC.L10N.register( "Set log level to debug" : "設定紀錄變成除錯層級", "Reset log level" : "重設記錄層級", "Starting code integrity check" : "開始檢查程式碼完整性", - "Finished code integrity check" : "完成程式碼完整性檢查", + "Finished code integrity check" : "已完成程式碼完整性檢查", "%s (incompatible)" : "%s (不相容的)", "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s", "Already up to date" : "已經是最新版", @@ -67,7 +67,7 @@ OC.L10N.register( "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["載入頁面出錯，%n 秒後重新整理"], "Saving..." : "儲存中...", "Dismiss" : "知道了", - "This action requires you to confirm your password" : "這個動作需要您輸入密碼", + "This action requires you to confirm your password" : "這個動作需要您再次確認密碼", "Authentication required" : "需要認證", "Password" : "密碼", "Cancel" : "取消", @@ -109,19 +109,25 @@ OC.L10N.register( "So-so password" : "密碼強度普通", "Good password" : "密碼強度佳", "Strong password" : "密碼強度極佳", - "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "您的網頁伺服器設定不正確，因此無法啟用檔案同步，看來可能是 WebDAV 界面的設定有問題。", + "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面似乎是故障的", "Your web server is not properly set up to resolve \"{url}\". Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "您的網頁伺服器設定不正確，因此無法解析 \"{url}\" ，請至<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>瞭解更多資訊。", - "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "您沒有設定記憶體快取，如果可以，請完成設定來提升效能。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>", + "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features." : "伺服器沒有網際網路連線（無法與多個端點取得聯繫），有些功能，像是外部儲存、應用程式更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。", + "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "您沒有設定記憶體快取 (memcache)，如果可以，請完成設定來提升效能。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "PHP 無法讀取 /dev/urandom，為保障安全，建議修正這個問題，進一步訊息可參考我們的<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>。", "You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "您目前正運行 PHP {version} ，我們建議您升級 PHP 到您的發行版所支援的最新版本，以獲得 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">PHP 開發團隊提供的效能與安全性更新</a>。", "You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14." : "您目前正運行 PHP 5.6 ，目前使用的 Nextcloud 將會是最後一個支援 PHP 5.6 的版本，建議您升級至 PHP 7.0 以上以使用 Nextcloud 14。", "The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "偵測到您的反向代理標頭設定不正確，但也有可能是因為您目前正透過信任的代理伺服器存取 Nextcloud。若您目前不是透過信任的代理伺服器存取 Nextcloud，這就是一個安全性問題，允許攻擊者對 Nextcloud 假冒 IP 位址。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>。", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "您已經設定 Memcached 為分散式快取，但是您安裝了錯誤的 PHP 模組 \"memcache\" ， Nextcloud 的 \\OC\\Memcache\\Memcached 元件不支援 \"memcache\" 模組，僅支援 \"memcached\" 模組。若想要更加瞭解這兩個模組，請閱讀 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki</a>。", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "有些檔案並未通過完整性檢查。可參閱詳細資訊，如我們的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>（<a href=\"{codeIntegrityDownloadEndpoint}\">無效檔案列表</a>/<a href=\"{rescanEndpoint}\">重新檢查</a>）以解決這些問題。", + "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:" : "PHP 的 OPcache 功能並未被妥善設定。<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">為了有更好的效能表現</a>，我們建議在 <code>php.ini</code> 設定檔中使用以下設定：", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "無法取得 PHP 中的 \"set_time_limit\" 函式。這可能導致執行過程被終止並造成不完整安裝。我們強烈建議啟用該函式。", + "Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "您的 PHP 並未啟用 FreeType 支援，導致大頭貼產生器和設定界面無法使用。", "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "您的資料目錄和檔案看來可以被公開存取，這表示 .htaccess 設定檔並未生效，我們強烈建議您設定網頁伺服器，拒絕公開存取資料目錄，或者將您的資料目錄移出網頁伺服器根目錄。", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "目前 HTTP 的 {header} 標頭設定並不是 \"{expected}\" ，這是一個潛在的安全性和隱私風險，我們建議調整此項設定。", "The \"{header}\" HTTP header is not set to \"{expected}\". Some features might not work correctly, as it is recommended to adjust this setting accordingly." : "目前 HTTP 的 {header} 標頭設定並不是 \"{expected}\" ，這將讓某些功能無法正常運作，我們建議修正此項設定。", - "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "HTTP \"Strict-Transport-Security\" 標頭並未被設定持續至少 {seconds} 秒。為了提高安全性，我們在<a href=\"{docUrl}\" rel=\"noreferrer\">安全小祕訣</a>中有詳述並建議啟用 HSTS。", - "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "正在透過不安全的 HTTP 存取站台，強烈建議您設定伺服器啟用 HTTPS ，更多資訊請查閱<a href=\"{docUrl}\">安全小祕訣</a>。", + "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "HTTP \"Strict-Transport-Security\" 標頭並未被設定持續至少 {seconds} 秒。為了提高安全性，我們在<a href=\"{docUrl}\" rel=\"noreferrer\">安全建議</a>中有詳述並建議啟用 HSTS。", + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "正在透過不安全的 HTTP 存取站台，強烈建議您設定伺服器啟用 HTTPS ，更多資訊請查閱<a href=\"{docUrl}\">安全建議</a>。", "Shared" : "已分享", "Shared with" : "分享給", "Shared by" : "分享自", @@ -169,6 +175,7 @@ OC.L10N.register( "This list is maybe truncated - please refine your search term to see more results." : "這個列表有可能並不完全 - 請使用更好的搜尋字眼以查看更多的結果", "No users or groups found for {search}" : "沒有群組或使用者符合 {search}", "No users found for {search}" : "沒有使用者符合 {search}", + "An error occurred (\"{message}\"). Please try again" : "發生錯誤（{message}），請再試一次", "An error occurred. Please try again" : "發生錯誤，請再試一次", "{sharee} (group)" : "{sharee} （群組）", "{sharee} (remote)" : "{sharee} （遠端）", @@ -259,7 +266,7 @@ OC.L10N.register( "More apps" : "更多應用程式", "Search" : "搜尋", "Reset search" : "重置搜尋", - "Confirm your password" : "輸入密碼", + "Confirm your password" : "確認密碼", "Server side authentication failed!" : "伺服器端認證失敗！", "Please contact your administrator." : "請聯絡系統管理員", "An internal error occurred." : "發生內部錯誤", @@ -270,8 +277,9 @@ OC.L10N.register( "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "您的 IP 多次嘗試登入無效，下一次登入將會被延時30秒。", "Stay logged in" : "保持登入狀態", "Forgot password?" : "忘記密碼？", + "Back to login" : "回到登入畫面", "Account access" : "帳戶存取", - "You are about to grant %s access to your %s account." : "你已批准%s存取你的%s帳戶。", + "You are about to grant %s access to your %s account." : "您將授予「%s」存取您的 %s 帳戶", "Grant access" : "允許存取", "App token" : "App token", "Alternative login using app token" : "透過應用程式憑證的方式登入", @@ -305,10 +313,29 @@ OC.L10N.register( "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理", "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員", "Thank you for your patience." : "感謝您的耐心", + "%s (3rdparty)" : "%s（第三方）", + "There was an error loading your contacts" : "載入聯絡人發生錯誤", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面似乎是故障的", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您沒有設定記憶體快取，如果可以，請完成設定來提升效能。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "您已經設定 Memcached 為分散式快取，但是您安裝了錯誤的 PHP 模組 \"memcache\" ， Nextcloud 的 \\OC\\Memcache\\Memcached 元件不支援 \"memcache\" 模組，僅支援 \"memcached\" 模組。若想要更加瞭解這兩個模組，請閱讀 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki</a>。", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "有些檔案並未通過完整性檢查。可參閱詳細資訊，如我們的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>(<a href=\"{codeIntegrityDownloadEndpoint}\">無效檔案列表</a>/<a href=\"{rescanEndpoint}\">重新檢查</a>)以解決這些問題。", + "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend</a> to use following settings in the <code>php.ini</code>:" : "PHP 的 OPcache 功能並未被妥善設定。<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">為了有更好的效能表現</a>，我們建議在 <code>php.ini</code> 設定檔中使用以下設定：", + "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "您的資料目錄和檔案看來可以被公開存取，這表示 .htaccess 設定檔並未生效，我們強烈建議您設定網頁伺服器，拒絕公開存取資料目錄，或者將您的資料目錄移出網頁伺服器根目錄。", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "目前 HTTP 的 {header} 標頭設定並不是 \"{expected}\" ，這是一個潛在的安全性和隱私風險，我們建議調整此項設定。", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP \"Strict-Transport-Security\" 標頭並未設定持續至少 {seconds} 秒。為了提高安全性，我們在<a href=\"{docUrl}\" rel=\"noreferrer\">安全建議</a>中有詳述並建議啟用 HSTS。", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您目前透過 HTTP 存取此網站，如我們的<a href=\"{docUrl}\">安全建議</a>所述，我們強烈建議設定您的伺服器要求使用 HTTPS。", + "Shared with {recipients}" : "與 {recipients} 分享", "Share with other people by entering a user or group, a federated cloud ID or an email address." : "透過輸入使用者、群組名稱，聯盟式雲端ID或e-mail信箱來分享給其他人。 ", "Share with other people by entering a user or group or a federated cloud ID." : "透過輸入使用者、群組名稱，聯盟式雲端ID來分享給其他人。", "Share with other people by entering a user or group or an email address." : "透過輸入使用者、群組名稱或email來分享給其他人。", + "The server encountered an internal error and was unable to complete your request." : "伺服器遭遇內部錯誤，無法完成您的要求", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "閱讀<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">說明文件</a>來瞭解如何正確設定您的伺服器", + "This action requires you to confirm your password:" : "這個動作需要您再次確認密碼：", + "Wrong password. Reset it?" : "密碼錯誤，重設密碼？", "Alternative Logins" : "其他登入方法", + "You are about to grant \"%s\" access to your %s account." : "您將授予「%s」存取您的 %s 帳戶", + "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器", "Back to log in" : "回到登入頁面" }, "nplurals=1; plural=0;"); diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index 59a2cc98fb2..fe0f6b784c1 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -47,7 +47,7 @@ "Set log level to debug" : "設定紀錄變成除錯層級", "Reset log level" : "重設記錄層級", "Starting code integrity check" : "開始檢查程式碼完整性", - "Finished code integrity check" : "完成程式碼完整性檢查", + "Finished code integrity check" : "已完成程式碼完整性檢查", "%s (incompatible)" : "%s (不相容的)", "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s", "Already up to date" : "已經是最新版", @@ -65,7 +65,7 @@ "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["載入頁面出錯，%n 秒後重新整理"], "Saving..." : "儲存中...", "Dismiss" : "知道了", - "This action requires you to confirm your password" : "這個動作需要您輸入密碼", + "This action requires you to confirm your password" : "這個動作需要您再次確認密碼", "Authentication required" : "需要認證", "Password" : "密碼", "Cancel" : "取消", @@ -107,19 +107,25 @@ "So-so password" : "密碼強度普通", "Good password" : "密碼強度佳", "Strong password" : "密碼強度極佳", - "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "您的網頁伺服器設定不正確，因此無法啟用檔案同步，看來可能是 WebDAV 界面的設定有問題。", + "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面似乎是故障的", "Your web server is not properly set up to resolve \"{url}\". Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "您的網頁伺服器設定不正確，因此無法解析 \"{url}\" ，請至<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>瞭解更多資訊。", - "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "您沒有設定記憶體快取，如果可以，請完成設定來提升效能。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>", + "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features." : "伺服器沒有網際網路連線（無法與多個端點取得聯繫），有些功能，像是外部儲存、應用程式更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。", + "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "您沒有設定記憶體快取 (memcache)，如果可以，請完成設定來提升效能。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "PHP 無法讀取 /dev/urandom，為保障安全，建議修正這個問題，進一步訊息可參考我們的<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>。", "You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "您目前正運行 PHP {version} ，我們建議您升級 PHP 到您的發行版所支援的最新版本，以獲得 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">PHP 開發團隊提供的效能與安全性更新</a>。", "You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14." : "您目前正運行 PHP 5.6 ，目前使用的 Nextcloud 將會是最後一個支援 PHP 5.6 的版本，建議您升級至 PHP 7.0 以上以使用 Nextcloud 14。", "The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "偵測到您的反向代理標頭設定不正確，但也有可能是因為您目前正透過信任的代理伺服器存取 Nextcloud。若您目前不是透過信任的代理伺服器存取 Nextcloud，這就是一個安全性問題，允許攻擊者對 Nextcloud 假冒 IP 位址。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">說明文件</a>。", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "您已經設定 Memcached 為分散式快取，但是您安裝了錯誤的 PHP 模組 \"memcache\" ， Nextcloud 的 \\OC\\Memcache\\Memcached 元件不支援 \"memcache\" 模組，僅支援 \"memcached\" 模組。若想要更加瞭解這兩個模組，請閱讀 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki</a>。", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "有些檔案並未通過完整性檢查。可參閱詳細資訊，如我們的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>（<a href=\"{codeIntegrityDownloadEndpoint}\">無效檔案列表</a>/<a href=\"{rescanEndpoint}\">重新檢查</a>）以解決這些問題。", + "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:" : "PHP 的 OPcache 功能並未被妥善設定。<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">為了有更好的效能表現</a>，我們建議在 <code>php.ini</code> 設定檔中使用以下設定：", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "無法取得 PHP 中的 \"set_time_limit\" 函式。這可能導致執行過程被終止並造成不完整安裝。我們強烈建議啟用該函式。", + "Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "您的 PHP 並未啟用 FreeType 支援，導致大頭貼產生器和設定界面無法使用。", "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "您的資料目錄和檔案看來可以被公開存取，這表示 .htaccess 設定檔並未生效，我們強烈建議您設定網頁伺服器，拒絕公開存取資料目錄，或者將您的資料目錄移出網頁伺服器根目錄。", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "目前 HTTP 的 {header} 標頭設定並不是 \"{expected}\" ，這是一個潛在的安全性和隱私風險，我們建議調整此項設定。", "The \"{header}\" HTTP header is not set to \"{expected}\". Some features might not work correctly, as it is recommended to adjust this setting accordingly." : "目前 HTTP 的 {header} 標頭設定並不是 \"{expected}\" ，這將讓某些功能無法正常運作，我們建議修正此項設定。", - "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "HTTP \"Strict-Transport-Security\" 標頭並未被設定持續至少 {seconds} 秒。為了提高安全性，我們在<a href=\"{docUrl}\" rel=\"noreferrer\">安全小祕訣</a>中有詳述並建議啟用 HSTS。", - "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "正在透過不安全的 HTTP 存取站台，強烈建議您設定伺服器啟用 HTTPS ，更多資訊請查閱<a href=\"{docUrl}\">安全小祕訣</a>。", + "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "HTTP \"Strict-Transport-Security\" 標頭並未被設定持續至少 {seconds} 秒。為了提高安全性，我們在<a href=\"{docUrl}\" rel=\"noreferrer\">安全建議</a>中有詳述並建議啟用 HSTS。", + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "正在透過不安全的 HTTP 存取站台，強烈建議您設定伺服器啟用 HTTPS ，更多資訊請查閱<a href=\"{docUrl}\">安全建議</a>。", "Shared" : "已分享", "Shared with" : "分享給", "Shared by" : "分享自", @@ -167,6 +173,7 @@ "This list is maybe truncated - please refine your search term to see more results." : "這個列表有可能並不完全 - 請使用更好的搜尋字眼以查看更多的結果", "No users or groups found for {search}" : "沒有群組或使用者符合 {search}", "No users found for {search}" : "沒有使用者符合 {search}", + "An error occurred (\"{message}\"). Please try again" : "發生錯誤（{message}），請再試一次", "An error occurred. Please try again" : "發生錯誤，請再試一次", "{sharee} (group)" : "{sharee} （群組）", "{sharee} (remote)" : "{sharee} （遠端）", @@ -257,7 +264,7 @@ "More apps" : "更多應用程式", "Search" : "搜尋", "Reset search" : "重置搜尋", - "Confirm your password" : "輸入密碼", + "Confirm your password" : "確認密碼", "Server side authentication failed!" : "伺服器端認證失敗！", "Please contact your administrator." : "請聯絡系統管理員", "An internal error occurred." : "發生內部錯誤", @@ -268,8 +275,9 @@ "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "您的 IP 多次嘗試登入無效，下一次登入將會被延時30秒。", "Stay logged in" : "保持登入狀態", "Forgot password?" : "忘記密碼？", + "Back to login" : "回到登入畫面", "Account access" : "帳戶存取", - "You are about to grant %s access to your %s account." : "你已批准%s存取你的%s帳戶。", + "You are about to grant %s access to your %s account." : "您將授予「%s」存取您的 %s 帳戶", "Grant access" : "允許存取", "App token" : "App token", "Alternative login using app token" : "透過應用程式憑證的方式登入", @@ -303,10 +311,29 @@ "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理", "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員", "Thank you for your patience." : "感謝您的耐心", + "%s (3rdparty)" : "%s（第三方）", + "There was an error loading your contacts" : "載入聯絡人發生錯誤", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面似乎是故障的", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您沒有設定記憶體快取，如果可以，請完成設定來提升效能。更多資訊請查閱<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "您已經設定 Memcached 為分散式快取，但是您安裝了錯誤的 PHP 模組 \"memcache\" ， Nextcloud 的 \\OC\\Memcache\\Memcached 元件不支援 \"memcache\" 模組，僅支援 \"memcached\" 模組。若想要更加瞭解這兩個模組，請閱讀 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki</a>。", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "有些檔案並未通過完整性檢查。可參閱詳細資訊，如我們的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>(<a href=\"{codeIntegrityDownloadEndpoint}\">無效檔案列表</a>/<a href=\"{rescanEndpoint}\">重新檢查</a>)以解決這些問題。", + "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend</a> to use following settings in the <code>php.ini</code>:" : "PHP 的 OPcache 功能並未被妥善設定。<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">為了有更好的效能表現</a>，我們建議在 <code>php.ini</code> 設定檔中使用以下設定：", + "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "您的資料目錄和檔案看來可以被公開存取，這表示 .htaccess 設定檔並未生效，我們強烈建議您設定網頁伺服器，拒絕公開存取資料目錄，或者將您的資料目錄移出網頁伺服器根目錄。", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "目前 HTTP 的 {header} 標頭設定並不是 \"{expected}\" ，這是一個潛在的安全性和隱私風險，我們建議調整此項設定。", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP \"Strict-Transport-Security\" 標頭並未設定持續至少 {seconds} 秒。為了提高安全性，我們在<a href=\"{docUrl}\" rel=\"noreferrer\">安全建議</a>中有詳述並建議啟用 HSTS。", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您目前透過 HTTP 存取此網站，如我們的<a href=\"{docUrl}\">安全建議</a>所述，我們強烈建議設定您的伺服器要求使用 HTTPS。", + "Shared with {recipients}" : "與 {recipients} 分享", "Share with other people by entering a user or group, a federated cloud ID or an email address." : "透過輸入使用者、群組名稱，聯盟式雲端ID或e-mail信箱來分享給其他人。 ", "Share with other people by entering a user or group or a federated cloud ID." : "透過輸入使用者、群組名稱，聯盟式雲端ID來分享給其他人。", "Share with other people by entering a user or group or an email address." : "透過輸入使用者、群組名稱或email來分享給其他人。", + "The server encountered an internal error and was unable to complete your request." : "伺服器遭遇內部錯誤，無法完成您的要求", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "閱讀<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">說明文件</a>來瞭解如何正確設定您的伺服器", + "This action requires you to confirm your password:" : "這個動作需要您再次確認密碼：", + "Wrong password. Reset it?" : "密碼錯誤，重設密碼？", "Alternative Logins" : "其他登入方法", + "You are about to grant \"%s\" access to your %s account." : "您將授予「%s」存取您的 %s 帳戶", + "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器", "Back to log in" : "回到登入頁面" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 32534c2a9e9..320113612d6 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -98,7 +98,6 @@ return array( 'OCP\\Contacts\\ContactsMenu\\ILinkAction' => $baseDir . '/lib/public/Contacts/ContactsMenu/ILinkAction.php', 'OCP\\Contacts\\ContactsMenu\\IProvider' => $baseDir . '/lib/public/Contacts/ContactsMenu/IProvider.php', 'OCP\\Contacts\\IManager' => $baseDir . '/lib/public/Contacts/IManager.php', - 'OCP\\DB' => $baseDir . '/lib/public/DB.php', 'OCP\\DB\\ISchemaWrapper' => $baseDir . '/lib/public/DB/ISchemaWrapper.php', 'OCP\\DB\\QueryBuilder\\ICompositeExpression' => $baseDir . '/lib/public/DB/QueryBuilder/ICompositeExpression.php', 'OCP\\DB\\QueryBuilder\\IExpressionBuilder' => $baseDir . '/lib/public/DB/QueryBuilder/IExpressionBuilder.php', @@ -140,6 +139,7 @@ return array( 'OCP\\Files\\FileNameTooLongException' => $baseDir . '/lib/public/Files/FileNameTooLongException.php', 'OCP\\Files\\Folder' => $baseDir . '/lib/public/Files/Folder.php', 'OCP\\Files\\ForbiddenException' => $baseDir . '/lib/public/Files/ForbiddenException.php', + 'OCP\\Files\\GenericFileException' => $baseDir . '/lib/public/Files/GenericFileException.php', 'OCP\\Files\\IAppData' => $baseDir . '/lib/public/Files/IAppData.php', 'OCP\\Files\\IHomeStorage' => $baseDir . '/lib/public/Files/IHomeStorage.php', 'OCP\\Files\\IMimeTypeDetector' => $baseDir . '/lib/public/Files/IMimeTypeDetector.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index d37777001b6..ee94cd3ee81 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -128,7 +128,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Contacts\\ContactsMenu\\ILinkAction' => __DIR__ . '/../../..' . '/lib/public/Contacts/ContactsMenu/ILinkAction.php', 'OCP\\Contacts\\ContactsMenu\\IProvider' => __DIR__ . '/../../..' . '/lib/public/Contacts/ContactsMenu/IProvider.php', 'OCP\\Contacts\\IManager' => __DIR__ . '/../../..' . '/lib/public/Contacts/IManager.php', - 'OCP\\DB' => __DIR__ . '/../../..' . '/lib/public/DB.php', 'OCP\\DB\\ISchemaWrapper' => __DIR__ . '/../../..' . '/lib/public/DB/ISchemaWrapper.php', 'OCP\\DB\\QueryBuilder\\ICompositeExpression' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/ICompositeExpression.php', 'OCP\\DB\\QueryBuilder\\IExpressionBuilder' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IExpressionBuilder.php', @@ -170,6 +169,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Files\\FileNameTooLongException' => __DIR__ . '/../../..' . '/lib/public/Files/FileNameTooLongException.php', 'OCP\\Files\\Folder' => __DIR__ . '/../../..' . '/lib/public/Files/Folder.php', 'OCP\\Files\\ForbiddenException' => __DIR__ . '/../../..' . '/lib/public/Files/ForbiddenException.php', + 'OCP\\Files\\GenericFileException' => __DIR__ . '/../../..' . '/lib/public/Files/GenericFileException.php', 'OCP\\Files\\IAppData' => __DIR__ . '/../../..' . '/lib/public/Files/IAppData.php', 'OCP\\Files\\IHomeStorage' => __DIR__ . '/../../..' . '/lib/public/Files/IHomeStorage.php', 'OCP\\Files\\IMimeTypeDetector' => __DIR__ . '/../../..' . '/lib/public/Files/IMimeTypeDetector.php', diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js index d474e7c8df2..ee1ed07051f 100644 --- a/lib/l10n/fi.js +++ b/lib/l10n/fi.js @@ -22,6 +22,7 @@ OC.L10N.register( "Following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s", "Server version %s or higher is required." : "Palvelinversio %s tai sitä uudempi vaaditaan.", "Server version %s or lower is required." : "Palvelinversio %s tai alhaisempi vaaditaan.", + "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä", "Unknown filetype" : "Tuntematon tiedostotyyppi", "Invalid image" : "Virheellinen kuva", "Avatar image is not square" : "Avatar-kuva ei ole neliö", diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json index e03f2c3b1ee..8806183f8b3 100644 --- a/lib/l10n/fi.json +++ b/lib/l10n/fi.json @@ -20,6 +20,7 @@ "Following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s", "Server version %s or higher is required." : "Palvelinversio %s tai sitä uudempi vaaditaan.", "Server version %s or lower is required." : "Palvelinversio %s tai alhaisempi vaaditaan.", + "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä", "Unknown filetype" : "Tuntematon tiedostotyyppi", "Invalid image" : "Virheellinen kuva", "Avatar image is not square" : "Avatar-kuva ei ole neliö", diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js index ddd0c1de7f4..5b5f93ce175 100644 --- a/lib/l10n/sk.js +++ b/lib/l10n/sk.js @@ -66,6 +66,9 @@ OC.L10N.register( "Unknown user" : "Neznámy používateľ", "APCu" : "APCu", "Redis" : "Redis", + "Create" : "Vytvoriť", + "Delete" : "Zmazať", + "Share" : "Zdieľať", "Basic settings" : "Základné nastavenia", "Sharing" : "Sprístupnenie", "Security" : "Zabezpečenie", @@ -227,6 +230,8 @@ OC.L10N.register( "Storage incomplete configuration. %s" : "Neplatná konfigurácia úložiska. %s", "Storage connection error. %s" : "Chyba pripojenia k úložisku. %s", "Storage is temporarily not available" : "Úložisko je dočasne nedostupné", - "Storage connection timeout. %s" : "Vypršanie pripojenia k úložisku. %s" + "Storage connection timeout. %s" : "Vypršanie pripojenia k úložisku. %s", + "Personal" : "Osobné", + "App '%s' could not be installed!" : "Aplikáciu '%s' nebolo možné nainštalovať!" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json index a9b9e1e6957..107c44a73c3 100644 --- a/lib/l10n/sk.json +++ b/lib/l10n/sk.json @@ -64,6 +64,9 @@ "Unknown user" : "Neznámy používateľ", "APCu" : "APCu", "Redis" : "Redis", + "Create" : "Vytvoriť", + "Delete" : "Zmazať", + "Share" : "Zdieľať", "Basic settings" : "Základné nastavenia", "Sharing" : "Sprístupnenie", "Security" : "Zabezpečenie", @@ -225,6 +228,8 @@ "Storage incomplete configuration. %s" : "Neplatná konfigurácia úložiska. %s", "Storage connection error. %s" : "Chyba pripojenia k úložisku. %s", "Storage is temporarily not available" : "Úložisko je dočasne nedostupné", - "Storage connection timeout. %s" : "Vypršanie pripojenia k úložisku. %s" + "Storage connection timeout. %s" : "Vypršanie pripojenia k úložisku. %s", + "Personal" : "Osobné", + "App '%s' could not be installed!" : "Aplikáciu '%s' nebolo možné nainštalovať!" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php index fc0adbbd47b..ddd19ac6345 100644 --- a/lib/private/Encryption/Util.php +++ b/lib/private/Encryption/Util.php @@ -35,6 +35,7 @@ use OC\Files\Filesystem; use OC\Files\View; use OCP\Encryption\IEncryptionModule; use OCP\IConfig; +use OCP\IUser; class Util { @@ -271,9 +272,12 @@ class Util { } public function getUserWithAccessToMountPoint($users, $groups) { - $result = array(); + $result = []; if (in_array('all', $users)) { - $result = \OCP\User::getUsers(); + $users = $this->userManager->search('', null, null); + $result = array_map(function(IUser $user) { + return $user->getUID(); + }, $users); } else { $result = array_merge($result, $users); diff --git a/lib/private/Files/Node/File.php b/lib/private/Files/Node/File.php index 4bfa5d583f7..2ddbac97dce 100644 --- a/lib/private/Files/Node/File.php +++ b/lib/private/Files/Node/File.php @@ -26,6 +26,7 @@ namespace OC\Files\Node; +use OCP\Files\GenericFileException; use OCP\Files\NotPermittedException; class File extends Node implements \OCP\Files\File { @@ -57,11 +58,14 @@ class File extends Node implements \OCP\Files\File { /** * @param string $data * @throws \OCP\Files\NotPermittedException + * @throws \OCP\Files\GenericFileException */ public function putContent($data) { if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) { $this->sendHooks(array('preWrite')); - $this->view->file_put_contents($this->path, $data); + if ($this->view->file_put_contents($this->path, $data) === false) { + throw new GenericFileException('file_put_contents failed'); + } $this->fileInfo = null; $this->sendHooks(array('postWrite')); } else { diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index a439a978cce..abd7f6ee6ee 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -40,23 +40,25 @@ namespace OC\Group; +use OCP\IDBConnection; + /** * Class for group management in a SQL Database (e.g. MySQL, SQLite) */ -class Database extends \OC\Group\Backend { +class Database extends Backend { /** @var string[] */ private $groupCache = []; - /** @var \OCP\IDBConnection */ + /** @var IDBConnection */ private $dbConn; /** * \OC\Group\Database constructor. * - * @param \OCP\IDBConnection|null $dbConn + * @param IDBConnection|null $dbConn */ - public function __construct(\OCP\IDBConnection $dbConn = null) { + public function __construct(IDBConnection $dbConn = null) { $this->dbConn = $dbConn; } @@ -219,7 +221,7 @@ class Database extends \OC\Group\Backend { $groups = []; while( $row = $cursor->fetch()) { - $groups[] = $row["gid"]; + $groups[] = $row['gid']; $this->groupCache[$row['gid']] = $row['gid']; } $cursor->closeCursor(); @@ -237,19 +239,29 @@ class Database extends \OC\Group\Backend { * Returns a list with all groups */ public function getGroups($search = '', $limit = null, $offset = null) { - $parameters = []; - $searchLike = ''; + $this->fixDI(); + + $query = $this->dbConn->getQueryBuilder(); + $query->select('gid') + ->from('groups') + ->orderBy('gid', 'ASC'); + if ($search !== '') { - $parameters[] = '%' . $search . '%'; - $searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)'; + $query->where($query->expr()->iLike('gid', $query->createNamedParameter( + '%' . $this->dbConn->escapeLikeParameter($search) . '%' + ))); } - $stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset); - $result = $stmt->execute($parameters); - $groups = array(); - while ($row = $result->fetchRow()) { + $query->setMaxResults($limit) + ->setFirstResult($offset); + $result = $query->execute(); + + $groups = []; + while ($row = $result->fetch()) { $groups[] = $row['gid']; } + $result->closeCursor(); + return $groups; } @@ -290,21 +302,30 @@ class Database extends \OC\Group\Backend { * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = null, $offset = null) { - $parameters = [$gid]; - $searchLike = ''; + $this->fixDI(); + + $query = $this->dbConn->getQueryBuilder(); + $query->select('uid') + ->from('group_user') + ->where($query->expr()->eq('gid', $query->createNamedParameter($gid))) + ->orderBy('uid', 'ASC'); + if ($search !== '') { - $parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%'; - $searchLike = ' AND `uid` LIKE ?'; + $query->andWhere($query->expr()->like('uid', $query->createNamedParameter( + '%' . $this->dbConn->escapeLikeParameter($search) . '%' + ))); } - $stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC', - $limit, - $offset); - $result = $stmt->execute($parameters); - $users = array(); - while ($row = $result->fetchRow()) { + $query->setMaxResults($limit) + ->setFirstResult($offset); + $result = $query->execute(); + + $users = []; + while ($row = $result->fetch()) { $users[] = $row['uid']; } + $result->closeCursor(); + return $users; } @@ -313,20 +334,26 @@ class Database extends \OC\Group\Backend { * @param string $gid * @param string $search * @return int|false - * @throws \OC\DatabaseException */ public function countUsersInGroup($gid, $search = '') { - $parameters = [$gid]; - $searchLike = ''; + $this->fixDI(); + + $query = $this->dbConn->getQueryBuilder(); + $query->selectAlias($query->createFunction('COUNT(*)'), 'num_users') + ->from('group_user') + ->where($query->expr()->eq('gid', $query->createNamedParameter($gid))); + if ($search !== '') { - $parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%'; - $searchLike = ' AND `uid` LIKE ?'; + $query->andWhere($query->expr()->like('uid', $query->createNamedParameter( + '%' . $this->dbConn->escapeLikeParameter($search) . '%' + ))); } - $stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike); - $result = $stmt->execute($parameters); - $count = $result->fetchOne(); - if($count !== false) { + $result = $query->execute(); + $count = $result->fetchColumn(); + $result->closeCursor(); + + if ($count !== false) { $count = (int)$count; } return $count; diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 90a05ac51a8..9c82fcc268b 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -1238,7 +1238,8 @@ class Share extends Constants { $row['share_with_displayname'] = $row['share_with']; if ( isset($row['share_with']) && $row['share_with'] != '' && $row['share_type'] === self::SHARE_TYPE_USER) { - $row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']); + $shareWithUser = \OC::$server->getUserManager()->get($row['share_with']); + $row['share_with_displayname'] = $shareWithUser === null ? $row['share_with'] : $shareWithUser->getDisplayName(); } else if(isset($row['share_with']) && $row['share_with'] != '' && $row['share_type'] === self::SHARE_TYPE_REMOTE) { $addressBookEntries = \OC::$server->getContactsManager()->search($row['share_with'], ['CLOUD']); @@ -1251,7 +1252,8 @@ class Share extends Constants { } } if ( isset($row['uid_owner']) && $row['uid_owner'] != '') { - $row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']); + $ownerUser = \OC::$server->getUserManager()->get($row['uid_owner']); + $row['displayname_owner'] = $ownerUser === null ? $row['uid_owner'] : $ownerUser->getDisplayName(); } if ($row['permissions'] > 0) { diff --git a/lib/private/Tags.php b/lib/private/Tags.php index cf1c5c0fbad..c78297e5290 100644 --- a/lib/private/Tags.php +++ b/lib/private/Tags.php @@ -288,7 +288,7 @@ class Tags implements \OCP\ITags { . '` WHERE `categoryid` = ?'; try { - $stmt = \OCP\DB::prepare($sql); + $stmt = \OC_DB::prepare($sql); $result = $stmt->execute(array($tagId)); if ($result === null) { \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR); @@ -530,7 +530,7 @@ class Tags implements \OCP\ITags { // Find all objectid/tagId pairs. $result = null; try { - $stmt = \OCP\DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` ' + $stmt = \OC_DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` ' . 'WHERE `uid` = ?'); $result = $stmt->execute(array($arguments['uid'])); if ($result === null) { @@ -546,7 +546,7 @@ class Tags implements \OCP\ITags { if(!is_null($result)) { try { - $stmt = \OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' + $stmt = \OC_DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' . 'WHERE `categoryid` = ?'); while( $row = $result->fetchRow()) { try { @@ -568,7 +568,7 @@ class Tags implements \OCP\ITags { } } try { - $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` ' + $stmt = \OC_DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` ' . 'WHERE `uid` = ?'); $result = $stmt->execute(array($arguments['uid'])); if ($result === null) { @@ -600,7 +600,7 @@ class Tags implements \OCP\ITags { $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; $query .= 'AND `type`= ?'; $updates[] = $this->type; - $stmt = \OCP\DB::prepare($query); + $stmt = \OC_DB::prepare($query); $result = $stmt->execute($updates); if ($result === null) { \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR); @@ -719,7 +719,7 @@ class Tags implements \OCP\ITags { try { $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; - $stmt = \OCP\DB::prepare($sql); + $stmt = \OC_DB::prepare($sql); $stmt->execute(array($objid, $tagId, $this->type)); } catch(\Exception $e) { \OC::$server->getLogger()->logException($e, [ @@ -769,7 +769,7 @@ class Tags implements \OCP\ITags { try { $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' . 'WHERE `categoryid` = ?'; - $stmt = \OCP\DB::prepare($sql); + $stmt = \OC_DB::prepare($sql); $result = $stmt->execute(array($id)); if ($result === null) { \OCP\Util::writeLog('core', diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index 0f5be9643b4..6fb9d11953b 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -112,7 +112,7 @@ class SCSSCacher { $path = explode('/', $root . '/' . $file); $fileNameSCSS = array_pop($path); - $fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)); + $fileNameCSS = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)), $app); $path = implode('/', $path); $webDir = $this->getWebDir($path, $app, $this->serverRoot, \OC::$WEBROOT); @@ -138,7 +138,8 @@ class SCSSCacher { */ public function getCachedCSS(string $appName, string $fileName): ISimpleFile { $folder = $this->appData->getFolder($appName); - return $folder->getFile($this->prependBaseurlPrefix($fileName)); + $cachedFileName = $this->prependVersionPrefix($this->prependBaseurlPrefix($fileName), $appName); + return $folder->getFile($cachedFileName); } /** @@ -322,19 +323,34 @@ class SCSSCacher { public function getCachedSCSS(string $appName, string $fileName): string { $tmpfileLoc = explode('/', $fileName); $fileName = array_pop($tmpfileLoc); - $fileName = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName)); + $fileName = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName)), $appName); return substr($this->urlGenerator->linkToRoute('core.Css.getCss', ['fileName' => $fileName, 'appName' => $appName]), strlen(\OC::$WEBROOT) + 1); } /** * Prepend hashed base url to the css file - * @param string$cssFile + * @param string $cssFile * @return string */ private function prependBaseurlPrefix(string $cssFile): string { $frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'); - return substr(md5($this->urlGenerator->getBaseUrl() . $frontendController), 0, 8) . '-' . $cssFile; + return substr(md5($this->urlGenerator->getBaseUrl() . $frontendController), 0, 4) . '-' . $cssFile; + } + + /** + * Prepend hashed app version hash + * @param string $cssFile + * @param string $appId + * @return string + */ + private function prependVersionPrefix(string $cssFile, string $appId): string { + $appVersion = \OC_App::getAppVersion($appId); + if ($appVersion !== '0') { + return substr(md5($appVersion), 0, 4) . '-' . $cssFile; + } + $coreVersion = \OC_Util::getVersionString(); + return substr(md5($coreVersion), 0, 4) . '-' . $cssFile; } /** diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index c541e53a48d..3a22c91a8df 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -54,15 +54,16 @@ class OC_Defaults { public function __construct() { $this->l = \OC::$server->getL10N('lib'); + $config = \OC::$server->getConfig(); $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */ $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */ $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */ $this->defaultBaseUrl = 'https://nextcloud.com'; - $this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients'; - $this->defaultiOSClientUrl = 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'; - $this->defaultiTunesAppId = '1125420102'; - $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client'; + $this->defaultSyncClientUrl = $config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients'); + $this->defaultiOSClientUrl = $config->getSystemValue('customclient_ios', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'); + $this->defaultiTunesAppId = $config->getSystemValue('customclient_ios_appid', '1125420102'); + $this->defaultAndroidClientUrl = $config->getSystemValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.nextcloud.client'); $this->defaultDocBaseUrl = 'https://docs.nextcloud.com'; $this->defaultDocVersion = '14'; // used to generate doc links $this->defaultSlogan = $this->l->t('a safe home for all your data'); diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index 8f342281adb..9c877f22a46 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -312,6 +312,8 @@ class OC_User { * * @param string $uid * @return string|bool uid or false + * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method + * get() of \OCP\IUserManager - \OC::$server->getUserManager() */ public static function getDisplayName($uid = null) { if ($uid) { @@ -367,25 +369,6 @@ class OC_User { } /** - * Get a list of all users - * - * @return array an array of all uids - * - * Get a list of all users. - * @param string $search - * @param integer $limit - * @param integer $offset - */ - public static function getUsers($search = '', $limit = null, $offset = null) { - $users = \OC::$server->getUserManager()->search($search, $limit, $offset); - $uids = array(); - foreach ($users as $user) { - $uids[] = $user->getUID(); - } - return $uids; - } - - /** * Get a list of all users display name * * @param string $search diff --git a/lib/public/Authentication/TwoFactorAuth/IProvider.php b/lib/public/Authentication/TwoFactorAuth/IProvider.php index c4c481a2f32..84752cecc77 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvider.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvider.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. * @@ -43,7 +44,7 @@ interface IProvider { * * @return string */ - public function getId(); + public function getId(): string; /** * Get the display name for selecting the 2FA provider @@ -54,7 +55,7 @@ interface IProvider { * * @return string */ - public function getDisplayName(); + public function getDisplayName(): string; /** * Get the description for selecting the 2FA provider @@ -65,7 +66,7 @@ interface IProvider { * * @return string */ - public function getDescription(); + public function getDescription(): string; /** * Get the template for rending the 2FA provider view @@ -75,7 +76,7 @@ interface IProvider { * @param IUser $user * @return Template */ - public function getTemplate(IUser $user); + public function getTemplate(IUser $user): Template; /** * Verify the given challenge @@ -84,8 +85,9 @@ interface IProvider { * * @param IUser $user * @param string $challenge + * @return bool */ - public function verifyChallenge(IUser $user, $challenge); + public function verifyChallenge(IUser $user, string $challenge): bool; /** * Decides whether 2FA is enabled for the given user @@ -93,7 +95,7 @@ interface IProvider { * @since 9.1.0 * * @param IUser $user - * @return boolean + * @return bool */ - public function isTwoFactorAuthEnabledForUser(IUser $user); + public function isTwoFactorAuthEnabledForUser(IUser $user): bool; } diff --git a/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php b/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php index 2a498adc0b8..3b477dc53fe 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * * @@ -35,5 +36,5 @@ interface IProvidesCustomCSP { * * @since 13.0.0 */ - public function getCSP(); + public function getCSP(): ContentSecurityPolicy; } diff --git a/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php b/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php index a18b9e8c4a8..d94c3e61465 100644 --- a/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php +++ b/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud GmbH. * diff --git a/lib/public/DB.php b/lib/public/DB.php deleted file mode 100644 index 85a34ff37a0..00000000000 --- a/lib/public/DB.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Bart Visscher <bartv@thisnet.nl> - * @author Dan Bartram <daneybartram@gmail.com> - * @author Frank Karlitschek <frank@karlitschek.de> - * @author Joas Schilling <coding@schilljs.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <robin@icewind.nl> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Thomas Tanghus <thomas@tanghus.net> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * 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, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -/** - * Public interface of ownCloud for apps to use. - * DB Class - * - */ - -// use OCP namespace for all classes that are considered public. -// This means that they should be used by apps instead of the internal ownCloud classes -namespace OCP; - -/** - * This class provides access to the internal database system. Use this class exlusively if you want to access databases - * @deprecated 8.1.0 use methods of \OCP\IDBConnection - \OC::$server->getDatabaseConnection() - * @since 4.5.0 - */ -class DB { - /** - * Prepare a SQL query - * @param string $query Query string - * @param int $limit Limit of the SQL statement - * @param int $offset Offset of the SQL statement - * @return \OC_DB_StatementWrapper prepared SQL query - * - * SQL query via Doctrine prepare(), needs to be execute()'d! - * @deprecated 8.1.0 use prepare() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection() - * @since 4.5.0 - */ - static public function prepare( $query, $limit=null, $offset=null ) { - return \OC_DB::prepare($query, $limit, $offset); - } - -} diff --git a/lib/public/Files/File.php b/lib/public/Files/File.php index 8b57b3cfd87..0f052bc66ad 100644 --- a/lib/public/Files/File.php +++ b/lib/public/Files/File.php @@ -53,7 +53,7 @@ interface File extends Node { * * @param string $data * @throws \OCP\Files\NotPermittedException - * @return void + * @throws \OCP\Files\GenericFileException * @since 6.0.0 */ public function putContent($data); diff --git a/lib/public/Files/GenericFileException.php b/lib/public/Files/GenericFileException.php new file mode 100644 index 00000000000..b5da4aabebd --- /dev/null +++ b/lib/public/Files/GenericFileException.php @@ -0,0 +1,33 @@ +<?php +/** + * @copyright 2018, 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/>. + * + */ +namespace OCP\Files; + +/** + * Class GenericFileException + * + * @package OCP\Files + * @since 14.0.0 + */ +class GenericFileException extends \Exception { + +} diff --git a/lib/public/User.php b/lib/public/User.php index 14fdd6fb1ab..a669a3a06fc 100644 --- a/lib/public/User.php +++ b/lib/public/User.php @@ -58,31 +58,6 @@ class User { } /** - * Get a list of all users - * @param string $search search pattern - * @param int|null $limit - * @param int|null $offset - * @return array an array of all uids - * @deprecated 8.1.0 use method search() of \OCP\IUserManager - \OC::$server->getUserManager() - * @since 5.0.0 - */ - public static function getUsers( $search = '', $limit = null, $offset = null ) { - return \OC_User::getUsers( $search, $limit, $offset ); - } - - /** - * Get the user display name of the user currently logged in. - * @param string|null $user user id or null for current user - * @return string display name - * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method - * get() of \OCP\IUserManager - \OC::$server->getUserManager() - * @since 5.0.0 - */ - public static function getDisplayName( $user = null ) { - return \OC_User::getDisplayName( $user ); - } - - /** * Check if the user is logged in * @return boolean * @since 5.0.0 @@ -93,18 +68,6 @@ class User { } /** - * Check if a user exists - * @param string $uid the username - * @param string $excludingBackend (default none) - * @return boolean - * @deprecated 8.1.0 use method userExists() of \OCP\IUserManager - \OC::$server->getUserManager() - * @since 5.0.0 - */ - public static function userExists($uid, $excludingBackend = null) { - return \OC::$server->getUserManager()->userExists($uid); - } - - /** * Check if the user is a admin, redirects to home if not * @since 5.0.0 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 21dc76fcac3..b5b4ecf1e37 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -754,6 +754,7 @@ span.version { } a { padding: 10px; + margin: -6px; white-space: nowrap; } .official { diff --git a/settings/l10n/hu.js b/settings/l10n/hu.js index 5bca7d49921..abeb45f3283 100644 --- a/settings/l10n/hu.js +++ b/settings/l10n/hu.js @@ -160,6 +160,7 @@ OC.L10N.register( "Good password" : "Jó jelszó", "Strong password" : "Erős jelszó", "Groups" : "Csoportok", + "Unable to retrieve the group list" : "Csoportlista betöltése sikertelen", "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}", "Error creating group: {message}" : "Hiba történt a csoport létrehozásakor: {message}", "A valid group name must be provided" : "Érvényes csoportnevet kell megadni", diff --git a/settings/l10n/hu.json b/settings/l10n/hu.json index 8c2a8b1c736..c94d3c64f73 100644 --- a/settings/l10n/hu.json +++ b/settings/l10n/hu.json @@ -158,6 +158,7 @@ "Good password" : "Jó jelszó", "Strong password" : "Erős jelszó", "Groups" : "Csoportok", + "Unable to retrieve the group list" : "Csoportlista betöltése sikertelen", "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}", "Error creating group: {message}" : "Hiba történt a csoport létrehozásakor: {message}", "A valid group name must be provided" : "Érvényes csoportnevet kell megadni", diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js index b3039da4cfb..8e70c315ad5 100644 --- a/settings/l10n/sk.js +++ b/settings/l10n/sk.js @@ -103,6 +103,7 @@ OC.L10N.register( "Error: Could not disable broken app" : "Chyba: nebolo možné zakázať poškodenú aplikáciu", "Error while disabling broken app" : "Nastala chyba počas zakazovania poškodenej aplikácie", "App up to date" : "Aplikácia je aktuálna", + "Updating …" : "Aktualizuje sa...", "Updated" : "Aktualizované", "Removing …" : "Odstraňujem ...", "Could not remove app" : "Aplikáciu nie je možné zmazať", diff --git a/settings/l10n/sk.json b/settings/l10n/sk.json index 7f241c39657..715a8b44a4f 100644 --- a/settings/l10n/sk.json +++ b/settings/l10n/sk.json @@ -101,6 +101,7 @@ "Error: Could not disable broken app" : "Chyba: nebolo možné zakázať poškodenú aplikáciu", "Error while disabling broken app" : "Nastala chyba počas zakazovania poškodenej aplikácie", "App up to date" : "Aplikácia je aktuálna", + "Updating …" : "Aktualizuje sa...", "Updated" : "Aktualizované", "Removing …" : "Odstraňujem ...", "Could not remove app" : "Aplikáciu nie je možné zmazať", diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 9e2f9cf2df4..3b22e99a015 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -58,7 +58,7 @@ $urlGenerator = $_['urlGenerator']; </div> <div class="app-version">{{version}}</div> <div class="app-level"> - {{{level}}}{{#unless internal}}<a href="https://apps.nextcloud.com/apps/{{id}}"><?php p($l->t('View in store'));?> ↗</a>{{/unless}} + {{{level}}}{{#unless internal}}<a href="https://apps.nextcloud.com/apps/{{id}}" target="_blank"><?php p($l->t('View in store'));?> ↗</a>{{/unless}} </div> <div class="app-groups"> diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index 169ee26802a..a55ba30711b 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -35,6 +35,7 @@ use OCP\ICacheFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; +use OC_App; class SCSSCacherTest extends \Test\TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ @@ -58,17 +59,26 @@ class SCSSCacherTest extends \Test\TestCase { parent::setUp(); $this->logger = $this->createMock(ILogger::class); $this->appData = $this->createMock(IAppData::class); + /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ $factory = $this->createMock(Factory::class); $factory->method('get')->with('css')->willReturn($this->appData); + $this->urlGenerator = $this->createMock(IURLGenerator::class); + $this->urlGenerator->expects($this->any()) + ->method('getBaseUrl') + ->willReturn('http://localhost/nextcloud'); + $this->config = $this->createMock(IConfig::class); $this->cacheFactory = $this->createMock(ICacheFactory::class); $this->depsCache = $this->createMock(ICache::class); $this->cacheFactory->expects($this->at(0)) ->method('createDistributed') ->willReturn($this->depsCache); + $this->themingDefaults = $this->createMock(ThemingDefaults::class); + $this->themingDefaults->expects($this->any())->method('getScssVariables')->willReturn([]); + $this->scssCacher = new SCSSCacher( $this->logger, $factory, @@ -78,11 +88,6 @@ class SCSSCacherTest extends \Test\TestCase { \OC::$SERVERROOT, $this->cacheFactory ); - $this->themingDefaults->expects($this->any())->method('getScssVariables')->willReturn([]); - - $this->urlGenerator->expects($this->any()) - ->method('getBaseUrl') - ->willReturn('http://localhost/nextcloud'); } public function testProcessUncachedFileNoAppDataFolder() { @@ -96,7 +101,8 @@ class SCSSCacherTest extends \Test\TestCase { $fileDeps = $this->createMock(ISimpleFile::class); $gzfile = $this->createMock(ISimpleFile::class); - $filePrefix = substr(md5('http://localhost/nextcloud'), 0, 8) . '-'; + $filePrefix = substr(md5(\OC_Util::getVersionString('core')), 0, 4) . '-' . + substr(md5('http://localhost/nextcloud'), 0, 4) . '-'; $folder->method('getFile') ->will($this->returnCallback(function($path) use ($file, $gzfile, $filePrefix) { @@ -131,7 +137,8 @@ class SCSSCacherTest extends \Test\TestCase { $file->expects($this->any())->method('getSize')->willReturn(1); $fileDeps = $this->createMock(ISimpleFile::class); $gzfile = $this->createMock(ISimpleFile::class); - $filePrefix = substr(md5('http://localhost/nextcloud'), 0, 8) . '-'; + $filePrefix = substr(md5(\OC_Util::getVersionString('core')), 0, 4) . '-' . + substr(md5('http://localhost/nextcloud'), 0, 4) . '-'; $folder->method('getFile') ->will($this->returnCallback(function($path) use ($file, $gzfile, $filePrefix) { @@ -162,7 +169,8 @@ class SCSSCacherTest extends \Test\TestCase { $fileDeps = $this->createMock(ISimpleFile::class); $fileDeps->expects($this->any())->method('getSize')->willReturn(1); $gzFile = $this->createMock(ISimpleFile::class); - $filePrefix = substr(md5('http://localhost/nextcloud'), 0, 8) . '-'; + $filePrefix = substr(md5(\OC_Util::getVersionString('core')), 0, 4) . '-' . + substr(md5('http://localhost/nextcloud'), 0, 4) . '-'; $folder->method('getFile') ->will($this->returnCallback(function($name) use ($file, $fileDeps, $gzFile, $filePrefix) { @@ -197,6 +205,8 @@ class SCSSCacherTest extends \Test\TestCase { $gzFile = $this->createMock(ISimpleFile::class); $filePrefix = substr(md5('http://localhost/nextcloud'), 0, 8) . '-'; + $filePrefix = substr(md5(\OC_Util::getVersionString('core')), 0, 4) . '-' . + substr(md5('http://localhost/nextcloud'), 0, 4) . '-'; $folder->method('getFile') ->will($this->returnCallback(function($name) use ($file, $fileDeps, $gzFile, $filePrefix) { if ($name === $filePrefix.'styles.css') { @@ -382,8 +392,8 @@ class SCSSCacherTest extends \Test\TestCase { public function dataGetCachedSCSS() { return [ - ['core', 'core/css/styles.scss', '/css/core/styles.css'], - ['files', 'apps/files/css/styles.scss', '/css/files/styles.css'] + ['core', 'core/css/styles.scss', '/css/core/styles.css', \OC_Util::getVersionString()], + ['files', 'apps/files/css/styles.scss', '/css/files/styles.css', \OC_App::getAppVersion('files')] ]; } @@ -393,11 +403,12 @@ class SCSSCacherTest extends \Test\TestCase { * @param $result * @dataProvider dataGetCachedSCSS */ - public function testGetCachedSCSS($appName, $fileName, $result) { + public function testGetCachedSCSS($appName, $fileName, $result, $version) { $this->urlGenerator->expects($this->once()) ->method('linkToRoute') ->with('core.Css.getCss', [ - 'fileName' => substr(md5('http://localhost/nextcloud'), 0, 8) . '-styles.css', + 'fileName' => substr(md5($version), 0, 4) . '-' . + substr(md5('http://localhost/nextcloud'), 0, 4) . '-styles.css', 'appName' => $appName ]) ->willReturn(\OC::$WEBROOT . $result); diff --git a/themes/example/defaults.php b/themes/example/defaults.php index 39006c94ad2..8ed4761c660 100644 --- a/themes/example/defaults.php +++ b/themes/example/defaults.php @@ -29,38 +29,6 @@ class OC_Theme { } /** - * Returns the URL where the sync clients are listed - * @return string URL - */ - public function getSyncClientUrl() { - return 'https://nextcloud.com/install/#install-clients'; - } - - /** - * Returns the URL to the App Store for the iOS Client - * @return string URL - */ - public function getiOSClientUrl() { - return 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'; - } - - /** - * Returns the AppId for the App Store for the iOS Client - * @return string AppId - */ - public function getiTunesAppId() { - return '1125420102'; - } - - /** - * Returns the URL to Google Play for the Android Client - * @return string URL - */ - public function getAndroidClientUrl() { - return 'https://play.google.com/store/apps/details?id=com.nextcloud.client'; - } - - /** * Returns the documentation URL * @return string URL */ |