Merge remote-tracking branch 'nextcloud/master' into bugfix-create-da…

…tabase-user

apps/comments/l10n/ru.js

@@ -27,6 +27,7 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "При обновлении комментария с id {id} произошла ошибка",
     "Error occurred while posting comment" : "При сохранении комментария произошла ошибка",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочитанный комментарий","%n непрочитанных комментариев","%n непрочитанных комментариев","%n непрочитанных комментариев"],
+    "_1 new comment_::_{unread} new comments_" : ["1 новый комментарий","{unread} новых комментариев","{unread} новых комментариев","{unread} новых комментариев"],
     "Comment" : "Комментарий",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Вы были упомянуты в комментарии к файлу «%s» пользователем, учётная запись которого была удалена",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\""

apps/comments/l10n/ru.json

@@ -25,6 +25,7 @@
     "Error occurred while updating comment with id {id}" : "При обновлении комментария с id {id} произошла ошибка",
     "Error occurred while posting comment" : "При сохранении комментария произошла ошибка",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочитанный комментарий","%n непрочитанных комментариев","%n непрочитанных комментариев","%n непрочитанных комментариев"],
+    "_1 new comment_::_{unread} new comments_" : ["1 новый комментарий","{unread} новых комментариев","{unread} новых комментариев","{unread} новых комментариев"],
     "Comment" : "Комментарий",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Вы были упомянуты в комментарии к файлу «%s» пользователем, учётная запись которого была удалена",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\""

apps/dav/lib/CardDAV/PhotoCache.php

@@ -167,16 +167,19 @@ private function getFile(ISimpleFolder $folder, $size) {
 	}
 
 	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @return ISimpleFolder
+	 * @throws NotFoundException
+	 * @throws NotPermittedException
 	 */
-	private function getFolder($addressBookId, $cardUri) {
+	private function getFolder(int $addressBookId, string $cardUri, bool $createIfNotExists = true): ISimpleFolder {
 		$hash = md5($addressBookId . ' ' . $cardUri);
 		try {
 			return $this->appData->getFolder($hash);
 		} catch (NotFoundException $e) {
-			return $this->appData->newFolder($hash);
+			if($createIfNotExists) {
+				return $this->appData->newFolder($hash);
+			} else {
+				throw $e;
+			}
 		}
 	}
 
@@ -271,9 +274,14 @@ private function getBinaryType(Binary $photo) {
 	/**
 	 * @param int $addressBookId
 	 * @param string $cardUri
+	 * @throws NotPermittedException
 	 */
 	public function delete($addressBookId, $cardUri) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-		$folder->delete();
+		try {
+			$folder = $this->getFolder($addressBookId, $cardUri, false);
+			$folder->delete();
+		} catch (NotFoundException $e) {
+			// that's OK, nothing to do
+		}
 	}
 }

apps/files/l10n/sl.js

