diff options
172 files changed, 551 insertions, 390 deletions
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js index e9477dd54db..661731c31d3 100644 --- a/apps/encryption/l10n/cs_CZ.js +++ b/apps/encryption/l10n/cs_CZ.js @@ -25,6 +25,7 @@ OC.L10N.register( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste", "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena", + "one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.", "The share will expire on %s." : "Sdílení vyprší %s.", diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json index ed75239894e..1b530d137ed 100644 --- a/apps/encryption/l10n/cs_CZ.json +++ b/apps/encryption/l10n/cs_CZ.json @@ -23,6 +23,7 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste", "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena", + "one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.", "The share will expire on %s." : "Sdílení vyprší %s.", diff --git a/apps/encryption/l10n/th_TH.js b/apps/encryption/l10n/th_TH.js index 82db7a6e8b3..3c4a5d696fa 100644 --- a/apps/encryption/l10n/th_TH.js +++ b/apps/encryption/l10n/th_TH.js @@ -25,10 +25,13 @@ OC.L10N.register( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "รหัสส่วนตัวไม่ถูกต้องสำหรับการเข้ารหัสแอพฯ กรุณาอัพเดทรหัสการเข้ารหัสผ่านส่วนตัวของคุณในการตั้งค่าส่วนบุคคลและในการกู้คืนการเข้าถึงไฟล์ที่มีการเข้ารหัสของคุณ", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "การเข้ารหัสแอพฯ ถูกเปิดใช้งานแต่รหัสของคุณยังไม่ได้เริ่มต้นใช้ โปรดออกและเข้าสู่ระบบอีกครั้ง", "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน", + "one-time password for server-side-encryption" : "รหัสผ่านเพียงครั้งเดียว สำหรับเข้ารหัสฝั่งเซิร์ฟเวอร์", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "นี่คุณ<br>\n<br> \nผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong><br>\n<br>\nกรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br>\n<br>\n", "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s", "Cheers!" : "ไชโย!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "นี่คุณ <br><br> ผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong> <br><br>กรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br><br>", "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส", "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน", diff --git a/apps/encryption/l10n/th_TH.json b/apps/encryption/l10n/th_TH.json index 11fd75b87e1..b69cdb8a871 100644 --- a/apps/encryption/l10n/th_TH.json +++ b/apps/encryption/l10n/th_TH.json @@ -23,10 +23,13 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "รหัสส่วนตัวไม่ถูกต้องสำหรับการเข้ารหัสแอพฯ กรุณาอัพเดทรหัสการเข้ารหัสผ่านส่วนตัวของคุณในการตั้งค่าส่วนบุคคลและในการกู้คืนการเข้าถึงไฟล์ที่มีการเข้ารหัสของคุณ", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "การเข้ารหัสแอพฯ ถูกเปิดใช้งานแต่รหัสของคุณยังไม่ได้เริ่มต้นใช้ โปรดออกและเข้าสู่ระบบอีกครั้ง", "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน", + "one-time password for server-side-encryption" : "รหัสผ่านเพียงครั้งเดียว สำหรับเข้ารหัสฝั่งเซิร์ฟเวอร์", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "นี่คุณ<br>\n<br> \nผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong><br>\n<br>\nกรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br>\n<br>\n", "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s", "Cheers!" : "ไชโย!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "นี่คุณ <br><br> ผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong> <br><br>กรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br><br>", "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส", "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน", diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index b542fe63d64..bf9981adabf 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -756,6 +756,13 @@ MountConfigListView.prototype = _.extend({ $tr.append(priorityEl); $td.children().not('[type=hidden]').first().focus(); + // FIXME default backend mount options + $tr.find('input.mountOptions').val(JSON.stringify({ + 'encrypt': true, + 'previews': true, + 'filesystem_check_changes': 1 + })); + $tr.find('td').last().attr('class', 'remove'); $tr.find('td.mountOptionsToggle').removeClass('hidden'); $tr.find('td').last().removeAttr('style'); diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index b39eef71eaa..ab352880b7c 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -1,6 +1,9 @@ OC.L10N.register( "files_external", { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.", + "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.", "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s", "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s", "External storage" : "Externí úložiště", @@ -22,12 +25,15 @@ OC.L10N.register( "SFTP with secret key login" : "SFTP login s tajným klíčem", "Public key" : "Veřejný klíč", "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno", + "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu", "Invalid mount point" : "Neplatný přípojný bod", "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"", "Personal" : "Osobní", "System" : "Systém", "Grant access" : "Povolit přístup", "Access granted" : "Přístup povolen", + "Error configuring OAuth1" : "Chyba nastavení OAuth1", + "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Enable encryption" : "Povolit šifrování", "Enable previews" : "Povolit náhledy", "Check for changes" : "Zkontrolovat změny", @@ -39,12 +45,18 @@ OC.L10N.register( "Saved" : "Uloženo", "Generate keys" : "Vytvořit klíče", "Error generating key pair" : "Chyba při vytváření páru klíčů", + "Access key" : "Přístupový klíč", + "Secret key" : "Tajný klíč", "None" : "Žádné", + "OAuth1" : "OAuth1", "App key" : "Klíč aplikace", "App secret" : "Tajemství aplikace", + "OAuth2" : "OAuth2", "Client ID" : "Klientské ID", "Client secret" : "Klientské tajemství", + "Username and password" : "Uživatelské jméno a heslo", "Password" : "Heslo", + "Session credentials" : "Přihlašovací údaje sezení", "Amazon S3" : "Amazon S3", "Hostname" : "Hostname", "Port" : "Port", @@ -55,11 +67,15 @@ OC.L10N.register( "URL" : "URL", "Secure https://" : "Zabezpečené https://", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Secure ftps://" : "Zabezpečené ftps://", + "Google Drive" : "Google Drive", "Local" : "Místní", "Location" : "Umístění", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Kořen", + "SMB / CIFS" : "SMB / CIFS", "<b>Note:</b> " : "<b>Poznámka:</b>", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", @@ -71,6 +87,7 @@ OC.L10N.register( "Scope" : "Rozsah", "External Storage" : "Externí úložiště", "Folder name" : "Název složky", + "Authentication" : "Ověření", "Configuration" : "Nastavení", "Available for" : "Dostupné pro", "Advanced settings" : "Pokročilá nastavení", diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index c014da7976f..03afeb48b8e 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -1,4 +1,7 @@ { "translations": { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.", + "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.", "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s", "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s", "External storage" : "Externí úložiště", @@ -20,12 +23,15 @@ "SFTP with secret key login" : "SFTP login s tajným klíčem", "Public key" : "Veřejný klíč", "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno", + "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu", "Invalid mount point" : "Neplatný přípojný bod", "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"", "Personal" : "Osobní", "System" : "Systém", "Grant access" : "Povolit přístup", "Access granted" : "Přístup povolen", + "Error configuring OAuth1" : "Chyba nastavení OAuth1", + "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Enable encryption" : "Povolit šifrování", "Enable previews" : "Povolit náhledy", "Check for changes" : "Zkontrolovat změny", @@ -37,12 +43,18 @@ "Saved" : "Uloženo", "Generate keys" : "Vytvořit klíče", "Error generating key pair" : "Chyba při vytváření páru klíčů", + "Access key" : "Přístupový klíč", + "Secret key" : "Tajný klíč", "None" : "Žádné", + "OAuth1" : "OAuth1", "App key" : "Klíč aplikace", "App secret" : "Tajemství aplikace", + "OAuth2" : "OAuth2", "Client ID" : "Klientské ID", "Client secret" : "Klientské tajemství", + "Username and password" : "Uživatelské jméno a heslo", "Password" : "Heslo", + "Session credentials" : "Přihlašovací údaje sezení", "Amazon S3" : "Amazon S3", "Hostname" : "Hostname", "Port" : "Port", @@ -53,11 +65,15 @@ "URL" : "URL", "Secure https://" : "Zabezpečené https://", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Secure ftps://" : "Zabezpečené ftps://", + "Google Drive" : "Google Drive", "Local" : "Místní", "Location" : "Umístění", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Kořen", + "SMB / CIFS" : "SMB / CIFS", "<b>Note:</b> " : "<b>Poznámka:</b>", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", @@ -69,6 +85,7 @@ "Scope" : "Rozsah", "External Storage" : "Externí úložiště", "Folder name" : "Název složky", + "Authentication" : "Ověření", "Configuration" : "Nastavení", "Available for" : "Dostupné pro", "Advanced settings" : "Pokročilá nastavení", diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 9000fafd8dd..295d013beff 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -58,10 +58,6 @@ $application->setupPropagation(); \OCP\Util::addScript('files_sharing', 'external'); \OCP\Util::addStyle('files_sharing', 'sharetabview'); -// FIXME: registering a job here will cause additional useless SQL queries -// when the route is not cron.php, needs a better way -\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob'); - \OC::$server->getActivityManager()->registerExtension(function() { return new \OCA\Files_Sharing\Activity( \OC::$server->query('L10NFactory'), diff --git a/apps/files_sharing/appinfo/install.php b/apps/files_sharing/appinfo/install.php new file mode 100644 index 00000000000..f076a17e444 --- /dev/null +++ b/apps/files_sharing/appinfo/install.php @@ -0,0 +1,22 @@ +<?php +/** + * @author Joas Schilling <nickvergessen@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @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/> + * + */ + +\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob'); diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index e98b60ea36d..66b8b78cacf 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -28,3 +28,4 @@ if (version_compare($installedVersion, '0.6.0', '<')) { $m->addAcceptRow(); } +\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob'); diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version index b6160487433..844f6a91acb 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.6.2 +0.6.3 diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index 7051d9e56db..551a6ef4a00 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Sdružený cloud", "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", "Share it:" : "Sdílet:", - "Add it to your website:" : "Přidat na svou webovou stránku:", "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", "HTML Code:" : "HTML kód:" }, diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index c93886aa33c..065ab460158 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Sdružený cloud", "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", "Share it:" : "Sdílet:", - "Add it to your website:" : "Přidat na svou webovou stránku:", "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index 7e05b2ca442..b08b09f4284 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Din Federated Cloud ID:", "Share it:" : "Del:", - "Add it to your website:" : "Tilføj den til din hjemmeside:", "Share with me via ownCloud" : "Del med mig gennem ownCloud", "HTML Code:" : "HTMLkode:" }, diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index d08dbdc4273..5cd51acafc6 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Din Federated Cloud ID:", "Share it:" : "Del:", - "Add it to your website:" : "Tilføj den til din hjemmeside:", "Share with me via ownCloud" : "Del med mig gennem ownCloud", "HTML Code:" : "HTMLkode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index f6dcf690b60..afe6cae62eb 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", - "Add it to your website:" : "Zum Hinzufügen zu Deiner Website:", "Share with me via ownCloud" : "Teile mit mir über ownCloud", "HTML Code:" : "HTML-Code:" }, diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 76f9b6d1155..17f2b6252b8 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", - "Add it to your website:" : "Zum Hinzufügen zu Deiner Website:", "Share with me via ownCloud" : "Teile mit mir über ownCloud", "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 3c1eccd4607..395dbf4f295 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", - "Add it to your website:" : "Zum Hinzufügen zu Ihrer Website:", "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", "HTML Code:" : "HTML-Code:" }, diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 08732c602ec..11b953b3bac 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", - "Add it to your website:" : "Zum Hinzufügen zu Ihrer Website:", "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index 6a88a675f75..a72abe23b7f 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federated σύννεφο", "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", "Share it:" : "Μοιραστείτε το:", - "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", "HTML Code:" : "Κώδικας HTML:" }, diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 01b4e6d01b8..7b2b9848a72 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federated σύννεφο", "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", "Share it:" : "Μοιραστείτε το:", - "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", "HTML Code:" : "Κώδικας HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 7e5e48bbf78..e094507d396 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID Nube Federada:", "Share it:" : "Compartir:", - "Add it to your website:" : "Agregarlo a su sitio de internet:", "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", "HTML Code:" : "Código HTML:" }, diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 358330b80ac..48f1f22a1fd 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID Nube Federada:", "Share it:" : "Compartir:", - "Add it to your website:" : "Agregarlo a su sitio de internet:", "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index 535608ad511..a558a91896a 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -47,7 +47,6 @@ OC.L10N.register( "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", "Share it:" : "Jaga seda:", - "Add it to your website:" : "Lisa see oma veebisaidile:", "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", "HTML Code:" : "HTML kood:" }, diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index f894b06fc9e..183f1707525 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -45,7 +45,6 @@ "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", "Share it:" : "Jaga seda:", - "Add it to your website:" : "Lisa see oma veebisaidile:", "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", "HTML Code:" : "HTML kood:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 6ef1f741f6d..0de3dda9290 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federoitu pilvi", "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", "Share it:" : "Jaa se:", - "Add it to your website:" : "Lisää verkkosivustollesi:", "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", "HTML Code:" : "HTML-koodi:" }, diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index dfb9afb5a8b..80e353818cd 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federoitu pilvi", "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", "Share it:" : "Jaa se:", - "Add it to your website:" : "Lisää verkkosivustollesi:", "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", "HTML Code:" : "HTML-koodi:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index e07b93c788b..077c12e6db2 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", "Share it:" : "Partager :", - "Add it to your website:" : "Ajouter à votre site web :", "Share with me via ownCloud" : "Partagez avec moi via ownCloud", "HTML Code:" : "Code HTML :" }, diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index e597d3100b4..c4b3bbe2f72 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", "Share it:" : "Partager :", - "Add it to your website:" : "Ajouter à votre site web :", "Share with me via ownCloud" : "Partagez avec moi via ownCloud", "HTML Code:" : "Code HTML :" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 0e279172124..44dfaa52de2 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Nube federada", "Your Federated Cloud ID:" : "ID da súa nube federada:", "Share it:" : "Compártao:", - "Add it to your website:" : "Engádao o seu sitio web:", "Share with me via ownCloud" : "Comparte comigo a través do ownCloud", "HTML Code:" : "Código HTML:" }, diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index b4757ca2b2b..a9109c5000c 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Nube federada", "Your Federated Cloud ID:" : "ID da súa nube federada:", "Share it:" : "Compártao:", - "Add it to your website:" : "Engádao o seu sitio web:", "Share with me via ownCloud" : "Comparte comigo a través do ownCloud", "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js index b374be1c317..3278343a769 100644 --- a/apps/files_sharing/l10n/hu_HU.js +++ b/apps/files_sharing/l10n/hu_HU.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Egyesített felhő", "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", "Share it:" : "Ossza meg:", - "Add it to your website:" : "Adja hozzá a saját weboldalához:", "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", "HTML Code:" : "HTML Code:" }, diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json index f140b98a57c..edb98a5f70b 100644 --- a/apps/files_sharing/l10n/hu_HU.json +++ b/apps/files_sharing/l10n/hu_HU.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Egyesített felhő", "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", "Share it:" : "Ossza meg:", - "Add it to your website:" : "Adja hozzá a saját weboldalához:", "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js index 60b460da8e8..985b424e726 100644 --- a/apps/files_sharing/l10n/id.js +++ b/apps/files_sharing/l10n/id.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", "Share it:" : "Bagikan:", - "Add it to your website:" : "Tambahkan ke situs web Anda:", "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", "HTML Code:" : "Kode HTML:" }, diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json index c4ea5a5c56d..78f5d2352a7 100644 --- a/apps/files_sharing/l10n/id.json +++ b/apps/files_sharing/l10n/id.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", "Share it:" : "Bagikan:", - "Add it to your website:" : "Tambahkan ke situs web Anda:", "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", "HTML Code:" : "Kode HTML:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 8f89da9484d..0d8a315421f 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Share it:" : "Condividilo:", - "Add it to your website:" : "Aggiungilo al tuo sito web:", "Share with me via ownCloud" : "Condividi con me tramite ownCloud", "HTML Code:" : "Codice HTML:" }, diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index cad5b0c7db0..dd41b95eab7 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Share it:" : "Condividilo:", - "Add it to your website:" : "Aggiungilo al tuo sito web:", "Share with me via ownCloud" : "Condividi con me tramite ownCloud", "HTML Code:" : "Codice HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 73174dfeb84..0fa2f3c8d0f 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "クラウド連携", "Your Federated Cloud ID:" : "あなたのクラウド連携ID：", "Share it:" : "以下で共有:", - "Add it to your website:" : "ウェブサイトに追加:", "Share with me via ownCloud" : "OwnCloud経由で共有", "HTML Code:" : "HTMLコード:" }, diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 79cd4f0bc36..88b94fb5ed7 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -64,7 +64,6 @@ "Federated Cloud" : "クラウド連携", "Your Federated Cloud ID:" : "あなたのクラウド連携ID：", "Share it:" : "以下で共有:", - "Add it to your website:" : "ウェブサイトに追加:", "Share with me via ownCloud" : "OwnCloud経由で共有", "HTML Code:" : "HTMLコード:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index 638f750b2ef..646a57f7853 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "연합 클라우드", "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", "Share it:" : "공유하기:", - "Add it to your website:" : "웹 사이트에 다음을 추가하십시오:", "Share with me via ownCloud" : "ownCloud로 나와 공유하기", "HTML Code:" : "HTML 코드:" }, diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index 36d69b0f763..4d322770b1a 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -64,7 +64,6 @@ "Federated Cloud" : "연합 클라우드", "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", "Share it:" : "공유하기:", - "Add it to your website:" : "웹 사이트에 다음을 추가하십시오:", "Share with me via ownCloud" : "ownCloud로 나와 공유하기", "HTML Code:" : "HTML 코드:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js index 4b76dab034c..65b13acaf53 100644 --- a/apps/files_sharing/l10n/nb_NO.js +++ b/apps/files_sharing/l10n/nb_NO.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Sammenknyttet sky", "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", "Share it:" : "Del den:", - "Add it to your website:" : "Legg den på websiden din:", "Share with me via ownCloud" : "Del med meg via ownCloud", "HTML Code:" : "HTML-kode:" }, diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json index c466d22e3de..4fe4ee008be 100644 --- a/apps/files_sharing/l10n/nb_NO.json +++ b/apps/files_sharing/l10n/nb_NO.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Sammenknyttet sky", "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", "Share it:" : "Del den:", - "Add it to your website:" : "Legg den på websiden din:", "Share with me via ownCloud" : "Del med meg via ownCloud", "HTML Code:" : "HTML-kode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index f2541545680..e20f0fd868d 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Gefedereerde Cloud", "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", "Share it:" : "Deel het:", - "Add it to your website:" : "Voeg het toe aan uw website:", "Share with me via ownCloud" : "Deel met mij via ownCloud", "HTML Code:" : "HTML Code:" }, diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 193f787b835..accdcefd74b 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Gefedereerde Cloud", "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", "Share it:" : "Deel het:", - "Add it to your website:" : "Voeg het toe aan uw website:", "Share with me via ownCloud" : "Deel met mij via ownCloud", "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index d8b3bc9e81e..2f4e9e9e652 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Nuvem Conglomerada", "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", "Share it:" : "Compartilhe:", - "Add it to your website:" : "Adicione ao seu site:", "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", "HTML Code:" : "Código HTML:" }, diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 80d75ebd647..fd64260a419 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Nuvem Conglomerada", "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", "Share it:" : "Compartilhe:", - "Add it to your website:" : "Adicione ao seu site:", "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index df1ee8603b4..66ef69cac61 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Объединение облачных хранилищ", "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", "Share it:" : "Поделись этим:", - "Add it to your website:" : "Добавь это на свой сайт:", "Share with me via ownCloud" : "Поделитесь мной через ownCloud", "HTML Code:" : "HTML код:" }, diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index d533d01cb01..e4fccaf0800 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Объединение облачных хранилищ", "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", "Share it:" : "Поделись этим:", - "Add it to your website:" : "Добавь это на свой сайт:", "Share with me via ownCloud" : "Поделитесь мной через ownCloud", "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js index cfefda0ba8c..e4ff1b4e1c5 100644 --- a/apps/files_sharing/l10n/sk_SK.js +++ b/apps/files_sharing/l10n/sk_SK.js @@ -65,7 +65,6 @@ OC.L10N.register( "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", "Your Federated Cloud ID:" : "Vaše združené Cloud ID", "Share it:" : "Zdieľať:", - "Add it to your website:" : "Pridať na svoju webstránku:", "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud", "HTML Code:" : "HTML kód:" }, diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json index f9b51d1dd76..ce516ae314c 100644 --- a/apps/files_sharing/l10n/sk_SK.json +++ b/apps/files_sharing/l10n/sk_SK.json @@ -63,7 +63,6 @@ "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", "Your Federated Cloud ID:" : "Vaše združené Cloud ID", "Share it:" : "Zdieľať:", - "Add it to your website:" : "Pridať na svoju webstránku:", "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud", "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index 86175f5a627..be9a353ffd9 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "สหพันธ์คลาวด์", "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", "Share it:" : "แชร์มัน:", - "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:", "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", "HTML Code:" : "โค้ด HTML:" }, diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 5704a59336c..6984d7275d9 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -64,7 +64,6 @@ "Federated Cloud" : "สหพันธ์คลาวด์", "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", "Share it:" : "แชร์มัน:", - "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:", "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", "HTML Code:" : "โค้ด HTML:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index ce96af88e1e..9e14e0187cd 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -66,7 +66,6 @@ OC.L10N.register( "Federated Cloud" : "Birleşmiş Bulut", "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", "Share it:" : "Paylaşın:", - "Add it to your website:" : "Web sitenize ekleyin:", "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", "HTML Code:" : "HTML Kodu:" }, diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index 8705219ab2e..b11d5be2fd7 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -64,7 +64,6 @@ "Federated Cloud" : "Birleşmiş Bulut", "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", "Share it:" : "Paylaşın:", - "Add it to your website:" : "Web sitenize ekleyin:", "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", "HTML Code:" : "HTML Kodu:" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js index 37c838b6aa4..80c28c8a936 100644 --- a/apps/files_sharing/l10n/uk.js +++ b/apps/files_sharing/l10n/uk.js @@ -61,7 +61,6 @@ OC.L10N.register( "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів", "Share it:" : "Поділитися цим:", - "Add it to your website:" : "Додати до вашого сайту:", "HTML Code:" : "HTML код:" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json index b062a761fbb..0b5de75ac5a 100644 --- a/apps/files_sharing/l10n/uk.json +++ b/apps/files_sharing/l10n/uk.json @@ -59,7 +59,6 @@ "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів", "Share it:" : "Поділитися цим:", - "Add it to your website:" : "Додати до вашого сайту:", "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php index 3f59fd131d0..14a79625993 100644 --- a/apps/files_sharing/lib/mountprovider.php +++ b/apps/files_sharing/lib/mountprovider.php @@ -66,12 +66,6 @@ class MountProvider implements IMountProvider { return $share['permissions'] > 0; }); $shares = array_map(function ($share) use ($user, $storageFactory) { - try { - Filesystem::initMountPoints($share['uid_owner']); - } catch(NoUserException $e) { - \OC::$server->getLogger()->warning('The user \'' . $share['uid_owner'] . '\' of share with ID \'' . $share['id'] . '\' can\'t be retrieved.', array('app' => 'files_sharing')); - return null; - } // for updating etags for the share owner when we make changes to this share. $ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']); diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php index 11764106861..420cacb3d2f 100644 --- a/apps/files_sharing/lib/propagation/recipientpropagator.php +++ b/apps/files_sharing/lib/propagation/recipientpropagator.php @@ -126,7 +126,13 @@ class RecipientPropagator { }); } + protected $propagatingIds = []; + public function propagateById($id) { + if (isset($this->propagatingIds[$id])) { + return; + } + $this->propagatingIds[$id] = true; $shares = Share::getAllSharesForFileId($id); foreach ($shares as $share) { // propagate down the share tree @@ -141,5 +147,7 @@ class RecipientPropagator { $watcher->writeHook(['path' => $path]); } } + + unset($this->propagatingIds[$id]); } } diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index c7529df0617..1ac401f3cf8 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -55,6 +55,10 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { $this->ownerView = $arguments['ownerView']; } + private function init() { + Filesystem::initMountPoints($this->share['uid_owner']); + } + /** * get id of the mount point * @@ -80,6 +84,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { * @return array Returns array with the keys path, permissions, and owner or false if not found */ public function getFile($target) { + $this->init(); if (!isset($this->files[$target])) { // Check for partial files if (pathinfo($target, PATHINFO_EXTENSION) === 'part') { @@ -319,7 +324,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { } public function rename($path1, $path2) { - + $this->init(); // we need the paths relative to data/user/files $relPath1 = $this->getMountPoint() . '/' . $path1; $relPath2 = $this->getMountPoint() . '/' . $path2; diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 68fd1b698e0..60c2accdccb 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -59,9 +59,6 @@ if(count($configPrefixes) > 0) { OC_Group::useBackend($groupBackend); } -OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); -OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp'); - \OCP\Util::connectHook( '\OCA\Files_Sharing\API\Server2Server', 'preLoginNameUsedAsUserName', diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php index 0b3f84b8baf..f70eb746480 100644 --- a/apps/user_ldap/appinfo/install.php +++ b/apps/user_ldap/appinfo/install.php @@ -23,3 +23,6 @@ $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet'); if($state === 'doSet') { OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); } + +OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); +OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp'); diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php index 4907db0cdae..33a7219644b 100644 --- a/apps/user_ldap/appinfo/update.php +++ b/apps/user_ldap/appinfo/update.php @@ -34,3 +34,6 @@ if(version_compare($installedVersion, '0.6.2', '<')) { \OC::$server->getConfig()->deleteAppValue('user_ldap', $prefix . "ldap_nocase"); } } + +OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); +OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp'); diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index b6160487433..844f6a91acb 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.6.2 +0.6.3 diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 6f2fdce1b5f..f6b123babd0 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -206,7 +206,7 @@ class Connection extends LDAPUtility { } $key = $this->getCacheKey($key); - return unserialize(base64_decode($this->cache->get($key))); + return json_decode(base64_decode($this->cache->get($key))); } /** @@ -240,7 +240,7 @@ class Connection extends LDAPUtility { return null; } $key = $this->getCacheKey($key); - $value = base64_encode(serialize($value)); + $value = base64_encode(json_encode($value)); $this->cache->set($key, $value, $this->configuration->ldapCacheTTL); } diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index ef01213990c..2a423cb0e4b 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -161,7 +161,7 @@ abstract class Proxy { } $key = $this->getCacheKey($key); - return unserialize(base64_decode($this->cache->get($key))); + return json_decode(base64_decode($this->cache->get($key))); } /** @@ -185,7 +185,7 @@ abstract class Proxy { return; } $key = $this->getCacheKey($key); - $value = base64_encode(serialize($value)); + $value = base64_encode(json_encode($value)); $this->cache->set($key, $value, '2592000'); } diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png Binary files differindex 1c0b18e2f51..4029f8aead1 100644 --- a/core/img/filetypes/application-pdf.png +++ b/core/img/filetypes/application-pdf.png diff --git a/core/img/filetypes/application-pdf.svg b/core/img/filetypes/application-pdf.svg index 5646f4caaac..9a472dba84b 100644 --- a/core/img/filetypes/application-pdf.svg +++ b/core/img/filetypes/application-pdf.svg @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0.000005 0.22905 0.20608 0.43749 0.43164 0.4375h11.139c0.22556-0.000006 0.43163-0.20845 0.43164-0.4375v-10.143c-0.004-0.06684-0.02269-0.1329-0.05469-0.19141l-3.3125-3.1992c-0.043-0.0164-0.08876-0.025544-0.13477-0.027344h-8.0684c-0.02684-0.0026-0.055191-0.0026-0.082031 0z" fill="#dc5047"/> - <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m7.3561 3h0.19315c0.18549 0 0.36359 0.065879 0.49263 0.1949 0.53227 0.5322 0.28209 1.8297 0.015948 2.9022-0.01613 0.048381-0.023832 0.089205-0.031897 0.11339 0.32259 0.91119 0.78197 1.6448 1.29 2.0641 0.20968 0.16127 0.44366 0.32261 0.70173 0.46775 0.36291-0.040318 0.70953-0.056697 1.0402-0.056697 1 0 1.6055 0.17735 1.8394 0.55634 0.08065 0.12902 0.11988 0.28168 0.09569 0.44295-0.0081 0.20159-0.07989 0.38817-0.22505 0.53331-0.1371 0.15321-0.37878 0.24096-0.73362 0.24096-0.61292 0-1.6141-0.18585-2.4206-0.59709-1.3871 0.15321-2.4193 0.33985-3.2499 0.60595-0.040323 0.01613-0.088854 0.03075-0.14531 0.05493-1 1.71-1.7408 2.477-2.394 2.477-0.1291 0-0.2594-0.032-0.3562-0.089l-0.3863-0.249-0.0248-0.041c-0.0565-0.145-0.073-0.283-0.0408-0.436 0.0887-0.427 0.5491-1.105 1.5169-1.71 0.1532-0.113 0.3951-0.242 0.7177-0.395 0.2419-0.4192 0.5001-0.9108 0.7744-1.451 0.4113-0.8306 0.6684-1.6522 0.87-2.3618v-0.00886c-0.2984-0.9757-0.4756-1.5639-0.1772-2.6364 0.0726-0.3064 0.3396-0.6219 0.638-0.6219zm0.1205 0.49965c-0.01613 0.024192-0.040576 0.065194-0.056705 0.097448-0.1371 0.33867-0.12878 0.92736 0.056705 1.6531l0.040757-0.031892c0.056453-0.25804 0.08097-0.48348 0.12936-0.66088l0.023036-0.12934c0.0806-0.4596 0.0644-0.6941-0.0727-0.8876zm0.065566 3.6463c-0.1856 0.5968-0.4523 1.2334-0.8152 1.9349-0.1613 0.3064-0.3395 0.5961-0.404 0.838l0.088602-0.0319c1.0242-0.3951 1.9936-0.6204 2.6952-0.7494-0.1209-0.0806-0.2346-0.17-0.3313-0.2587-0.4839-0.4112-0.9027-1.0071-1.2334-1.7328zm3.3616 2.2165c-0.05645 0-0.11171 0.0008653-0.18429 0.081503 0.58873 0.25804 1.1601 0.41106 1.531 0.41106 0.05645 0 0.10578-0.0079 0.15417-0.01595h0.0319c0.04032-0.01613 0.06459-0.02568 0.07266-0.10631-0.01614-0.0242-0.03234-0.05633-0.07266-0.08859-0.08065-0.08064-0.40375-0.28172-1.5328-0.28172zm-5.8622 1.4596c-0.16936 0.09677-0.30743 0.18531-0.38808 0.24982-0.5726 0.52414-0.9343 1.0561-0.97462 1.3625 0.36291-0.12095 0.83849-0.65276 1.3627-1.6123z" fill="#fff"/> + <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" fill="#dc5047" d="m2.3496 1v0.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.228 0.2061 0.436 0.4316 0.436h11.138c0.226 0 0.432-0.208 0.432-0.437v-10.143c-0.004-0.0669-0.023-0.1329-0.055-0.1914l-3.312-3.1993c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.0026-0.0552-0.0026-0.082 0zm5.0059 2h0.1933c0.1855 0 0.3632 0.0663 0.4922 0.1953 0.5323 0.5322 0.2837 1.8299 0.0176 2.9024-0.0161 0.0483-0.0251 0.0891-0.0332 0.1132 0.3226 0.9112 0.783 1.6452 1.291 2.0645 0.2097 0.1613 0.4431 0.3216 0.7016 0.4668 0.362-0.0403 0.71-0.0567 1.041-0.0567 1 0 1.604 0.1777 1.837 0.5567 0.081 0.129 0.12 0.2821 0.096 0.4433-0.008 0.2016-0.079 0.3885-0.224 0.5335-0.138 0.153-0.378 0.24-0.733 0.24-0.613 0-1.615-0.186-2.4217-0.5977-1.3871 0.1537-2.4194 0.3417-3.25 0.6077-0.0403 0.016-0.0881 0.03-0.1445 0.054-1 1.71-1.7414 2.477-2.3946 2.477-0.1291 0-0.2586-0.033-0.3554-0.09l-0.3868-0.248-0.0254-0.041c-0.0565-0.145-0.0732-0.282-0.041-0.435 0.0887-0.427 0.5498-1.106 1.5176-1.711 0.1532-0.113 0.3942-0.242 0.7168-0.395 0.2419-0.4191 0.5011-0.9109 0.7754-1.4511 0.4113-0.8306 0.6675-1.6517 0.8691-2.3613v-0.0098c-0.2984-0.9757-0.4741-1.5642-0.1757-2.6367 0.0726-0.3064 0.3383-0.6211 0.6367-0.6211zm0.1211 0.5c-0.0162 0.0242-0.0405 0.0654-0.0567 0.0977-0.1371 0.3386-0.1288 0.9266 0.0567 1.6523l0.041-0.0312c0.0564-0.2581 0.0805-0.4848 0.1289-0.6622l0.0234-0.1289c0.0806-0.4596 0.0649-0.6932-0.0722-0.8867l-0.1211-0.041zm0.0664 3.6465c-0.1856 0.5968-0.4535 1.2321-0.8164 1.9336-0.1613 0.3064-0.3398 0.596-0.4043 0.8379l0.0898-0.0313c1.0242-0.3951 1.9937-0.621 2.6953-0.75-0.1209-0.0806-0.2353-0.1691-0.332-0.2578-0.4839-0.4112-0.9017-1.0067-1.2324-1.7324zm3.361 2.2168c-0.056 0-0.113-0.0006-0.185 0.0801 0.588 0.258 1.16 0.4121 1.531 0.4121 0.056 0 0.106-0.0076 0.154-0.0157h0.034c0.04-0.0161 0.064-0.0267 0.072-0.1074-0.016-0.0242-0.032-0.0556-0.072-0.0879-0.081-0.0806-0.405-0.2812-1.534-0.2812zm-5.863 1.4587c-0.1693 0.097-0.3061 0.186-0.3867 0.25-0.5726 0.524-0.9343 1.055-0.9746 1.362 0.3629-0.121 0.8371-0.652 1.3613-1.612z"/> </svg> diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png Binary files differindex 43cc3abafe7..9be7361d1b6 100644 --- a/core/img/filetypes/application.png +++ b/core/img/filetypes/application.png diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png Binary files differindex 32171285e8e..4eb8ab78e3f 100644 --- a/core/img/filetypes/audio.png +++ b/core/img/filetypes/audio.png diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png Binary files differindex b56833a5763..3bd7463cfc9 100644 --- a/core/img/filetypes/file.png +++ b/core/img/filetypes/file.png diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png Binary files differindex 58640b5cb5c..80ab53b72b9 100644 --- a/core/img/filetypes/folder-drag-accept.png +++ b/core/img/filetypes/folder-drag-accept.png diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png Binary files differindex 56cb385a772..5262d72e627 100644 --- a/core/img/filetypes/folder-external.png +++ b/core/img/filetypes/folder-external.png diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png Binary files differindex 4887ea6e767..17c3ee2a8d9 100644 --- a/core/img/filetypes/folder-public.png +++ b/core/img/filetypes/folder-public.png diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png Binary files differindex 56c8ff36ed8..be5e59cbf28 100644 --- a/core/img/filetypes/folder-shared.png +++ b/core/img/filetypes/folder-shared.png diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png Binary files differindex 09383b5e06b..b083a9d2d11 100644 --- a/core/img/filetypes/folder-starred.png +++ b/core/img/filetypes/folder-starred.png diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png Binary files differindex 3dfb4391f2c..1dbb1154100 100644 --- a/core/img/filetypes/folder.png +++ b/core/img/filetypes/folder.png diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png Binary files differindex 2a5441efdb7..0feaecf2830 100644 --- a/core/img/filetypes/image.png +++ b/core/img/filetypes/image.png diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png Binary files differindex eb1470b0dff..287a1f18869 100644 --- a/core/img/filetypes/package-x-generic.png +++ b/core/img/filetypes/package-x-generic.png diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png Binary files differindex dcb22b53e67..ff3ced62531 100644 --- a/core/img/filetypes/text-calendar.png +++ b/core/img/filetypes/text-calendar.png diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png Binary files differindex 652ab3566ad..5505102f60e 100644 --- a/core/img/filetypes/text-code.png +++ b/core/img/filetypes/text-code.png diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png Binary files differindex 81e7d3dc3b6..77ac138fe1c 100644 --- a/core/img/filetypes/text-vcard.png +++ b/core/img/filetypes/text-vcard.png diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png Binary files differindex 13547961c76..5fca7cb69d7 100644 --- a/core/img/filetypes/text.png +++ b/core/img/filetypes/text.png diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png Binary files differindex 5604a4a1891..308e81cca83 100644 --- a/core/img/filetypes/video.png +++ b/core/img/filetypes/video.png diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png Binary files differindex 861ac965a7d..d9c5b890583 100644 --- a/core/img/filetypes/x-office-document.png +++ b/core/img/filetypes/x-office-document.png diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png Binary files differindex fbe941e5c3f..5b3733b7121 100644 --- a/core/img/filetypes/x-office-presentation.png +++ b/core/img/filetypes/x-office-presentation.png diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png Binary files differindex bf22ca23f09..5a20026ebdd 100644 --- a/core/img/filetypes/x-office-spreadsheet.png +++ b/core/img/filetypes/x-office-spreadsheet.png diff --git a/core/img/places/picture.png b/core/img/places/picture.png Binary files differindex b60da3b5fd8..171af526e9d 100644 --- a/core/img/places/picture.png +++ b/core/img/places/picture.png diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg index b4c81b7a937..3e105dcd334 100644 --- a/core/img/places/picture.svg +++ b/core/img/places/picture.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m0.6875 4c-0.39495 0.0765-0.69461 0.4668-0.6875 0.875v22.25c0.00001 0.458 0.4239 0.875 0.875 0.875h30.25c0.4511-0.000012 0.87499-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm2.3125 3h26v10l-2-2-5 7-6.625-4-9.1875 7h-3.1875zm6 3c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z" fill="#fff"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" fill="#fff" d="m2.6876 4c-0.395 0.0765-0.6946 0.4668-0.6875 0.875v22.25c0 0.46 0.424 0.876 0.875 0.876h26.25c0.4511-0.000012 0.87498-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm1.3124 1.9999 24 0.000014v10l-2-2-6 8-6-6-8 8h-2zm5.0002 2c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z"/> </svg> diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js index 7c95b0a0db4..a6f0448d1a5 100644 --- a/core/l10n/af_ZA.js +++ b/core/l10n/af_ZA.js @@ -109,6 +109,7 @@ OC.L10N.register( "Database host" : "Databasis gasheer", "Finish setup" : "Maak opstelling klaar", "Log out" : "Teken uit", + "Log in" : "Teken aan", "remember" : "onthou", "Alternative Logins" : "Alternatiewe aantekeninge", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>" diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json index a040afc6962..d5b747b5a32 100644 --- a/core/l10n/af_ZA.json +++ b/core/l10n/af_ZA.json @@ -107,6 +107,7 @@ "Database host" : "Databasis gasheer", "Finish setup" : "Maak opstelling klaar", "Log out" : "Teken uit", + "Log in" : "Teken aan", "remember" : "onthou", "Alternative Logins" : "Alternatiewe aantekeninge", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>" diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js index 52fdcccf13b..e7914ca5714 100644 --- a/core/l10n/bg_BG.js +++ b/core/l10n/bg_BG.js @@ -211,6 +211,7 @@ OC.L10N.register( "Search" : "Търсене", "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!", "Please contact your administrator." : "Моля, свържете се с администратора.", + "Log in" : "Вписване", "remember" : "запомняне", "Alternative Logins" : "Алтернативни методи на вписване", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.", diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json index 0d8b4a21a19..271cb44435b 100644 --- a/core/l10n/bg_BG.json +++ b/core/l10n/bg_BG.json @@ -209,6 +209,7 @@ "Search" : "Търсене", "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!", "Please contact your administrator." : "Моля, свържете се с администратора.", + "Log in" : "Вписване", "remember" : "запомняне", "Alternative Logins" : "Алтернативни методи на вписване", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.", diff --git a/core/l10n/ca.js b/core/l10n/ca.js index a3133be76eb..1fa4f12a3e3 100644 --- a/core/l10n/ca.js +++ b/core/l10n/ca.js @@ -245,6 +245,7 @@ OC.L10N.register( "Please contact your administrator." : "Contacteu amb l'administrador.", "An internal error occured." : "S'ha produït un error intern.", "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.", + "Log in" : "Inici de sessió", "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?", "remember" : "recorda'm", "Alternative Logins" : "Acreditacions alternatives", diff --git a/core/l10n/ca.json b/core/l10n/ca.json index 8af4766eaa1..55962a25362 100644 --- a/core/l10n/ca.json +++ b/core/l10n/ca.json @@ -243,6 +243,7 @@ "Please contact your administrator." : "Contacteu amb l'administrador.", "An internal error occured." : "S'ha produït un error intern.", "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.", + "Log in" : "Inici de sessió", "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?", "remember" : "recorda'm", "Alternative Logins" : "Acreditacions alternatives", diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 8d57e0e76c0..54ed40e9a5b 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -2,6 +2,7 @@ OC.L10N.register( "core", { "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s", + "Preparing update" : "Příprava na aktualizaci", "Turned on maintenance mode" : "Zapnut režim údržby", "Turned off maintenance mode" : "Vypnut režim údržby", "Maintenance mode is kept active" : "Mód údržby je aktivní", @@ -13,6 +14,7 @@ OC.L10N.register( "Repair error: " : "Chyba opravy:", "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s", "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s", + "Already up to date" : "Je již aktuální", "File is too big" : "Soubor je příliš velký", "Invalid file provided" : "Zadán neplatný soubor", "No image or file provided" : "Soubor nebo obrázek nebyl zadán", @@ -244,6 +246,7 @@ OC.L10N.register( "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", "An internal error occured." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", + "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", "remember" : "zapamatovat", "Alternative Logins" : "Alternativní přihlášení", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index e9f52cfa46d..da343b7791a 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -1,5 +1,6 @@ { "translations": { "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s", + "Preparing update" : "Příprava na aktualizaci", "Turned on maintenance mode" : "Zapnut režim údržby", "Turned off maintenance mode" : "Vypnut režim údržby", "Maintenance mode is kept active" : "Mód údržby je aktivní", @@ -11,6 +12,7 @@ "Repair error: " : "Chyba opravy:", "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s", "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s", + "Already up to date" : "Je již aktuální", "File is too big" : "Soubor je příliš velký", "Invalid file provided" : "Zadán neplatný soubor", "No image or file provided" : "Soubor nebo obrázek nebyl zadán", @@ -242,6 +244,7 @@ "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", "An internal error occured." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", + "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", "remember" : "zapamatovat", "Alternative Logins" : "Alternativní přihlášení", diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js index 5afe9c94ae5..27df5177fff 100644 --- a/core/l10n/cy_GB.js +++ b/core/l10n/cy_GB.js @@ -100,6 +100,7 @@ OC.L10N.register( "Finish setup" : "Gorffen sefydlu", "Log out" : "Allgofnodi", "Search" : "Chwilio", + "Log in" : "Mewngofnodi", "remember" : "cofio", "Alternative Logins" : "Mewngofnodiadau Amgen" }, diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json index 1e37b240bc9..37f1aefb527 100644 --- a/core/l10n/cy_GB.json +++ b/core/l10n/cy_GB.json @@ -98,6 +98,7 @@ "Finish setup" : "Gorffen sefydlu", "Log out" : "Allgofnodi", "Search" : "Chwilio", + "Log in" : "Mewngofnodi", "remember" : "cofio", "Alternative Logins" : "Mewngofnodiadau Amgen" },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;" diff --git a/core/l10n/da.js b/core/l10n/da.js index 0482ceff99e..c8684b3483c 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "Kontakt venligst din administrator", "An internal error occured." : "Der skete en intern fejl.", "Please try again or contact your administrator." : "Kontakt venligst din administrator.", + "Log in" : "Log ind", "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?", "remember" : "husk", "Alternative Logins" : "Alternative logins", diff --git a/core/l10n/da.json b/core/l10n/da.json index 2396b997877..067d5e6914d 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "Kontakt venligst din administrator", "An internal error occured." : "Der skete en intern fejl.", "Please try again or contact your administrator." : "Kontakt venligst din administrator.", + "Log in" : "Log ind", "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?", "remember" : "husk", "Alternative Logins" : "Alternative logins", diff --git a/core/l10n/de.js b/core/l10n/de.js index 2662e0d895f..495ea72c710 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -237,6 +237,7 @@ OC.L10N.register( "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.", "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.", + "Log in" : "Anmelden", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", "remember" : "merken", "Alternative Logins" : "Alternative Logins", diff --git a/core/l10n/de.json b/core/l10n/de.json index 2da213c6116..fc826c7fde2 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -235,6 +235,7 @@ "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.", "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.", + "Log in" : "Anmelden", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", "remember" : "merken", "Alternative Logins" : "Alternative Logins", diff --git a/core/l10n/el.js b/core/l10n/el.js index 03ecc018c05..28e9763e13c 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.", "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.", + "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", "remember" : "απομνημόνευση", "Alternative Logins" : "Εναλλακτικές Συνδέσεις", diff --git a/core/l10n/el.json b/core/l10n/el.json index 4e901e6606b..6c68066738a 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.", "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.", + "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", "remember" : "απομνημόνευση", "Alternative Logins" : "Εναλλακτικές Συνδέσεις", diff --git a/core/l10n/eo.js b/core/l10n/eo.js index 78a571a798a..eee2a354958 100644 --- a/core/l10n/eo.js +++ b/core/l10n/eo.js @@ -129,6 +129,7 @@ OC.L10N.register( "Log out" : "Elsaluti", "Search" : "Serĉi", "Please contact your administrator." : "Bonvolu kontakti vian administranton.", + "Log in" : "Ensaluti", "remember" : "memori", "Alternative Logins" : "Alternativaj ensalutoj", "Thank you for your patience." : "Dankon pro via pacienco." diff --git a/core/l10n/eo.json b/core/l10n/eo.json index 401e9327560..fb1ad500032 100644 --- a/core/l10n/eo.json +++ b/core/l10n/eo.json @@ -127,6 +127,7 @@ "Log out" : "Elsaluti", "Search" : "Serĉi", "Please contact your administrator." : "Bonvolu kontakti vian administranton.", + "Log in" : "Ensaluti", "remember" : "memori", "Alternative Logins" : "Alternativaj ensalutoj", "Thank you for your patience." : "Dankon pro via pacienco." diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js index 5cc18198864..bddadc44c1a 100644 --- a/core/l10n/es_AR.js +++ b/core/l10n/es_AR.js @@ -149,6 +149,7 @@ OC.L10N.register( "Search" : "Buscar", "Server side authentication failed!" : "¡Falló la autenticación del servidor!", "Please contact your administrator." : "Por favor, contacte a su administrador.", + "Log in" : "Iniciar sesión", "remember" : "recordame", "Alternative Logins" : "Nombre alternativos de usuarios", "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.", diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json index 8ccb4cedb4b..93a5b815740 100644 --- a/core/l10n/es_AR.json +++ b/core/l10n/es_AR.json @@ -147,6 +147,7 @@ "Search" : "Buscar", "Server side authentication failed!" : "¡Falló la autenticación del servidor!", "Please contact your administrator." : "Por favor, contacte a su administrador.", + "Log in" : "Iniciar sesión", "remember" : "recordame", "Alternative Logins" : "Nombre alternativos de usuarios", "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.", diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js index 3e517277f53..df638a3d7ee 100644 --- a/core/l10n/et_EE.js +++ b/core/l10n/et_EE.js @@ -217,6 +217,7 @@ OC.L10N.register( "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", "An internal error occured." : "Tekkis sisemine tõrge.", "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", + "Log in" : "Logi sisse", "remember" : "pea meeles", "Alternative Logins" : "Alternatiivsed sisselogimisviisid", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>", diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json index 73839f889ca..edacdaedca9 100644 --- a/core/l10n/et_EE.json +++ b/core/l10n/et_EE.json @@ -215,6 +215,7 @@ "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", "An internal error occured." : "Tekkis sisemine tõrge.", "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", + "Log in" : "Logi sisse", "remember" : "pea meeles", "Alternative Logins" : "Alternatiivsed sisselogimisviisid", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>", diff --git a/core/l10n/eu.js b/core/l10n/eu.js index e215b870125..88b75072356 100644 --- a/core/l10n/eu.js +++ b/core/l10n/eu.js @@ -199,6 +199,7 @@ OC.L10N.register( "Search" : "Bilatu", "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!", "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.", + "Log in" : "Hasi saioa", "remember" : "gogoratu", "Alternative Logins" : "Beste erabiltzaile izenak", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s", diff --git a/core/l10n/eu.json b/core/l10n/eu.json index 9af46ca9cfb..51143f24767 100644 --- a/core/l10n/eu.json +++ b/core/l10n/eu.json @@ -197,6 +197,7 @@ "Search" : "Bilatu", "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!", "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.", + "Log in" : "Hasi saioa", "remember" : "gogoratu", "Alternative Logins" : "Beste erabiltzaile izenak", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 2893ce8ae2a..2c3c3c49617 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "Ota yhteys ylläpitäjään.", "An internal error occured." : "Tapahtui sisäinen virhe.", "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.", + "Log in" : "Kirjaudu sisään", "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?", "remember" : "muista", "Alternative Logins" : "Vaihtoehtoiset kirjautumiset", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 21316024e73..e0ac2410747 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "Ota yhteys ylläpitäjään.", "An internal error occured." : "Tapahtui sisäinen virhe.", "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.", + "Log in" : "Kirjaudu sisään", "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?", "remember" : "muista", "Alternative Logins" : "Vaihtoehtoiset kirjautumiset", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index f53866cdc08..583931d5068 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -243,6 +243,7 @@ OC.L10N.register( "Please contact your administrator." : "Contacte co administrador.", "An internal error occured." : "Produciuse un erro interno.", "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.", + "Log in" : "Acceder", "remember" : "lembrar", "Alternative Logins" : "Accesos alternativos", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index 1542d83210c..7d33ed6cc76 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -241,6 +241,7 @@ "Please contact your administrator." : "Contacte co administrador.", "An internal error occured." : "Produciuse un erro interno.", "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.", + "Log in" : "Acceder", "remember" : "lembrar", "Alternative Logins" : "Accesos alternativos", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>", diff --git a/core/l10n/he.js b/core/l10n/he.js index 4692495cccb..3285a569d34 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -103,6 +103,7 @@ OC.L10N.register( "Finish setup" : "סיום התקנה", "Log out" : "התנתקות", "Search" : "חיפוש", + "Log in" : "כניסה", "remember" : "שמירת הססמה", "Alternative Logins" : "כניסות אלטרנטיביות" }, diff --git a/core/l10n/he.json b/core/l10n/he.json index fe873e0b02c..5db9f156d09 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -101,6 +101,7 @@ "Finish setup" : "סיום התקנה", "Log out" : "התנתקות", "Search" : "חיפוש", + "Log in" : "כניסה", "remember" : "שמירת הססמה", "Alternative Logins" : "כניסות אלטרנטיביות" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/hr.js b/core/l10n/hr.js index 9d0c1ddeb49..44d9fab7740 100644 --- a/core/l10n/hr.js +++ b/core/l10n/hr.js @@ -199,6 +199,7 @@ OC.L10N.register( "Search" : "pretraži", "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!", "Please contact your administrator." : "Molimo kontaktirajte svog administratora.", + "Log in" : "Prijavite se", "remember" : "Sjetite se", "Alternative Logins" : "Alternativne prijave", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>", diff --git a/core/l10n/hr.json b/core/l10n/hr.json index 1472b8aaa0d..7a6ce98346f 100644 --- a/core/l10n/hr.json +++ b/core/l10n/hr.json @@ -197,6 +197,7 @@ "Search" : "pretraži", "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!", "Please contact your administrator." : "Molimo kontaktirajte svog administratora.", + "Log in" : "Prijavite se", "remember" : "Sjetite se", "Alternative Logins" : "Alternativne prijave", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index b465daa4212..7be9e243e88 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -247,6 +247,7 @@ OC.L10N.register( "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", "An internal error occured." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", + "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", "remember" : "emlékezzen", "Alternative Logins" : "Alternatív bejelentkezés", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index e8b3e20c33e..63447a4038a 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -245,6 +245,7 @@ "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", "An internal error occured." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", + "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", "remember" : "emlékezzen", "Alternative Logins" : "Alternatív bejelentkezés", diff --git a/core/l10n/is.js b/core/l10n/is.js index c8fec41dc8f..64cc78ea048 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "Vinsamlegast hafðu samband við kerfisstjóra.", "An internal error occured." : "Innri villa kom upp.", "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.", + "Log in" : "Skrá inn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", "remember" : "muna eftir mér", "Alternative Logins" : "Aðrar Innskráningar", diff --git a/core/l10n/is.json b/core/l10n/is.json index 638e5267ea0..b6255b1764e 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "Vinsamlegast hafðu samband við kerfisstjóra.", "An internal error occured." : "Innri villa kom upp.", "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.", + "Log in" : "Skrá inn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", "remember" : "muna eftir mér", "Alternative Logins" : "Aðrar Innskráningar", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index fbdd112cb08..9c8d681f379 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -245,6 +245,7 @@ OC.L10N.register( "Please contact your administrator." : "管理者に問い合わせてください。", "An internal error occured." : "内部エラーが発生しました。", "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。", + "Log in" : "ログイン", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", "remember" : "パスワードを保存", "Alternative Logins" : "代替ログイン", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index c31bd5aba9e..ad18b1f98ed 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -243,6 +243,7 @@ "Please contact your administrator." : "管理者に問い合わせてください。", "An internal error occured." : "内部エラーが発生しました。", "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。", + "Log in" : "ログイン", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", "remember" : "パスワードを保存", "Alternative Logins" : "代替ログイン", diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js index eef607f316d..d6ae525c861 100644 --- a/core/l10n/ka_GE.js +++ b/core/l10n/ka_GE.js @@ -102,6 +102,7 @@ OC.L10N.register( "Finish setup" : "კონფიგურაციის დასრულება", "Log out" : "გამოსვლა", "Search" : "ძებნა", + "Log in" : "შესვლა", "remember" : "დამახსოვრება", "Alternative Logins" : "ალტერნატიული Login–ი" }, diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json index dad6746fe94..85fecffe0c0 100644 --- a/core/l10n/ka_GE.json +++ b/core/l10n/ka_GE.json @@ -100,6 +100,7 @@ "Finish setup" : "კონფიგურაციის დასრულება", "Log out" : "გამოსვლა", "Search" : "ძებნა", + "Log in" : "შესვლა", "remember" : "დამახსოვრება", "Alternative Logins" : "ალტერნატიული Login–ი" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/core/l10n/lb.js b/core/l10n/lb.js index 6bbc675150e..4fa998c42f7 100644 --- a/core/l10n/lb.js +++ b/core/l10n/lb.js @@ -120,6 +120,7 @@ OC.L10N.register( "Finishing …" : "Schléissen of ...", "Log out" : "Ofmellen", "Search" : "Sichen", + "Log in" : "Umellen", "remember" : "verhalen", "Alternative Logins" : "Alternativ Umeldungen", "Thank you for your patience." : "Merci fir deng Gedold." diff --git a/core/l10n/lb.json b/core/l10n/lb.json index 4a8fcce1136..0a201c98f1c 100644 --- a/core/l10n/lb.json +++ b/core/l10n/lb.json @@ -118,6 +118,7 @@ "Finishing …" : "Schléissen of ...", "Log out" : "Ofmellen", "Search" : "Sichen", + "Log in" : "Umellen", "remember" : "verhalen", "Alternative Logins" : "Alternativ Umeldungen", "Thank you for your patience." : "Merci fir deng Gedold." diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js index 41f012b6f07..f36b66dcf52 100644 --- a/core/l10n/lt_LT.js +++ b/core/l10n/lt_LT.js @@ -156,6 +156,7 @@ OC.L10N.register( "Search" : "Ieškoti", "Server side authentication failed!" : "Autentikacija serveryje nepavyko!", "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.", + "Log in" : "Prisijungti", "remember" : "prisiminti", "Alternative Logins" : "Alternatyvūs prisijungimai", "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.", diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json index 7b6ad9e4907..5261b7ee070 100644 --- a/core/l10n/lt_LT.json +++ b/core/l10n/lt_LT.json @@ -154,6 +154,7 @@ "Search" : "Ieškoti", "Server side authentication failed!" : "Autentikacija serveryje nepavyko!", "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.", + "Log in" : "Prisijungti", "remember" : "prisiminti", "Alternative Logins" : "Alternatyvūs prisijungimai", "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.", diff --git a/core/l10n/lv.js b/core/l10n/lv.js index 526ef6846c0..d7905ef30a7 100644 --- a/core/l10n/lv.js +++ b/core/l10n/lv.js @@ -119,6 +119,7 @@ OC.L10N.register( "Finish setup" : "Pabeigt iestatīšanu", "Log out" : "Izrakstīties", "Search" : "Meklēt", + "Log in" : "Ierakstīties", "remember" : "atcerēties", "Alternative Logins" : "Alternatīvās pieteikšanās" }, diff --git a/core/l10n/lv.json b/core/l10n/lv.json index c40bb4757d8..49188f77e89 100644 --- a/core/l10n/lv.json +++ b/core/l10n/lv.json @@ -117,6 +117,7 @@ "Finish setup" : "Pabeigt iestatīšanu", "Log out" : "Izrakstīties", "Search" : "Meklēt", + "Log in" : "Ierakstīties", "remember" : "atcerēties", "Alternative Logins" : "Alternatīvās pieteikšanās" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" diff --git a/core/l10n/mk.js b/core/l10n/mk.js index bbc073bce0b..e960bb4b7f6 100644 --- a/core/l10n/mk.js +++ b/core/l10n/mk.js @@ -168,6 +168,7 @@ OC.L10N.register( "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", + "Log in" : "Најава", "remember" : "запамти", "Alternative Logins" : "Алтернативни најавувања", "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", diff --git a/core/l10n/mk.json b/core/l10n/mk.json index 88a4ee81934..722af208b2c 100644 --- a/core/l10n/mk.json +++ b/core/l10n/mk.json @@ -166,6 +166,7 @@ "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", + "Log in" : "Најава", "remember" : "запамти", "Alternative Logins" : "Алтернативни најавувања", "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index a26c2b1e2bd..3eda4c2ed9d 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -206,6 +206,7 @@ OC.L10N.register( "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!", "Please contact your administrator." : "Skontaktuj się z administratorem", "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.", + "Log in" : "Zaloguj", "remember" : "pamiętaj", "Alternative Logins" : "Alternatywne loginy", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 0c3524c5cc4..94001147b74 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -204,6 +204,7 @@ "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!", "Please contact your administrator." : "Skontaktuj się z administratorem", "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.", + "Log in" : "Zaloguj", "remember" : "pamiętaj", "Alternative Logins" : "Alternatywne loginy", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index ad5cf69a798..8f1a2878aaa 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "Por favor, contate o administrador.", "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.", + "Log in" : "Entrar", "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?", "remember" : "lembrar", "Alternative Logins" : "Logins Alternativos", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index bcc3522c430..d07686e7bdd 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "Por favor, contate o administrador.", "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.", + "Log in" : "Entrar", "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?", "remember" : "lembrar", "Alternative Logins" : "Logins Alternativos", diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index 537efc34728..8fa20c8e024 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -232,6 +232,7 @@ OC.L10N.register( "Please contact your administrator." : "Por favor contacte o administrador.", "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", + "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", "remember" : "lembrar", "Alternative Logins" : "Contas de acesso alternativas", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index 17c5b5dd587..e528b7c776d 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -230,6 +230,7 @@ "Please contact your administrator." : "Por favor contacte o administrador.", "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", + "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", "remember" : "lembrar", "Alternative Logins" : "Contas de acesso alternativas", diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js index be29a54e7b4..9be2cb088a6 100644 --- a/core/l10n/si_LK.js +++ b/core/l10n/si_LK.js @@ -82,6 +82,7 @@ OC.L10N.register( "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න", "Log out" : "නික්මීම", "Search" : "සොයන්න", + "Log in" : "ප්රවේශවන්න", "remember" : "මතක තබාගන්න" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json index 68638609324..7626f55acb1 100644 --- a/core/l10n/si_LK.json +++ b/core/l10n/si_LK.json @@ -80,6 +80,7 @@ "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න", "Log out" : "නික්මීම", "Search" : "සොයන්න", + "Log in" : "ප්රවේශවන්න", "remember" : "මතක තබාගන්න" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js index a08bc9d09f3..2953bc7e0c6 100644 --- a/core/l10n/sk_SK.js +++ b/core/l10n/sk_SK.js @@ -227,6 +227,7 @@ OC.L10N.register( "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.", "An internal error occured." : "Vyskytla sa vnútorná chyba.", "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.", + "Log in" : "Prihlásiť sa", "remember" : "zapamätať", "Alternative Logins" : "Alternatívne prihlásenie", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>", diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json index fcb358cdf9c..f39e14ed02a 100644 --- a/core/l10n/sk_SK.json +++ b/core/l10n/sk_SK.json @@ -225,6 +225,7 @@ "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.", "An internal error occured." : "Vyskytla sa vnútorná chyba.", "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.", + "Log in" : "Prihlásiť sa", "remember" : "zapamätať", "Alternative Logins" : "Alternatívne prihlásenie", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>", diff --git a/core/l10n/sv.js b/core/l10n/sv.js index a5a7895b2cc..27c1255f65b 100644 --- a/core/l10n/sv.js +++ b/core/l10n/sv.js @@ -201,6 +201,7 @@ OC.L10N.register( "Search" : "Sök", "Server side authentication failed!" : "Servern misslyckades med autentisering!", "Please contact your administrator." : "Kontakta din administratör.", + "Log in" : "Logga in", "remember" : "kom ihåg", "Alternative Logins" : "Alternativa inloggningar", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>", diff --git a/core/l10n/sv.json b/core/l10n/sv.json index 307fd6afc78..befc73dfc44 100644 --- a/core/l10n/sv.json +++ b/core/l10n/sv.json @@ -199,6 +199,7 @@ "Search" : "Sök", "Server side authentication failed!" : "Servern misslyckades med autentisering!", "Please contact your administrator." : "Kontakta din administratör.", + "Log in" : "Logga in", "remember" : "kom ihåg", "Alternative Logins" : "Alternativa inloggningar", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>", diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js index 21025db2fa0..c58dea8366e 100644 --- a/core/l10n/ta_LK.js +++ b/core/l10n/ta_LK.js @@ -93,6 +93,7 @@ OC.L10N.register( "Finish setup" : "அமைப்பை முடிக்க", "Log out" : "விடுபதிகை செய்க", "Search" : "தேடுதல்", + "Log in" : "புகுபதிகை", "remember" : "ஞாபகப்படுத்துக" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json index a7f28999023..60ff565dbf2 100644 --- a/core/l10n/ta_LK.json +++ b/core/l10n/ta_LK.json @@ -91,6 +91,7 @@ "Finish setup" : "அமைப்பை முடிக்க", "Log out" : "விடுபதிகை செய்க", "Search" : "தேடுதல்", + "Log in" : "புகுபதிகை", "remember" : "ஞாபகப்படுத்துக" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 142895dd1d0..f72fa3ee38b 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ", "An internal error occured." : "เกิดข้อผิดพลาดภายใน", "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", + "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", "remember" : "จดจำฉัน", "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 88c74d1eb4c..d808685898d 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ", "An internal error occured." : "เกิดข้อผิดพลาดภายใน", "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", + "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", "remember" : "จดจำฉัน", "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index 2b319a8f8fe..c250f919892 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.", "An internal error occured." : "Dahili bir hata oluştu.", "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.", + "Log in" : "Giriş yap", "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?", "remember" : "hatırla", "Alternative Logins" : "Alternatif Girişler", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index 26f831b9262..6fa7aa63c1e 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.", "An internal error occured." : "Dahili bir hata oluştu.", "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.", + "Log in" : "Giriş yap", "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?", "remember" : "hatırla", "Alternative Logins" : "Alternatif Girişler", diff --git a/core/l10n/uk.js b/core/l10n/uk.js index ab5689e64f1..e73f854f5e1 100644 --- a/core/l10n/uk.js +++ b/core/l10n/uk.js @@ -229,6 +229,7 @@ OC.L10N.register( "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.", "An internal error occured." : "Виникла внутрішня помилка.", "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", + "Log in" : "Увійти", "remember" : "запам'ятати", "Alternative Logins" : "Альтернативні імена користувача", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>", diff --git a/core/l10n/uk.json b/core/l10n/uk.json index 7d92acb3cc9..09326dcf44e 100644 --- a/core/l10n/uk.json +++ b/core/l10n/uk.json @@ -227,6 +227,7 @@ "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.", "An internal error occured." : "Виникла внутрішня помилка.", "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", + "Log in" : "Увійти", "remember" : "запам'ятати", "Alternative Logins" : "Альтернативні імена користувача", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>", diff --git a/core/l10n/vi.js b/core/l10n/vi.js index c51c1563fe4..229a99b2c29 100644 --- a/core/l10n/vi.js +++ b/core/l10n/vi.js @@ -141,6 +141,7 @@ OC.L10N.register( "Search" : "Tìm kiếm", "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!", "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.", + "Log in" : "Đăng nhập", "remember" : "ghi nhớ", "Alternative Logins" : "Đăng nhập khác", "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.", diff --git a/core/l10n/vi.json b/core/l10n/vi.json index ba8015cafb4..e2f6e5a7ecc 100644 --- a/core/l10n/vi.json +++ b/core/l10n/vi.json @@ -139,6 +139,7 @@ "Search" : "Tìm kiếm", "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!", "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.", + "Log in" : "Đăng nhập", "remember" : "ghi nhớ", "Alternative Logins" : "Đăng nhập khác", "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 4af50e61c13..e8f87ff5900 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -248,6 +248,7 @@ OC.L10N.register( "Please contact your administrator." : "请联系你的管理员。", "An internal error occured." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", + "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", "remember" : "记住", "Alternative Logins" : "其他登录方式", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index b485c703e36..7bed1beaa9c 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -246,6 +246,7 @@ "Please contact your administrator." : "请联系你的管理员。", "An internal error occured." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", + "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", "remember" : "记住", "Alternative Logins" : "其他登录方式", diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js index fc1bef316a9..2766bd30007 100644 --- a/core/l10n/zh_HK.js +++ b/core/l10n/zh_HK.js @@ -68,6 +68,7 @@ OC.L10N.register( "Database name" : "資料庫名稱", "Log out" : "登出", "Search" : "尋找", + "Log in" : "登入", "remember" : "記住" }, "nplurals=1; plural=0;"); diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json index 2a6230797c1..0029a47794e 100644 --- a/core/l10n/zh_HK.json +++ b/core/l10n/zh_HK.json @@ -66,6 +66,7 @@ "Database name" : "資料庫名稱", "Log out" : "登出", "Search" : "尋找", + "Log in" : "登入", "remember" : "記住" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/lib/base.php b/lib/base.php index 9cf0228bbd9..63aad4518ab 100644 --- a/lib/base.php +++ b/lib/base.php @@ -540,7 +540,7 @@ class OC { // setup 3rdparty autoloader $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php'; if (!file_exists($vendorAutoLoad)) { - throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty".'); + throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".'); } require_once $vendorAutoLoad; @@ -674,7 +674,7 @@ class OC { self::registerCacheHooks(); self::registerFilesystemHooks(); - if (\OC::$server->getSystemConfig()->getValue('enable_previews', true)) { + if ($systemConfig->getValue('enable_previews', true)) { self::registerPreviewHooks(); } self::registerShareHooks(); diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js index 8885ecd6e10..715b834d2bf 100644 --- a/lib/l10n/cs_CZ.js +++ b/lib/l10n/cs_CZ.js @@ -49,6 +49,7 @@ OC.L10N.register( "Can't read file" : "Nelze přečíst soubor", "App directory already exists" : "Adresář aplikace již existuje", "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s", + "Archive does not contain a directory named %s" : "Archiv neobsahuje adresář pojmenovaný %s", "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace", "No href specified when installing app from http" : "Nebyl zadán odkaz pro instalaci aplikace z HTTP", "No path specified when installing app from local file" : "Nebyla zadána cesta pro instalaci aplikace z místního souboru", diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json index c5f50a73848..891b30850ab 100644 --- a/lib/l10n/cs_CZ.json +++ b/lib/l10n/cs_CZ.json @@ -47,6 +47,7 @@ "Can't read file" : "Nelze přečíst soubor", "App directory already exists" : "Adresář aplikace již existuje", "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s", + "Archive does not contain a directory named %s" : "Archiv neobsahuje adresář pojmenovaný %s", "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace", "No href specified when installing app from http" : "Nebyl zadán odkaz pro instalaci aplikace z HTTP", "No path specified when installing app from local file" : "Nebyla zadána cesta pro instalaci aplikace z místního souboru", diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index b88df10dddd..7ee64980fd0 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -28,23 +28,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -/* - * - * The following SQL statement is just a help for developers and will not be - * executed! - * - * CREATE TABLE `appconfig` ( - * `appid` VARCHAR( 255 ) NOT NULL , - * `configkey` VARCHAR( 255 ) NOT NULL , - * `configvalue` VARCHAR( 255 ) NOT NULL - * ) - * - */ namespace OC; -use OC\DB\Connection; use OCP\IAppConfig; +use OCP\IDBConnection; /** * This class provides an easy way for apps to store config values in the @@ -52,54 +40,32 @@ use OCP\IAppConfig; */ class AppConfig implements IAppConfig { /** - * @var \OC\DB\Connection $conn + * @var \OCP\IDBConnection $conn */ protected $conn; private $cache = array(); - private $appsLoaded = array(); - - /** - * @var string[] - */ - private $apps = null; - /** - * @param Connection $conn + * @param IDBConnection $conn */ - public function __construct(Connection $conn) { + public function __construct(IDBConnection $conn) { $this->conn = $conn; + $this->configLoaded = false; } /** * @param string $app - * @return string[] - */ - private function getAppCache($app) { - if (!isset($this->cache[$app])) { - $this->cache[$app] = array(); - } - return $this->cache[$app]; - } - - /** - * @param string $app - * @return \string[] + * @return array */ private function getAppValues($app) { - $appCache = $this->getAppCache($app); - if (array_search($app, $this->appsLoaded) === false) { - $query = 'SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`' - . ' WHERE `appid` = ?'; - $result = $this->conn->executeQuery($query, array($app)); - while ($row = $result->fetch()) { - $appCache[$row['configkey']] = $row['configvalue']; - } - $this->appsLoaded[] = $app; + $this->loadConfigValues(); + + if (isset($this->cache[$app])) { + return $this->cache[$app]; } - $this->cache[$app] = $appCache; - return $appCache; + + return []; } /** @@ -111,18 +77,9 @@ class AppConfig implements IAppConfig { * entry in the appconfig table. */ public function getApps() { - if (is_array($this->apps)) { - return $this->apps; - } - $query = 'SELECT DISTINCT `appid` FROM `*PREFIX*appconfig` ORDER BY `appid`'; - $result = $this->conn->executeQuery($query); + $this->loadConfigValues(); - $apps = array(); - while ($appid = $result->fetchColumn()) { - $apps[] = $appid; - } - $this->apps = $apps; - return $apps; + return $this->getSortedKeys($this->cache); } /** @@ -135,8 +92,17 @@ class AppConfig implements IAppConfig { * not returned. */ public function getKeys($app) { - $values = $this->getAppValues($app); - $keys = array_keys($values); + $this->loadConfigValues(); + + if (isset($this->cache[$app])) { + return $this->getSortedKeys($this->cache[$app]); + } + + return []; + } + + public function getSortedKeys($data) { + $keys = array_keys($data); sort($keys); return $keys; } @@ -153,12 +119,13 @@ class AppConfig implements IAppConfig { * not exist the default value will be returned */ public function getValue($app, $key, $default = null) { - $values = $this->getAppValues($app); - if (isset($values[$key])) { - return $values[$key]; - } else { - return $default; + $this->loadConfigValues(); + + if ($this->hasKey($app, $key)) { + return $this->cache[$app][$key]; } + + return $default; } /** @@ -169,8 +136,9 @@ class AppConfig implements IAppConfig { * @return bool */ public function hasKey($app, $key) { - $values = $this->getAppValues($app); - return array_key_exists($key, $values); + $this->loadConfigValues(); + + return isset($this->cache[$app][$key]); } /** @@ -179,11 +147,9 @@ class AppConfig implements IAppConfig { * @param string $app app * @param string $key key * @param string $value value - * @return void + * @return bool True if the value was inserted or updated, false if the value was the same */ public function setValue($app, $key, $value) { - $inserted = false; - // Does the key exist? no: insert, yes: update. if (!$this->hasKey($app, $key)) { $inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [ 'appid' => $app, @@ -193,29 +159,32 @@ class AppConfig implements IAppConfig { 'appid', 'configkey', ]); - } - if (!$inserted) { - $oldValue = $this->getValue($app, $key); - if($oldValue === strval($value)) { - return; + if ($inserted) { + if (!isset($this->cache[$app])) { + $this->cache[$app] = []; + } + + $this->cache[$app][$key] = $value; + return true; } - $data = array( - 'configvalue' => $value, - ); - $where = array( - 'appid' => $app, - 'configkey' => $key, - ); - $this->conn->update('*PREFIX*appconfig', $data, $where); - } - if (!isset($this->cache[$app])) { - $this->cache[$app] = array(); - } - if (is_array($this->apps) and array_search($app, $this->apps) === false) { - $this->apps[$app] = $app; } + + $sql = $this->conn->getQueryBuilder(); + $sql->update('appconfig') + ->set('configvalue', $sql->createParameter('configvalue')) + ->where($sql->expr()->eq('appid', $sql->createParameter('app'))) + ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey'))) + ->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue'))) + ->setParameter('configvalue', $value) + ->setParameter('app', $app) + ->setParameter('configkey', $key) + ->setParameter('configvalue', $value); + $changedRow = (bool) $sql->execute(); + $this->cache[$app][$key] = $value; + + return $changedRow; } /** @@ -226,14 +195,17 @@ class AppConfig implements IAppConfig { * @return boolean|null */ public function deleteKey($app, $key) { - $where = array( - 'appid' => $app, - 'configkey' => $key, - ); - $this->conn->delete('*PREFIX*appconfig', $where); - if (isset($this->cache[$app]) and isset($this->cache[$app][$key])) { - unset($this->cache[$app][$key]); - } + $this->loadConfigValues(); + + $sql = $this->conn->getQueryBuilder(); + $sql->delete('appconfig') + ->where($sql->expr()->eq('appid', $sql->createParameter('app'))) + ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey'))) + ->setParameter('app', $app) + ->setParameter('configkey', $key); + $sql->execute(); + + unset($this->cache[$app][$key]); } /** @@ -245,38 +217,65 @@ class AppConfig implements IAppConfig { * Removes all keys in appconfig belonging to the app. */ public function deleteApp($app) { - $where = array( - 'appid' => $app, - ); - $this->conn->delete('*PREFIX*appconfig', $where); + $this->loadConfigValues(); + + $sql = $this->conn->getQueryBuilder(); + $sql->delete('appconfig') + ->where($sql->expr()->eq('appid', $sql->createParameter('app'))) + ->setParameter('app', $app); + $sql->execute(); + unset($this->cache[$app]); - unset($this->apps[$app]); } /** - * get multiply values, either the app or key can be used as wildcard by setting it to false + * get multiple values, either the app or key can be used as wildcard by setting it to false * * @param string|false $app * @param string|false $key * @return array|false */ public function getValues($app, $key) { - if (($app !== false) == ($key !== false)) { + if (($app !== false) === ($key !== false)) { return false; } - if ($app !== false) { + if ($key === false) { return $this->getAppValues($app); } else { - $query = 'SELECT `configvalue`, `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = ?'; - $result = $this->conn->executeQuery($query, array($key)); + $configs = []; + foreach ($this->getApps() as $appId) { + if ($this->hasKey($appId, $key)) { + $configs[$appId] = $this->getValue($appId, $key); + } + } + + return $configs; + } + } - $values = array(); - while ($row = $result->fetch((\PDO::FETCH_ASSOC))) { - $values[$row['appid']] = $row['configvalue']; + /** + * Load all the app config values + */ + protected function loadConfigValues() { + if ($this->configLoaded) return; + + $this->cache = []; + + $sql = $this->conn->getQueryBuilder(); + $sql->select('*') + ->from('appconfig'); + $result = $sql->execute(); + + while ($row = $result->fetch()) { + if (!isset($this->cache[$row['appid']])) { + $this->cache[$row['appid']] = []; } - return $values; + $this->cache[$row['appid']][$row['configkey']] = $row['configvalue']; } + $result->closeCursor(); + + $this->configLoaded = true; } } diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 3a4bd0b19dd..70ed26c0b27 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -37,6 +37,7 @@ namespace OC\Share; +use OC\Files\Filesystem; use OCP\IUserSession; use OCP\IDBConnection; use OCP\IConfig; @@ -120,6 +121,7 @@ class Share extends Constants { */ public static function getUsersSharingFile($path, $ownerUser, $includeOwner = false, $returnUserPaths = false) { + Filesystem::initMountPoints($ownerUser); $shares = $sharePaths = $fileTargets = array(); $publicShare = false; $remoteShare = false; diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js index ca8d2b41081..96a724cae10 100644 --- a/settings/l10n/fa.js +++ b/settings/l10n/fa.js @@ -110,6 +110,9 @@ OC.L10N.register( "Cheers!" : "سلامتی!", "Forum" : "انجمن", "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید", + "Desktop client" : "نرم افزار دسکتاپ", + "Android app" : "اپ اندروید", + "iOS app" : "اپ iOS", "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده", "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>", "Password" : "گذرواژه", diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json index 9dc390ea8cc..354e56e1ffc 100644 --- a/settings/l10n/fa.json +++ b/settings/l10n/fa.json @@ -108,6 +108,9 @@ "Cheers!" : "سلامتی!", "Forum" : "انجمن", "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید", + "Desktop client" : "نرم افزار دسکتاپ", + "Android app" : "اپ اندروید", + "iOS app" : "اپ iOS", "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده", "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>", "Password" : "گذرواژه", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 9c161281846..da80ca15b0c 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -554,16 +554,16 @@ if ($_['cronErrors']) { </ul> </div> +<?php if (!empty($_['updaterAppPanel'])): ?> + <div id="updater"><?php print_unescaped($_['updaterAppPanel']); ?></div> +<?php endif; ?> + <div class="section"> <h2><?php p($l->t('Version'));?></h2> <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?> <?php include('settings.development.notice.php'); ?> </div> -<?php if (!empty($_['updaterAppPanel'])): ?> - <div id="updater"><?php print_unescaped($_['updaterAppPanel']); ?></div> -<?php endif; ?> - <div class="section credits-footer"> <p><?php print_unescaped($theme->getShortFooter()); ?></p> </div> diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php index 5a2cb3f88fc..5ea446aee51 100644 --- a/tests/lib/appconfig.php +++ b/tests/lib/appconfig.php @@ -7,49 +7,123 @@ * See the COPYING-README file. */ -class Test_Appconfig extends \Test\TestCase { +namespace Test\Lib; + +use Test\TestCase; + +class AppConfig extends TestCase { /** @var \OCP\IAppConfig */ protected $appConfig; /** @var \OCP\IDBConnection */ protected $connection; + protected $originalConfig; + public function setUp() { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); - $this->registerAppConfig(new \OC\AppConfig(\OC::$server->getDatabaseConnection())); - - $query = $this->connection->prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?'); - $query->execute(array('testapp')); - $query->execute(array('someapp')); - $query->execute(array('123456')); - $query->execute(array('anotherapp')); - - $query = $this->connection->prepare('INSERT INTO `*PREFIX*appconfig` VALUES (?, ?, ?)'); - - $query->execute(array('testapp', 'enabled', 'true')); - $query->execute(array('testapp', 'installed_version', '1.2.3')); - $query->execute(array('testapp', 'depends_on', 'someapp')); - $query->execute(array('testapp', 'deletethis', 'deletethis')); - $query->execute(array('testapp', 'key', 'value')); - - $query->execute(array('someapp', 'key', 'value')); - $query->execute(array('someapp', 'otherkey', 'othervalue')); - - $query->execute(array('123456', 'key', 'value')); - $query->execute(array('123456', 'enabled', 'false')); - - $query->execute(array('anotherapp', 'key', 'value')); - $query->execute(array('anotherapp', 'enabled', 'false')); + $sql = $this->connection->getQueryBuilder(); + $sql->select('*') + ->from('appconfig'); + $result = $sql->execute(); + $this->originalConfig = $result->fetchAll(); + $result->closeCursor(); + + $sql = $this->connection->getQueryBuilder(); + $sql->delete('appconfig'); + $sql->execute(); + + $this->registerAppConfig(new \OC\AppConfig($this->connection)); + + $sql = $this->connection->getQueryBuilder(); + $sql->insert('appconfig') + ->values([ + 'appid' => $sql->createParameter('appid'), + 'configkey' => $sql->createParameter('configkey'), + 'configvalue' => $sql->createParameter('configvalue'), + ]); + + $sql->setParameters([ + 'appid' => 'testapp', + 'configkey' => 'enabled', + 'configvalue' => 'true', + ])->execute(); + $sql->setParameters([ + 'appid' => 'testapp', + 'configkey' => 'installed_version', + 'configvalue' => '1.2.3', + ])->execute(); + $sql->setParameters([ + 'appid' => 'testapp', + 'configkey' => 'depends_on', + 'configvalue' => 'someapp', + ])->execute(); + $sql->setParameters([ + 'appid' => 'testapp', + 'configkey' => 'deletethis', + 'configvalue' => 'deletethis', + ])->execute(); + $sql->setParameters([ + 'appid' => 'testapp', + 'configkey' => 'key', + 'configvalue' => 'value', + ])->execute(); + + $sql->setParameters([ + 'appid' => 'someapp', + 'configkey' => 'key', + 'configvalue' => 'value', + ])->execute(); + $sql->setParameters([ + 'appid' => 'someapp', + 'configkey' => 'otherkey', + 'configvalue' => 'othervalue', + ])->execute(); + + $sql->setParameters([ + 'appid' => '123456', + 'configkey' => 'key', + 'configvalue' => 'value', + ])->execute(); + $sql->setParameters([ + 'appid' => '123456', + 'configkey' => 'enabled', + 'configvalue' => 'false', + ])->execute(); + + $sql->setParameters([ + 'appid' => 'anotherapp', + 'configkey' => 'key', + 'configvalue' => 'value', + ])->execute(); + $sql->setParameters([ + 'appid' => 'anotherapp', + 'configkey' => 'enabled', + 'configvalue' => 'false', + ])->execute(); } public function tearDown() { - $query = $this->connection->prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?'); - $query->execute(array('testapp')); - $query->execute(array('someapp')); - $query->execute(array('123456')); - $query->execute(array('anotherapp')); + $sql = $this->connection->getQueryBuilder(); + $sql->delete('appconfig'); + $sql->execute(); + + $sql = $this->connection->getQueryBuilder(); + $sql->insert('appconfig') + ->values([ + 'appid' => $sql->createParameter('appid'), + 'configkey' => $sql->createParameter('configkey'), + 'configvalue' => $sql->createParameter('configvalue'), + ]); + + foreach ($this->originalConfig as $configs) { + $sql->setParameter('appid', $configs['appid']) + ->setParameter('configkey', $configs['configkey']) + ->setParameter('configvalue', $configs['configvalue']); + $sql->execute(); + } $this->registerAppConfig(new \OC\AppConfig(\OC::$server->getDatabaseConnection())); parent::tearDown(); @@ -61,217 +135,179 @@ class Test_Appconfig extends \Test\TestCase { * @param \OCP\IAppConfig $appConfig */ protected function registerAppConfig($appConfig) { - \OC::$server->registerService('AppConfig', function ($c) use ($appConfig) { + \OC::$server->registerService('AppConfig', function () use ($appConfig) { return $appConfig; }); } - public function getAppConfigs() { - return [ - [new \OC\AppConfig(\OC::$server->getDatabaseConnection())], - ]; - } + public function testGetApps() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testGetApps($callable) { - $query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*appconfig` ORDER BY `appid`'); - $result = $query->execute(); - $expected = array(); - while ($row = $result->fetchRow()) { - $expected[] = $row['appid']; - } - sort($expected); - $apps = call_user_func([$callable, 'getApps']); - $this->assertEquals($expected, $apps); + $this->assertEquals([ + 'anotherapp', + 'someapp', + 'testapp', + '123456', + ], $config->getApps()); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testGetKeys($callable) { - $query = \OC_DB::prepare('SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?'); - $result = $query->execute(array('testapp')); - $expected = array(); - while($row = $result->fetchRow()) { - $expected[] = $row["configkey"]; - } - sort($expected); - $keys = call_user_func([$callable, 'getKeys'], 'testapp'); - $this->assertEquals($expected, $keys); + public function testGetKeys() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $keys = $config->getKeys('testapp'); + $this->assertEquals([ + 'deletethis', + 'depends_on', + 'enabled', + 'installed_version', + 'key', + ], $keys); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testGetValue($callable) { - $value = call_user_func([$callable, 'getValue'], 'testapp', 'installed_version'); + public function testGetValue() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $value = $config->getValue('testapp', 'installed_version'); $this->assertConfigKey('testapp', 'installed_version', $value); - $value = call_user_func([$callable, 'getValue'], 'testapp', 'nonexistant'); + $value = $config->getValue('testapp', 'nonexistant'); $this->assertNull($value); - $value = call_user_func([$callable, 'getValue'], 'testapp', 'nonexistant', 'default'); + $value = $config->getValue('testapp', 'nonexistant', 'default'); $this->assertEquals('default', $value); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testHasKey($callable) { - $value = call_user_func([$callable, 'hasKey'], 'testapp', 'installed_version'); - $this->assertTrue($value); + public function testHasKey() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); - $value = call_user_func([$callable, 'hasKey'], 'nonexistant', 'nonexistant'); - $this->assertFalse($value); + $this->assertTrue($config->hasKey('testapp', 'installed_version')); + $this->assertFalse($config->hasKey('testapp', 'nonexistant')); + $this->assertFalse($config->hasKey('nonexistant', 'nonexistant')); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testSetValue($callable) { - call_user_func([$callable, 'setValue'], 'testapp', 'installed_version', '1.33.7'); + public function testSetValueUpdate() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version')); + $this->assertConfigKey('testapp', 'installed_version', '1.2.3'); + + $this->assertFalse($config->setValue('testapp', 'installed_version', '1.2.3')); + + $this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version')); + $this->assertConfigKey('testapp', 'installed_version', '1.2.3'); + + $this->assertTrue($config->setValue('testapp', 'installed_version', '1.33.7')); + + + $this->assertEquals('1.33.7', $config->getValue('testapp', 'installed_version')); $this->assertConfigKey('testapp', 'installed_version', '1.33.7'); - call_user_func([$callable, 'setValue'], 'someapp', 'somekey', 'somevalue'); + $config->setValue('someapp', 'somekey', 'somevalue'); $this->assertConfigKey('someapp', 'somekey', 'somevalue'); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testDeleteKey($callable) { - call_user_func([$callable, 'deleteKey'], 'testapp', 'deletethis'); - $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?'); - $query->execute(array('testapp', 'deletethis')); - $result = (bool)$query->fetchRow(); + public function testSetValueInsert() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $this->assertFalse($config->hasKey('someapp', 'somekey')); + $this->assertNull($config->getValue('someapp', 'somekey')); + + $this->assertTrue($config->setValue('someapp', 'somekey', 'somevalue')); + + $this->assertTrue($config->hasKey('someapp', 'somekey')); + $this->assertEquals('somevalue', $config->getValue('someapp', 'somekey')); + $this->assertConfigKey('someapp', 'somekey', 'somevalue'); + + $this->assertFalse($config->setValue('someapp', 'somekey', 'somevalue')); + } + + public function testDeleteKey() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $this->assertTrue($config->hasKey('testapp', 'deletethis')); + + $config->deleteKey('testapp', 'deletethis'); + + $this->assertFalse($config->hasKey('testapp', 'deletethis')); + + $sql = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $sql->select('configvalue') + ->from('appconfig') + ->where($sql->expr()->eq('appid', $sql->createParameter('appid'))) + ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey'))) + ->setParameter('appid', 'testapp') + ->setParameter('configkey', 'deletethis'); + $query = $sql->execute(); + $result = $query->fetch(); + $query->closeCursor(); $this->assertFalse($result); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testDeleteApp($callable) { - call_user_func([$callable, 'deleteApp'], 'someapp'); - $query = \OC_DB::prepare('SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?'); - $query->execute(array('someapp')); - $result = (bool)$query->fetchRow(); + public function testDeleteApp() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $this->assertTrue($config->hasKey('someapp', 'otherkey')); + + $config->deleteApp('someapp'); + + $this->assertFalse($config->hasKey('someapp', 'otherkey')); + + $sql = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $sql->select('configvalue') + ->from('appconfig') + ->where($sql->expr()->eq('appid', $sql->createParameter('appid'))) + ->setParameter('appid', 'someapp'); + $query = $sql->execute(); + $result = $query->fetch(); + $query->closeCursor(); $this->assertFalse($result); } - /** - * @dataProvider getAppConfigs - * - * @param mixed $callable - */ - public function testGetValues($callable) { - $this->assertFalse(call_user_func([$callable, 'getValues'], 'testapp', 'enabled')); + public function testGetValuesNotAllowed() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); - $query = \OC_DB::prepare('SELECT `configkey`, `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ?'); - $query->execute(array('testapp')); - $expected = array(); - while ($row = $query->fetchRow()) { + $this->assertFalse($config->getValues('testapp', 'enabled')); + + $this->assertFalse($config->getValues(false, false)); + } + + public function testGetValues() { + $config = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + + $sql = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $sql->select(['configkey', 'configvalue']) + ->from('appconfig') + ->where($sql->expr()->eq('appid', $sql->createParameter('appid'))) + ->setParameter('appid', 'testapp'); + $query = $sql->execute(); + $expected = []; + while ($row = $query->fetch()) { $expected[$row['configkey']] = $row['configvalue']; } - $values = call_user_func([$callable, 'getValues'], 'testapp', false); + $query->closeCursor(); + + $values = $config->getValues('testapp', false); $this->assertEquals($expected, $values); - $query = \OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig` WHERE `configkey` = ?'); - $query->execute(array('enabled')); - $expected = array(); - while ($row = $query->fetchRow()) { + $sql = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $sql->select(['appid', 'configvalue']) + ->from('appconfig') + ->where($sql->expr()->eq('configkey', $sql->createParameter('configkey'))) + ->setParameter('configkey', 'enabled'); + $query = $sql->execute(); + $expected = []; + while ($row = $query->fetch()) { $expected[$row['appid']] = $row['configvalue']; } - $values = call_user_func([$callable, 'getValues'], false, 'enabled'); - $this->assertEquals($expected, $values); - } + $query->closeCursor(); - public function testSetValueUnchanged() { - $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); - $statementMock->expects($this->once()) - ->method('fetch') - ->will($this->returnValue(false)); - - $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); - $connectionMock->expects($this->once()) - ->method('executeQuery') - ->with($this->equalTo('SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`' - .' WHERE `appid` = ?'), $this->equalTo(array('bar'))) - ->will($this->returnValue($statementMock)); - $connectionMock->expects($this->once()) - ->method('insertIfNotExist') - ->with($this->equalTo('*PREFIX*appconfig'), - $this->equalTo( - array( - 'appid' => 'bar', - 'configkey' => 'foo', - 'configvalue' => 'v1', - ) - ), $this->equalTo(['appid', 'configkey'])) - ->willReturn(1); - $connectionMock->expects($this->never()) - ->method('update'); - - $appconfig = new OC\AppConfig($connectionMock); - $appconfig->setValue('bar', 'foo', 'v1'); - $appconfig->setValue('bar', 'foo', 'v1'); - $appconfig->setValue('bar', 'foo', 'v1'); - } - - public function testSetValueUnchanged2() { - $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); - $statementMock->expects($this->once()) - ->method('fetch') - ->will($this->returnValue(false)); - - $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); - $connectionMock->expects($this->once()) - ->method('executeQuery') - ->with($this->equalTo('SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`' - .' WHERE `appid` = ?'), $this->equalTo(array('bar'))) - ->will($this->returnValue($statementMock)); - $connectionMock->expects($this->once()) - ->method('insertIfNotExist') - ->with($this->equalTo('*PREFIX*appconfig'), - $this->equalTo( - array( - 'appid' => 'bar', - 'configkey' => 'foo', - 'configvalue' => 'v1', - ) - ), $this->equalTo(['appid', 'configkey'])) - ->willReturn(1); - $connectionMock->expects($this->once()) - ->method('update') - ->with($this->equalTo('*PREFIX*appconfig'), - $this->equalTo(array('configvalue' => 'v2')), - $this->equalTo(array('appid' => 'bar', 'configkey' => 'foo')) - ); - - $appconfig = new OC\AppConfig($connectionMock); - $appconfig->setValue('bar', 'foo', 'v1'); - $appconfig->setValue('bar', 'foo', 'v2'); - $appconfig->setValue('bar', 'foo', 'v2'); + $values = $config->getValues(false, 'enabled'); + $this->assertEquals($expected, $values); } public function testSettingConfigParallel() { - $appConfig1 = new OC\AppConfig(\OC::$server->getDatabaseConnection()); - $appConfig2 = new OC\AppConfig(\OC::$server->getDatabaseConnection()); + $appConfig1 = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); + $appConfig2 = new \OC\AppConfig(\OC::$server->getDatabaseConnection()); $appConfig1->getValue('testapp', 'foo', 'v1'); $appConfig2->getValue('testapp', 'foo', 'v1'); @@ -286,12 +322,19 @@ class Test_Appconfig extends \Test\TestCase { * @param string $app * @param string $key * @param string $expected - * @throws \OC\DatabaseException */ protected function assertConfigKey($app, $key, $expected) { - $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?'); - $result = $query->execute([$app, $key]); - $actual = $result->fetchRow(); + $sql = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $sql->select('configvalue') + ->from('appconfig') + ->where($sql->expr()->eq('appid', $sql->createParameter('appid'))) + ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey'))) + ->setParameter('appid', $app) + ->setParameter('configkey', $key); + $query = $sql->execute(); + $actual = $query->fetch(); + $query->closeCursor(); + $this->assertEquals($expected, $actual['configvalue']); } } |