@@ -97,28 +97,28 @@ OC.L10N.register(
     "Renamed by {user}" : "Preimenovano od {user}",
     "Moved by {user}" : "Premaknjeno od {user}",
     "\"remote user\"" : "\"oddaljeni uporabnik\"",
-    "You created {file}" : "Ustvaril(a) si {file}",
+    "You created {file}" : "Ustvarite datoteko {file}",
     "You created an encrypted file in {file}" : "Ustvarjena je šifrirana datoteka v {file}",
-    "{user} created {file}" : "{user} ustvaril(a) {file}",
-    "{user} created an encrypted file in {file}" : "{user} ustvaril(a) kodirano datoteko {file}",
+    "{user} created {file}" : "{user} ustvari datoteko {file}",
+    "{user} created an encrypted file in {file}" : "{user} ustvari šifrirano datoteko {file}",
     "{file} was created in a public folder" : "{file} ustvarjena je bila v javni mapi",
-    "You changed {file}" : "Spremenil(a) si {file}",
-    "You changed an encrypted file in {file}" : "Spremenil(a) si kodirano datoteko v {file}",
+    "You changed {file}" : "Spremenite datoteko {file}",
+    "You changed an encrypted file in {file}" : "Spremenite šifrirano datoteko v {file}",
     "{user} changed {file}" : "{user} spremenil/a {file}",
-    "You deleted {file}" : "Izbrisal(a) si {file}",
-    "{user} deleted {file}" : "{user} izbrisal(a) {file}",
-    "You restored {file}" : "Obnovil(a) si {file}",
-    "{user} restored {file}" : "{user} obnovil(a) {file}",
-    "You renamed {oldfile} to {newfile}" : "Preimenoval(a) si {oldfile} v {newfile}",
-    "{user} renamed {oldfile} to {newfile}" : "{user} preimenoval(a) {oldfile} v {newfile}",
-    "You moved {oldfile} to {newfile}" : "Premaknil(a) si {oldfile} v {newfile}",
-    "{user} moved {oldfile} to {newfile}" : "{user} premaknil(a) {oldfile} v {newfile}",
+    "You deleted {file}" : "Izbrišete datoteko {file}",
+    "{user} deleted {file}" : "{user} izbriše datoteko {file}",
+    "You restored {file}" : "Obnovite datoteko {file}",
+    "{user} restored {file}" : "{user} obnovi datoteko {file}",
+    "You renamed {oldfile} to {newfile}" : "Preimenujete {oldfile} v {newfile}",
+    "{user} renamed {oldfile} to {newfile}" : "{user} preimenuje {oldfile} v {newfile}",
+    "You moved {oldfile} to {newfile}" : "Premaknete {oldfile} v {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} premakne {oldfile} v {newfile}",
     "A file has been added to or removed from your <strong>favorites</strong>" : "Datoteka je bila ali dodana ali umaknjena iz <strong>priljubljenih</strong>",
     "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Datoteka ali mapa je bila <strong>spremenjena</strong> ali <strong>preimenovana</strong>",
-    "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>",
+    "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je bila <strong>ustvarjena</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Datoteka ali mapa je bila <strong>izbrisana</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Omeji obvestila o ustvarjanju in spreminjanju <strong>najpogosteje uporabljenih </strong> datotek <em>(omogoči pretok)</em>",
-    "A file or folder has been <strong>restored</strong>" : "A file or folder has been <strong>restored</strong>",
+    "A file or folder has been <strong>restored</strong>" : "Datoteka ali mapa je bila <strong>obnovljena</strong>",
     "Unlimited" : "Neomejeno",
     "Upload (max. %s)" : "Pošiljanje (omejitev %s)",
     "%s of %s used" : "%s od %s uporabljeno",

apps/files/l10n/sl.json

@@ -95,28 +95,28 @@
     "Renamed by {user}" : "Preimenovano od {user}",
     "Moved by {user}" : "Premaknjeno od {user}",
     "\"remote user\"" : "\"oddaljeni uporabnik\"",
-    "You created {file}" : "Ustvaril(a) si {file}",
+    "You created {file}" : "Ustvarite datoteko {file}",
     "You created an encrypted file in {file}" : "Ustvarjena je šifrirana datoteka v {file}",
-    "{user} created {file}" : "{user} ustvaril(a) {file}",
-    "{user} created an encrypted file in {file}" : "{user} ustvaril(a) kodirano datoteko {file}",
+    "{user} created {file}" : "{user} ustvari datoteko {file}",
+    "{user} created an encrypted file in {file}" : "{user} ustvari šifrirano datoteko {file}",
     "{file} was created in a public folder" : "{file} ustvarjena je bila v javni mapi",
-    "You changed {file}" : "Spremenil(a) si {file}",
-    "You changed an encrypted file in {file}" : "Spremenil(a) si kodirano datoteko v {file}",
+    "You changed {file}" : "Spremenite datoteko {file}",
+    "You changed an encrypted file in {file}" : "Spremenite šifrirano datoteko v {file}",
     "{user} changed {file}" : "{user} spremenil/a {file}",
-    "You deleted {file}" : "Izbrisal(a) si {file}",
-    "{user} deleted {file}" : "{user} izbrisal(a) {file}",
-    "You restored {file}" : "Obnovil(a) si {file}",
-    "{user} restored {file}" : "{user} obnovil(a) {file}",
-    "You renamed {oldfile} to {newfile}" : "Preimenoval(a) si {oldfile} v {newfile}",
-    "{user} renamed {oldfile} to {newfile}" : "{user} preimenoval(a) {oldfile} v {newfile}",
-    "You moved {oldfile} to {newfile}" : "Premaknil(a) si {oldfile} v {newfile}",
-    "{user} moved {oldfile} to {newfile}" : "{user} premaknil(a) {oldfile} v {newfile}",
+    "You deleted {file}" : "Izbrišete datoteko {file}",
+    "{user} deleted {file}" : "{user} izbriše datoteko {file}",
+    "You restored {file}" : "Obnovite datoteko {file}",
+    "{user} restored {file}" : "{user} obnovi datoteko {file}",
+    "You renamed {oldfile} to {newfile}" : "Preimenujete {oldfile} v {newfile}",
+    "{user} renamed {oldfile} to {newfile}" : "{user} preimenuje {oldfile} v {newfile}",
+    "You moved {oldfile} to {newfile}" : "Premaknete {oldfile} v {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} premakne {oldfile} v {newfile}",
     "A file has been added to or removed from your <strong>favorites</strong>" : "Datoteka je bila ali dodana ali umaknjena iz <strong>priljubljenih</strong>",
     "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Datoteka ali mapa je bila <strong>spremenjena</strong> ali <strong>preimenovana</strong>",
-    "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>",
+    "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je bila <strong>ustvarjena</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Datoteka ali mapa je bila <strong>izbrisana</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Omeji obvestila o ustvarjanju in spreminjanju <strong>najpogosteje uporabljenih </strong> datotek <em>(omogoči pretok)</em>",
-    "A file or folder has been <strong>restored</strong>" : "A file or folder has been <strong>restored</strong>",
+    "A file or folder has been <strong>restored</strong>" : "Datoteka ali mapa je bila <strong>obnovljena</strong>",
     "Unlimited" : "Neomejeno",
     "Upload (max. %s)" : "Pošiljanje (omejitev %s)",
     "%s of %s used" : "%s od %s uporabljeno",

apps/files_trashbin/l10n/sl.js

@@ -3,13 +3,20 @@ OC.L10N.register(
     {
     "Deleted files" : "Izbrisane datoteke",
     "restored" : "obnovljeno",
+    "This application enables users to restore files that were deleted from the system." : "Program omogoča uporabniku obnovitev datotek, ki so bile predhodno izbrisane iz sistema.",
+    "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Program omogoča obnovitev izbrisanih datotek. Datoteke so prikazane kot seznam v spletnem vmesniku, uporabnik pa ima možnost posamezne datoteke obnoviti v ustrezne mape, ali pa jih dokončno izbrisati. Obnovitev povrne tudi shranjene različice datoteke, če so te na voljo. Tudi datoteke, ki so bile izbrisane iz souporabe, je mogoče obnoviti, ne obnovi pa se nastavitev souporabe. Privzeto ostanejo datoteke v košu 30 dni.\nZa preprečevanje popolne zasedenosti, program ne uporabi več kot 50 % trenutno razpoložljivega prostora oziroma količinske omejitve. Če se to zgodi, se najprej do omejitve izbrišejo najstarejše datoteke. Podrobnosti o delovanju in možnostih programa so na voljo v dokumentaciji.",
     "Restore" : "Obnovi",
     "Delete permanently" : "Trajno izbriši",
+    "Error while restoring file from trashbin" : "Prišlo je do napake med obnavljanjem datoteke iz koša",
+    "Error while removing file from trashbin" : "Prišlo je do napake med odstranjevanjem datoteke iz koša",
+    "Error while restoring files from trashbin" : "Prišlo je do napake med obnavljanjem datotek iz koša",
+    "Error while emptying trashbin" : "Prišlo je do napake med praznjenjem koša",
+    "Error while removing files from trashbin" : "Prišlo je do napake med odstranjevanjem datotek iz koša",
     "This operation is forbidden" : "To dejanje ni dovoljeno!",
-    "This directory is unavailable, please check the logs or contact the administrator" : "Mapa ni na voljo. Preverite dnevnik in stopite v stik s skrbnikom sistema.",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Mapa ni na voljo. Preverite dnevnik opravil in stopite v stik s skrbnikom sistema.",
     "No deleted files" : "Ni izbrisanih datotek",
-    "You will be able to recover deleted files from here" : "Izbrisane datoteke je mogoče povrniti na tem mestu",
-    "No entries found in this folder" : "V tej mapi ni najdenih predmetov.",
+    "You will be able to recover deleted files from here" : "Izbrisane datoteke je mogoče tudi povrniti.",
+    "No entries found in this folder" : "V tej mapi ni datotek in podmap.",
     "Select all" : "Izberi vse",
     "Name" : "Ime",
     "Actions" : "Dejanja",

apps/files_trashbin/l10n/sl.json

@@ -1,13 +1,20 @@
 { "translations": {
     "Deleted files" : "Izbrisane datoteke",
     "restored" : "obnovljeno",
+    "This application enables users to restore files that were deleted from the system." : "Program omogoča uporabniku obnovitev datotek, ki so bile predhodno izbrisane iz sistema.",
+    "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Program omogoča obnovitev izbrisanih datotek. Datoteke so prikazane kot seznam v spletnem vmesniku, uporabnik pa ima možnost posamezne datoteke obnoviti v ustrezne mape, ali pa jih dokončno izbrisati. Obnovitev povrne tudi shranjene različice datoteke, če so te na voljo. Tudi datoteke, ki so bile izbrisane iz souporabe, je mogoče obnoviti, ne obnovi pa se nastavitev souporabe. Privzeto ostanejo datoteke v košu 30 dni.\nZa preprečevanje popolne zasedenosti, program ne uporabi več kot 50 % trenutno razpoložljivega prostora oziroma količinske omejitve. Če se to zgodi, se najprej do omejitve izbrišejo najstarejše datoteke. Podrobnosti o delovanju in možnostih programa so na voljo v dokumentaciji.",
     "Restore" : "Obnovi",
     "Delete permanently" : "Trajno izbriši",
+    "Error while restoring file from trashbin" : "Prišlo je do napake med obnavljanjem datoteke iz koša",
+    "Error while removing file from trashbin" : "Prišlo je do napake med odstranjevanjem datoteke iz koša",
+    "Error while restoring files from trashbin" : "Prišlo je do napake med obnavljanjem datotek iz koša",
+    "Error while emptying trashbin" : "Prišlo je do napake med praznjenjem koša",
+    "Error while removing files from trashbin" : "Prišlo je do napake med odstranjevanjem datotek iz koša",
     "This operation is forbidden" : "To dejanje ni dovoljeno!",
-    "This directory is unavailable, please check the logs or contact the administrator" : "Mapa ni na voljo. Preverite dnevnik in stopite v stik s skrbnikom sistema.",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Mapa ni na voljo. Preverite dnevnik opravil in stopite v stik s skrbnikom sistema.",
     "No deleted files" : "Ni izbrisanih datotek",
-    "You will be able to recover deleted files from here" : "Izbrisane datoteke je mogoče povrniti na tem mestu",
-    "No entries found in this folder" : "V tej mapi ni najdenih predmetov.",
+    "You will be able to recover deleted files from here" : "Izbrisane datoteke je mogoče tudi povrniti.",
+    "No entries found in this folder" : "V tej mapi ni datotek in podmap.",
     "Select all" : "Izberi vse",
     "Name" : "Ime",
     "Actions" : "Dejanja",