Merge pull request #11715 from nextcloud/version/noid/14.0.2RC2

14.0.2 RC 2

.drone.yml

@@ -284,7 +284,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-16
     commands:
       - sleep 10 # gives the database enough time to initialize
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+      - POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
     when:
       matrix:
         DB: postgres
@@ -936,6 +936,7 @@ services:
     image: postgres:9
     environment:
       - POSTGRES_USER=oc_autotest
+      - POSTGRES_DB=oc_autotest_dummy
       - POSTGRES_PASSWORD=owncloud
     tmpfs:
       - /var/lib/postgresql/data
@@ -947,6 +948,7 @@ services:
       image: postgres:10
       environment:
         - POSTGRES_USER=oc_autotest
+        - POSTGRES_DB=oc_autotest_dummy
         - POSTGRES_PASSWORD=owncloud
       tmpfs:
         - /var/lib/postgresql/data
@@ -1042,4 +1044,4 @@ services:
       matrix:
         ENABLE_OPENLDAP: true
 
-branches: [ master, stable* ]
+branches: [ master, stable14 ]

apps/comments/css/comments.scss

@@ -22,6 +22,9 @@
 	padding: 10px;
 	min-height: 44px;
 	margin: 0;
+
+	/* Prevent the text from overlapping with the submit button. */
+	padding-right: 30px;
 }
 
 #commentsTabView .newCommentForm {
@@ -130,7 +133,7 @@
 	 adding this brings them closer to the element**/
 	margin-top: 5px;
 }
-#commentsTabView .comments li .message .avatar-name-wrapper,
+
 .atwho-view-ul * .avatar-name-wrapper,
 #commentsTabView .comment .authorRow {
 	position: relative;
@@ -141,24 +144,34 @@
 
 #commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser),
 #commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar,
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar img,
 #commentsTabView .comment .authorRow .avatar:not(.currentUser),
 #commentsTabView .comment .authorRow .author:not(.currentUser) {
 	cursor: pointer;
 }
 
 .atwho-view-ul .avatar-name-wrapper,
-.atwho-view-ul .avatar-name-wrapper .avatar {
+.atwho-view-ul .avatar-name-wrapper .avatar,
+.atwho-view-ul .avatar-name-wrapper .avatar img {
 	cursor: pointer;
 }
 
 #commentsTabView .comments li .message .atwho-inserted,
 #commentsTabView .newCommentForm .atwho-inserted {
 	.avatar-name-wrapper {
+		/* Make the wrapper the positioning context of its child contacts
+		 * menu. */
+		position: relative;
+
 		display: inline;
 		vertical-align: top;
 		background-color: var(--color-background-dark);
 		border-radius: 50vh;
 		padding: 1px 7px 1px 1px;
+
+		/* Ensure that the avatar and the user name will be kept together. */
+		white-space: nowrap;
+
 		.avatar {
 			img {
 				vertical-align: top;
@@ -171,6 +184,15 @@
 			margin-left: 0;
 			margin-right: 2px;
 		}
+		strong {
+			/* Ensure that the user name is shown in bold, as different browsers
+			 * use different font weights for strong elements. */
+			font-weight: bold;
+		}
+	}
+	.avatar-name-wrapper.currentUser {
+		background-color: var(--color-primary);
+		color: var(--color-primary-text);
 	}
 }
 
@@ -231,4 +253,9 @@
 
 .app-files .action-comment {
 	padding: 16px 14px;
-}
+}
+
+#commentsTabView .comment .message .contactsmenu-popover {
+	left: -6px;
+	top: 24px;
+}

apps/comments/js/commentstabview.js

@@ -196,24 +196,26 @@
 					sorter: function (q, items) { return items; }
 				},
 				displayTpl: function (item) {
-					return '<li>'
-						+ '<span class="avatar-name-wrapper">'
-						+ '<div class="avatar" '
-						+ ' data-username="' + escapeHTML(item.id) + '"'	// for avatars
-						+ ' data-user="' + escapeHTML(item.id) + '"'		// for contactsmenu
-						+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
-						+ ' <strong>' + escapeHTML(item.label) + '</strong>'
-						+ '</span></li>';
+					return '<li>' +
+						'<span class="avatar-name-wrapper">' +
+							'<span class="avatar" ' +
+									'data-username="' + escapeHTML(item.id) + '" ' + // for avatars
+									'data-user="' + escapeHTML(item.id) + '" ' + // for contactsmenu
+									'data-user-display-name="' + escapeHTML(item.label) + '">' +
+							'</span>' +
+							'<strong>' + escapeHTML(item.label) + '</strong>' +
+						'</span></li>';
 				},
 				insertTpl: function (item) {
-					return ''
-						+ '<span class="avatar-name-wrapper">'
-						+ '<div class="avatar" '
-						+ ' data-username="' + escapeHTML(item.id) + '"'	// for avatars
-						+ ' data-user="' + escapeHTML(item.id) + '"'		// for contactsmenu
-						+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
-						+ ' <strong>' + escapeHTML(item.label) + '</strong>'
-						+ '</span>';
+					return '' +
+						'<span class="avatar-name-wrapper">' +
+							'<span class="avatar" ' +
+									'data-username="' + escapeHTML(item.id) + '" ' + // for avatars
+									'data-user="' + escapeHTML(item.id) + '" ' + // for contactsmenu
+									'data-user-display-name="' + escapeHTML(item.label) + '">' +
+							'</span>' +
+							'<strong>' + escapeHTML(item.label) + '</strong>' +
+						'</span>';
 				},
 				searchKey: "label"
 			});
@@ -224,7 +226,7 @@
 					// passing the whole comments form would re-apply and request
 					// avatars from the server
 					$(je.target).find(
-						'div[data-username="' + $el.find('[data-username]').data('username') + '"]'
+						'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
 					).parent(),
 					editionMode
 				);
@@ -440,14 +442,13 @@
 				return;
 			}
 
-			$el.find('.avatar').each(function() {
-				var avatar = $(this);
-				var strong = $(this).next();
-				var appendTo = $(this).parent();
+			$el.find('.avatar-name-wrapper').each(function() {
+				var $this = $(this);
+				var $avatar = $this.find('.avatar');
 
-				var username = $(this).data('username');
-				if (username !== oc_current_user) {
-					$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
+				var user = $avatar.data('user');
+				if (user !== OC.getCurrentUser().uid) {
+					$this.contactsMenu(user, 0, $this);
 				}
 			});
 		},
@@ -486,20 +487,22 @@
 		},
 
 		_composeHTMLMention: function(uid, displayName) {
-			var avatar = '<div class="avatar" '
-				+ 'data-username="' + _.escape(uid) + '"'
-				+ ' data-user="' + _.escape(uid) + '"'
-				+ ' data-user-display-name="'
-				+ _.escape(displayName) + '"></div>';
+			var avatar = '' +
+				'<span class="avatar" ' +
+						'data-username="' + _.escape(uid) + '" ' +
+						'data-user="' + _.escape(uid) + '" ' +
+						'data-user-display-name="' + _.escape(displayName) + '">' +
+				'</span>';
 
 			var isCurrentUser = (uid === OC.getCurrentUser().uid);
 
-			return ''
-				+ '<span class="atwho-inserted" contenteditable="false">'
-				+ '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">'
-				+ avatar + ' <strong>'+ _.escape(displayName)+'</strong>'
-				+ '</span>'
-				+ '</span>';
+			return '' +
+				'<span class="atwho-inserted" contenteditable="false">' +
+					'<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">' +
+						avatar +
+						'<strong>' + _.escape(displayName) + '</strong>' +
+					'</span>' +
+				'</span>';
 		},
 
 		nextPage: function() {

apps/comments/l10n/cs.js

@@ -19,18 +19,19 @@ OC.L10N.register(
     "Comment" : "Komentář",
     "You commented" : "Okomentovali jste",
     "%1$s commented" : "%1$s okomentován",
-    "{author} commented" : "{author} okomentoval",
-    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
-    "You commented on {file}" : "Okomentoval(a) jste {file}",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentovali jste %1$s",
+    "You commented on {file}" : "Okomentovali jste {file}",
     "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
     "{author} commented on {file}" : "{author} okomentoval(a) {file}",
     "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
+    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
     "Unknown user" : "Neznámý uživatel",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/comments/l10n/cs.json

@@ -17,18 +17,19 @@
     "Comment" : "Komentář",
     "You commented" : "Okomentovali jste",
     "%1$s commented" : "%1$s okomentován",
-    "{author} commented" : "{author} okomentoval",
-    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
-    "You commented on {file}" : "Okomentoval(a) jste {file}",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentovali jste %1$s",
+    "You commented on {file}" : "Okomentovali jste {file}",
     "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
     "{author} commented on {file}" : "{author} okomentoval(a) {file}",
     "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
+    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
     "Unknown user" : "Neznámý uživatel",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/comments/l10n/he.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
     "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
+    "Files app plugin to add comments to files" : "תוסף ליישומון הקבצים כדי להוסיף הערות על קבצים",
     "Unknown user" : "משתמש לא ידוע",
     "A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”"

apps/comments/l10n/he.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
     "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
+    "Files app plugin to add comments to files" : "תוסף ליישומון הקבצים כדי להוסיף הערות על קבצים",
     "Unknown user" : "משתמש לא ידוע",
     "A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”"

apps/comments/l10n/is.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
+    "Files app plugin to add comments to files" : "Viðbót við skráaforrit til að bæta athugasemdum við skrár",
     "Unknown user" : "Óþekktur notandi",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”"

apps/comments/l10n/is.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
+    "Files app plugin to add comments to files" : "Viðbót við skráaforrit til að bæta athugasemdum við skrár",
     "Unknown user" : "Óþekktur notandi",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”"

apps/comments/l10n/nl.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Je werd vermeld op \"{file}\" in een reactie door een sindsdien verwijderde gebruiker",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
     "{user} mentioned you in a comment on “{file}”" : "{user} heeft je vermeld in een reactie op “{file}\"",
+    "Files app plugin to add comments to files" : "Bestanden app plugin om reacties aan bestanden toe te voegen",
     "Unknown user" : "Onbekende gebruiker",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"%s\"",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"{file}\""

apps/comments/l10n/nl.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Je werd vermeld op \"{file}\" in een reactie door een sindsdien verwijderde gebruiker",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
     "{user} mentioned you in a comment on “{file}”" : "{user} heeft je vermeld in een reactie op “{file}\"",
+    "Files app plugin to add comments to files" : "Bestanden app plugin om reacties aan bestanden toe te voegen",
     "Unknown user" : "Onbekende gebruiker",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"%s\"",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"{file}\""

apps/comments/l10n/pl.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Zostałeś/aś wspomniany/a w \"{file}\" w komentarzach przez użytkownika, który został usunięty",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s wspomniał/-a o Tobie w komentarzu “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} wspomniał/-a o Tobie w komentarzu “{file}”",
+    "Files app plugin to add comments to files" : "Plugin umożliwiający dodawanie komentarzy w aplikacji Pliki",
     "Unknown user" : "Nieznany użytkownik",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “{file}”"

apps/comments/l10n/pl.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Zostałeś/aś wspomniany/a w \"{file}\" w komentarzach przez użytkownika, który został usunięty",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s wspomniał/-a o Tobie w komentarzu “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} wspomniał/-a o Tobie w komentarzu “{file}”",
+    "Files app plugin to add comments to files" : "Plugin umożliwiający dodawanie komentarzy w aplikacji Pliki",
     "Unknown user" : "Nieznany użytkownik",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “{file}”"

apps/comments/l10n/ru.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Вы были упомянуты в комментарии к файлу «{file}» пользователем, учётная запись которого была удалена",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\"",
     "{user} mentioned you in a comment on “{file}”" : "{user} упомянул вас в комментарии к “{file}”.",
+    "Files app plugin to add comments to files" : "Модуль приложения «Файлы», позволяющий комментировать файлы",
     "Unknown user" : "Неизвестный пользователь",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “%s”.",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “{file}”."

apps/comments/l10n/ru.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Вы были упомянуты в комментарии к файлу «{file}» пользователем, учётная запись которого была удалена",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\"",
     "{user} mentioned you in a comment on “{file}”" : "{user} упомянул вас в комментарии к “{file}”.",
+    "Files app plugin to add comments to files" : "Модуль приложения «Файлы», позволяющий комментировать файлы",
     "Unknown user" : "Неизвестный пользователь",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “%s”.",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “{file}”."

apps/comments/l10n/sl.js

@@ -8,7 +8,7 @@ OC.L10N.register(
     "Cancel" : "Prekliči",
     "[Deleted user]" : "[Izbrisan uporabnik]",
     "Comments" : "Opombe",
-    "No comments yet, start the conversation!" : "Še ni komentarjev, začni debato!",
+    "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
     "More comments …" : "Več komentarjev ....",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",

apps/comments/l10n/sl.json

@@ -6,7 +6,7 @@
     "Cancel" : "Prekliči",
     "[Deleted user]" : "[Izbrisan uporabnik]",
     "Comments" : "Opombe",
-    "No comments yet, start the conversation!" : "Še ni komentarjev, začni debato!",
+    "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
     "More comments …" : "Več komentarjev ....",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",

apps/comments/l10n/zh_CN.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "您在 “{file}” 上一名用户的评论中被提到过，该用户在那之后被删除了",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的评论中提到了您",
     "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的评论中提到了您",
+    "Files app plugin to add comments to files" : "文件应用插件用于为文件添加注释",
     "Unknown user" : "未知用户",
     "A (now) deleted user mentioned you in a comment on “%s”" : "一个(已)被删除的用户在 “%s” 的评论中提到了您",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "一个(已)被删除的用户在 “{file}” 的评论中提到了您"

apps/comments/l10n/zh_CN.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "您在 “{file}” 上一名用户的评论中被提到过，该用户在那之后被删除了",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的评论中提到了您",
     "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的评论中提到了您",
+    "Files app plugin to add comments to files" : "文件应用插件用于为文件添加注释",
     "Unknown user" : "未知用户",
     "A (now) deleted user mentioned you in a comment on “%s”" : "一个(已)被删除的用户在 “%s” 的评论中提到了您",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "一个(已)被删除的用户在 “{file}” 的评论中提到了您"

apps/comments/lib/Controller/Notifications.php

@@ -31,8 +31,10 @@ use OCP\AppFramework\Http\Response;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
 use OCP\IRequest;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Notification\IManager;
 
@@ -42,8 +44,8 @@ use OCP\Notification\IManager;
  * @package OCA\Comments\Controller
  */
 class Notifications extends Controller {
-	/** @var Folder  */
-	protected $folder;
+	/** @var IRootFolder  */
+	protected $rootFolder;
 
 	/** @var ICommentsManager  */
 	protected $commentsManager;
@@ -63,7 +65,7 @@ class Notifications extends Controller {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param ICommentsManager $commentsManager
-	 * @param Folder $folder
+	 * @param IRootFolder $rootFolder
 	 * @param IURLGenerator $urlGenerator
 	 * @param IManager $notificationManager
 	 * @param IUserSession $userSession
@@ -72,35 +74,50 @@ class Notifications extends Controller {
 		$appName,
 		IRequest $request,
 		ICommentsManager $commentsManager,
-		Folder $folder,
+		IRootFolder $rootFolder,
 		IURLGenerator $urlGenerator,
 		IManager $notificationManager,
 		IUserSession $userSession
 	) {
 		parent::__construct($appName, $request);
 		$this->commentsManager = $commentsManager;
-		$this->folder = $folder;
+		$this->rootFolder = $rootFolder;
 		$this->urlGenerator = $urlGenerator;
 		$this->notificationManager = $notificationManager;
 		$this->userSession = $userSession;
 	}
 
 	/**
-	 * @NoAdminRequired
+	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
 	 * @param string $id		the comment ID
 	 * @return Response
 	 */
 	public function view($id) {
+		$currentUser = $this->userSession->getUser();
+		if (!$currentUser instanceof IUser) {
+			return new RedirectResponse(
+				$this->urlGenerator->linkToRoute('core.login.showLoginForm', [
+					'redirect_url' => $this->urlGenerator->linkToRoute(
+						'comments.Notifications.view',
+						['id' => $id]
+					),
+				])
+			);
+		}
+
 		try {
 			$comment = $this->commentsManager->get($id);
 			if($comment->getObjectType() !== 'files') {
 				return new NotFoundResponse();
 			}
-			$files = $this->folder->getById((int)$comment->getObjectId());
-			if(count($files) === 0) {
-				$this->markProcessed($comment);
+			$userFolder = $this->rootFolder->getUserFolder($currentUser->getUID());
+			$files = $userFolder->getById((int)$comment->getObjectId());
+
+			$this->markProcessed($comment, $currentUser);
+
+			if (empty($files)) {
 				return new NotFoundResponse();
 			}
 
@@ -109,8 +126,6 @@ class Notifications extends Controller {
 				[ 'fileid' => $comment->getObjectId() ]
 			);
 
-			$this->markProcessed($comment);
-
 			return new RedirectResponse($url);
 		} catch (\Exception $e) {
 			return new NotFoundResponse();
@@ -120,17 +135,14 @@ class Notifications extends Controller {
 	/**
 	 * Marks the notification about a comment as processed
 	 * @param IComment $comment
+	 * @param IUser $currentUser
 	 */
-	protected function markProcessed(IComment $comment) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return;
-		}
+	protected function markProcessed(IComment $comment, IUser $currentUser) {
 		$notification = $this->notificationManager->createNotification();
 		$notification->setApp('comments')
 			->setObject('comment', $comment->getId())
 			->setSubject('mention')
-			->setUser($user->getUID());
+			->setUser($currentUser->getUID());
 		$this->notificationManager->markProcessed($notification);
 	}
 }

apps/comments/tests/Unit/Controller/NotificationsTest.php

@@ -24,10 +24,13 @@
 namespace OCA\Comments\Tests\Unit\Controller;
 
 use OCA\Comments\Controller\Notifications;
+use OCP\AppFramework\Http\NotFoundResponse;
+use OCP\AppFramework\Http\RedirectResponse;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Comments\NotFoundException;
 use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\IRequest;
 use OCP\IURLGenerator;
@@ -38,75 +41,117 @@ use OCP\Notification\INotification;
 use Test\TestCase;
 
 class NotificationsTest extends TestCase {
-	/** @var  \OCA\Comments\Controller\Notifications */
+	/** @var Notifications */
 	protected $notificationsController;
 
-	/** @var  \OCP\Comments\ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $commentsManager;
 
-	/** @var  \OCP\Files\Folder|\PHPUnit_Framework_MockObject_MockObject */
-	protected $folder;
+	/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
+	protected $rootFolder;
 
-	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $session;
 
-	/** @var \OCP\Notification\IManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $notificationManager;
 
+	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+	protected $urlGenerator;
+
 	protected function setUp() {
 		parent::setUp();
 
-		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)->getMock();
-		$this->folder = $this->getMockBuilder(Folder::class)->getMock();
-		$this->session = $this->getMockBuilder(IUserSession::class)->getMock();
-		$this->notificationManager = $this->getMockBuilder(IManager::class)->getMock();
+		$this->commentsManager = $this->createMock(ICommentsManager::class);
+		$this->rootFolder = $this->createMock(IRootFolder::class);
+		$this->session = $this->createMock(IUserSession::class);
+		$this->notificationManager = $this->createMock(IManager::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 
 		$this->notificationsController = new Notifications(
 			'comments',
-			$this->getMockBuilder(IRequest::class)->getMock(),
+			$this->createMock(IRequest::class),
 			$this->commentsManager,
-			$this->folder,
-			$this->getMockBuilder(IURLGenerator::class)->getMock(),
+			$this->rootFolder,
+			$this->urlGenerator,
 			$this->notificationManager,
 			$this->session
 		);
 	}
-	
+
+	public function testViewGuestRedirect() {
+		$this->commentsManager->expects($this->never())
+			->method('get');
+
+		$this->rootFolder->expects($this->never())
+			->method('getUserFolder');
+
+		$this->session->expects($this->once())
+			->method('getUser')
+			->willReturn(null);
+
+		$this->notificationManager->expects($this->never())
+			->method('createNotification');
+		$this->notificationManager->expects($this->never())
+			->method('markProcessed');
+
+		$this->urlGenerator->expects($this->exactly(2))
+			->method('linkToRoute')
+			->withConsecutive(
+				['comments.Notifications.view', ['id' => '42']],
+				['core.login.showLoginForm', ['redirect_url' => 'link-to-comment']]
+			)
+			->willReturnMap([
+				['comments.Notifications.view', ['id' => '42'], 'link-to-comment'],
+				['core.login.showLoginForm', ['redirect_url' => 'link-to-comment'], 'link-to-login'],
+			]);
+
+		/** @var RedirectResponse $response */
+		$response = $this->notificationsController->view('42');
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+		$this->assertSame('link-to-login', $response->getRedirectURL());
+	}
+
 	public function testViewSuccess() {
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())
 			->method('getObjectType')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 
 		$this->commentsManager->expects($this->any())
 			->method('get')
 			->with('42')
-			->will($this->returnValue($comment));
+			->willReturn($comment);
 
-		$file = $this->getMockBuilder(Node::class)->getMock();
+		$file = $this->createMock(Node::class);
+		$folder = $this->createMock(Folder::class);
 
-		$this->folder->expects($this->once())
+		$this->rootFolder->expects($this->once())
+			->method('getUserFolder')
+			->willReturn($folder);
+
+		$folder->expects($this->once())
 			->method('getById')
-			->will($this->returnValue([$file]));
+			->willReturn([$file]);
 
 		$this->session->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($this->getMockBuilder(IUser::class)->getMock()));
+			->willReturn($this->createMock(IUser::class));
 
-		$notification = $this->getMockBuilder(INotification::class)->getMock();
+		$notification = $this->createMock(INotification::class);
 		$notification->expects($this->any())
 			->method($this->anything())
-			->will($this->returnValue($notification));
+			->willReturn($notification);
 
 		$this->notificationManager->expects($this->once())
 			->method('createNotification')
-			->will($this->returnValue($notification));
+			->willReturn($notification);
 		$this->notificationManager->expects($this->once())
 			->method('markProcessed')
 			->with($notification);
 
 		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf('\OCP\AppFramework\Http\RedirectResponse', $response);
+		$this->assertInstanceOf(RedirectResponse::class, $response);
 	}
 
 	public function testViewInvalidComment() {
@@ -115,11 +160,12 @@ class NotificationsTest extends TestCase {
 			->with('42')
 			->will($this->throwException(new NotFoundException()));
 
-		$this->folder->expects($this->never())
-			->method('getById');
+		$this->rootFolder->expects($this->never())
+			->method('getUserFolder');
 
-		$this->session->expects($this->never())
-			->method('getUser');
+		$this->session->expects($this->once())
+			->method('getUser')
+			->willReturn($this->createMock(IUser::class));
 
 		$this->notificationManager->expects($this->never())
 			->method('createNotification');
@@ -127,41 +173,47 @@ class NotificationsTest extends TestCase {
 			->method('markProcessed');
 
 		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf('\OCP\AppFramework\Http\NotFoundResponse', $response);
+		$this->assertInstanceOf(NotFoundResponse::class, $response);
 	}
 
 	public function testViewNoFile() {
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())
 			->method('getObjectType')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 
 		$this->commentsManager->expects($this->any())
 			->method('get')
 			->with('42')
-			->will($this->returnValue($comment));
+			->willReturn($comment);
 
-		$this->folder->expects($this->once())
+		$folder = $this->createMock(Folder::class);
+
+		$this->rootFolder->expects($this->once())
+			->method('getUserFolder')
+			->willReturn($folder);
+
+		$folder->expects($this->once())
 			->method('getById')
-			->will($this->returnValue([]));
+			->willReturn([]);
 
 		$this->session->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($this->getMockBuilder(IUser::class)->getMock()));
+			->willReturn($this->createMock(IUser::class));
 
-		$notification = $this->getMockBuilder(INotification::class)->getMock();
+		$notification = $this->createMock(INotification::class);
 		$notification->expects($this->any())
 			->method($this->anything())
-			->will($this->returnValue($notification));
+			->willReturn($notification);
 
 		$this->notificationManager->expects($this->once())
 			->method('createNotification')
-			->will($this->returnValue($notification));
+			->willReturn($notification);
 		$this->notificationManager->expects($this->once())
 			->method('markProcessed')
 			->with($notification);
 
 		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf('\OCP\AppFramework\Http\NotFoundResponse', $response);
+		$this->assertInstanceOf(NotFoundResponse::class, $response);
 	}
 }

apps/comments/tests/js/commentstabviewSpec.js

@@ -309,7 +309,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 
 			expect(createStub.calledOnce).toEqual(false);
 			expect($newCommentForm.find('.message').html()).toContain('Mention to <span');
-			expect($newCommentForm.find('.message').html()).toContain('<div class="avatar"');
+			expect($newCommentForm.find('.message').html()).toContain('<span class="avatar"');
 			expect($newCommentForm.find('.message').html()).toContain('<strong>User Name</strong>');
 			expect($newCommentForm.find('.message').text()).not.toContain('@');
 			// In this case the default behaviour is prevented by the

apps/dav/l10n/bg.js

@@ -5,21 +5,23 @@ OC.L10N.register(
     "Todos" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
-    "You created calendar {calendar}" : "Направихте календар {calendar}",
+    "You created calendar {calendar}" : "Създадохте календара {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} изтри календар {calendar}",
     "You deleted calendar {calendar}" : "Изтрихте календар {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} обнови календар {calendar}",
     "You updated calendar {calendar}" : "Обновихте календар {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} сподели календар {calendar} с теб",
-    "You shared calendar {calendar} with {user}" : "Споделихте календар {calendar} с {user}",
+    "You shared calendar {calendar} as public link" : "Споделихте календара {calendar} с публична връзка",
+    "You removed public link for calendar {calendar}" : "Премахнахте публична връзка към календара {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} сподели календара {calendar} с вас",
+    "You shared calendar {calendar} with {user}" : "Споделихте календара {calendar} с {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} сподели календар {calendar} с {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} отказа споделяне на календар {calendar} с теб",
-    "You unshared calendar {calendar} from {user}" : "Отказахте споделяне на календар {calendar} от {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} отказа споделянето на календара {calendar} с вас",
+    "You unshared calendar {calendar} from {user}" : "Отказахте споделянето на календара {calendar} от {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} отказа споделяне на календар {calendar} от {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} отказа споделяне на календар {calendar} от себеси",
-    "You shared calendar {calendar} with group {group}" : "Споделихте календар {calendar} с група {group}",
+    "You shared calendar {calendar} with group {group}" : "Споделихте календара {calendar} с група {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} сподели календар {calendar} с група {group}",
-    "You unshared calendar {calendar} from group {group}" : "Отказахте споделяне на календар {calendar} от група {group}",
+    "You unshared calendar {calendar} from group {group}" : "Отказахте споделянето на календара {calendar} от група {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} отказа споделяне с календар {calendar} от група {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} създаде събитие {event} в календар {calendar}",
     "You created event {event} in calendar {calendar}" : "Създадохте събитие {event} в календар {calendar}",

apps/dav/l10n/bg.json

@@ -3,21 +3,23 @@
     "Todos" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
-    "You created calendar {calendar}" : "Направихте календар {calendar}",
+    "You created calendar {calendar}" : "Създадохте календара {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} изтри календар {calendar}",
     "You deleted calendar {calendar}" : "Изтрихте календар {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} обнови календар {calendar}",
     "You updated calendar {calendar}" : "Обновихте календар {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} сподели календар {calendar} с теб",
-    "You shared calendar {calendar} with {user}" : "Споделихте календар {calendar} с {user}",
+    "You shared calendar {calendar} as public link" : "Споделихте календара {calendar} с публична връзка",
+    "You removed public link for calendar {calendar}" : "Премахнахте публична връзка към календара {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} сподели календара {calendar} с вас",
+    "You shared calendar {calendar} with {user}" : "Споделихте календара {calendar} с {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} сподели календар {calendar} с {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} отказа споделяне на календар {calendar} с теб",
-    "You unshared calendar {calendar} from {user}" : "Отказахте споделяне на календар {calendar} от {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} отказа споделянето на календара {calendar} с вас",
+    "You unshared calendar {calendar} from {user}" : "Отказахте споделянето на календара {calendar} от {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} отказа споделяне на календар {calendar} от {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} отказа споделяне на календар {calendar} от себеси",
-    "You shared calendar {calendar} with group {group}" : "Споделихте календар {calendar} с група {group}",
+    "You shared calendar {calendar} with group {group}" : "Споделихте календара {calendar} с група {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} сподели календар {calendar} с група {group}",
-    "You unshared calendar {calendar} from group {group}" : "Отказахте споделяне на календар {calendar} от група {group}",
+    "You unshared calendar {calendar} from group {group}" : "Отказахте споделянето на календара {calendar} от група {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} отказа споделяне с календар {calendar} от група {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} създаде събитие {event} в календар {calendar}",
     "You created event {event} in calendar {calendar}" : "Създадохте събитие {event} в календар {calendar}",

apps/dav/l10n/cs.js

@@ -10,18 +10,18 @@ OC.L10N.register(
     "You deleted calendar {calendar}" : "Smazali jste kalendář {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} aktualizoval(a) kalendář {calendar}",
     "You updated calendar {calendar}" : "Aktualizovali jste kalendář {calendar}",
-    "You shared calendar {calendar} as public link" : "Sdílel(a) jste kalendář {calendar} jako veřejný odkaz",
-    "You removed public link for calendar {calendar}" : "Odstranil(a) jste veřejný odkaz pro kalendář {calendar} ",
+    "You shared calendar {calendar} as public link" : "Sdíleli jste kalendář {calendar} jako veřejný odkaz",
+    "You removed public link for calendar {calendar}" : "Odstranili jste veřejný odkaz pro kalendář {calendar} ",
     "{actor} shared calendar {calendar} with you" : "{actor} s vámi nasdílel(a) kalendář {calendar}",
     "You shared calendar {calendar} with {user}" : "S uživatelem {user} jste začali sdílet kalendář {calendar}",
-    "{actor} shared calendar {calendar} with {user}" : "{actor} začal sdílet kalendář {calendar} s uživatelem {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} začal(a) sdílet kalendář {calendar} s uživatelem {user}",
     "{actor} unshared calendar {calendar} from you" : "{actor} s vámi přestal(a) sdílet kalendář {calendar}",
     "You unshared calendar {calendar} from {user}" : "S uživatelem {user} jste přestal(a) sdílet kalendář {calendar}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} přestal(a) sdílet kalendář {calendar} s uživatelem {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} přestal sdílet kalendář {calendar} sám se sebou",
-    "You shared calendar {calendar} with group {group}" : "Se skupinou {group} jste začal(a) sdílet kalendář {calendar}",
+    "You shared calendar {calendar} with group {group}" : "Se skupinou {group} jste začali sdílet kalendář {calendar}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} nasdílel(a) kalendář {calendar} skupině {group}",
-    "You unshared calendar {calendar} from group {group}" : "Zrušil(a) jste sdílení kalendáře {calendar} skupině {group}",
+    "You unshared calendar {calendar} from group {group}" : "Zrušili jste sdílení kalendáře {calendar} skupině {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} přestal(a) sdílet kalendář {calendar} se skupinou {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} vytvořil(a) událost {event} v kalendáři {calendar}",
     "You created event {event} in calendar {calendar}" : "V kalendáři {calendar} jste vytvořil(a) událost {event}",
@@ -48,8 +48,8 @@ OC.L10N.register(
     "Hello %s," : "Dobrý den %s,",
     "The meeting »%s« with %s was canceled." : "Setkání »%s« s %s bylo zrušeno.",
     "Invitation updated" : "Pozvánka aktualizována",
-    "The meeting »%s« with %s was updated." : "Setkání »%s« s %s bylo aktualizováno.",
-    "%s invited you to »%s«" : "%s vás zve na »%s«",
+    "The meeting »%s« with %s was updated." : "Setkání „%s“ s %s bylo aktualizováno.",
+    "%s invited you to »%s«" : "%s vás zve na „%s“",
     "When:" : "Kdy:",
     "Where:" : "Kde:",
     "Description:" : "Popis:",
@@ -60,9 +60,10 @@ OC.L10N.register(
     "More options at %s" : "Další volby viz %s",
     "Contacts" : "Kontakty",
     "WebDAV" : "WebDAV",
-    "Technical details" : "Technické detaily",
+    "WebDAV endpoint" : "WebDAV endpoint",
+    "Technical details" : "Technické podrobnosti",
     "Remote Address: %s" : "Vzdálená adresa: %s",
-    "Request ID: %s" : "ID požadavku: %s",
+    "Request ID: %s" : "Identif. požadavku: %s",
     "There was an error updating your attendance status." : "Vyskytla se chyba při aktualizaci Vašeho stavu.",
     "Please contact the organizer directly." : "Kontaktujte organizátora přímo.",
     "Are you accepting the invitation?" : "Přijímáte pozvání?",

apps/dav/l10n/cs.json

@@ -8,18 +8,18 @@
     "You deleted calendar {calendar}" : "Smazali jste kalendář {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} aktualizoval(a) kalendář {calendar}",
     "You updated calendar {calendar}" : "Aktualizovali jste kalendář {calendar}",
-    "You shared calendar {calendar} as public link" : "Sdílel(a) jste kalendář {calendar} jako veřejný odkaz",
-    "You removed public link for calendar {calendar}" : "Odstranil(a) jste veřejný odkaz pro kalendář {calendar} ",
+    "You shared calendar {calendar} as public link" : "Sdíleli jste kalendář {calendar} jako veřejný odkaz",
+    "You removed public link for calendar {calendar}" : "Odstranili jste veřejný odkaz pro kalendář {calendar} ",
     "{actor} shared calendar {calendar} with you" : "{actor} s vámi nasdílel(a) kalendář {calendar}",
     "You shared calendar {calendar} with {user}" : "S uživatelem {user} jste začali sdílet kalendář {calendar}",
-    "{actor} shared calendar {calendar} with {user}" : "{actor} začal sdílet kalendář {calendar} s uživatelem {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} začal(a) sdílet kalendář {calendar} s uživatelem {user}",
     "{actor} unshared calendar {calendar} from you" : "{actor} s vámi přestal(a) sdílet kalendář {calendar}",
     "You unshared calendar {calendar} from {user}" : "S uživatelem {user} jste přestal(a) sdílet kalendář {calendar}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} přestal(a) sdílet kalendář {calendar} s uživatelem {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} přestal sdílet kalendář {calendar} sám se sebou",
-    "You shared calendar {calendar} with group {group}" : "Se skupinou {group} jste začal(a) sdílet kalendář {calendar}",
+    "You shared calendar {calendar} with group {group}" : "Se skupinou {group} jste začali sdílet kalendář {calendar}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} nasdílel(a) kalendář {calendar} skupině {group}",
-    "You unshared calendar {calendar} from group {group}" : "Zrušil(a) jste sdílení kalendáře {calendar} skupině {group}",
+    "You unshared calendar {calendar} from group {group}" : "Zrušili jste sdílení kalendáře {calendar} skupině {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} přestal(a) sdílet kalendář {calendar} se skupinou {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} vytvořil(a) událost {event} v kalendáři {calendar}",
     "You created event {event} in calendar {calendar}" : "V kalendáři {calendar} jste vytvořil(a) událost {event}",
@@ -46,8 +46,8 @@
     "Hello %s," : "Dobrý den %s,",
     "The meeting »%s« with %s was canceled." : "Setkání »%s« s %s bylo zrušeno.",
     "Invitation updated" : "Pozvánka aktualizována",
-    "The meeting »%s« with %s was updated." : "Setkání »%s« s %s bylo aktualizováno.",
-    "%s invited you to »%s«" : "%s vás zve na »%s«",
+    "The meeting »%s« with %s was updated." : "Setkání „%s“ s %s bylo aktualizováno.",
+    "%s invited you to »%s«" : "%s vás zve na „%s“",
     "When:" : "Kdy:",
     "Where:" : "Kde:",
     "Description:" : "Popis:",
@@ -58,9 +58,10 @@
     "More options at %s" : "Další volby viz %s",
     "Contacts" : "Kontakty",
     "WebDAV" : "WebDAV",
-    "Technical details" : "Technické detaily",
+    "WebDAV endpoint" : "WebDAV endpoint",
+    "Technical details" : "Technické podrobnosti",
     "Remote Address: %s" : "Vzdálená adresa: %s",
-    "Request ID: %s" : "ID požadavku: %s",
+    "Request ID: %s" : "Identif. požadavku: %s",
     "There was an error updating your attendance status." : "Vyskytla se chyba při aktualizaci Vašeho stavu.",
     "Please contact the organizer directly." : "Kontaktujte organizátora přímo.",
     "Are you accepting the invitation?" : "Přijímáte pozvání?",

apps/dav/l10n/de_DE.js

@@ -73,7 +73,7 @@ OC.L10N.register(
     "Calendar server" : "Kalender-Server",
     "Send invitations to attendees" : "Einladungen an die Teilnehmer versenden",
     "Please make sure to properly set up the email settings above." : "Stellen Sie sicher, dass die obigen E-Mail-Einstellungen korrekt sind.",
-    "Automatically generate a birthday calendar" : "Automatischen einen Kalender für Geburtstage erstellen",
+    "Automatically generate a birthday calendar" : "Automatisch einen Kalender für Geburtstage erstellen",
     "Birthday calendars will be generated by a background job." : "Kalender für Geburtstage werden von einem Hintergrund-Auftrag erstellt",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Die Einträge werden nicht sofort angezeigt. Nach der Aktivierung wird es ein wenig dauern bis zur Anzeige.",
     "CalDAV server" : "CalDAV-Server"

apps/dav/l10n/de_DE.json

@@ -71,7 +71,7 @@
     "Calendar server" : "Kalender-Server",
     "Send invitations to attendees" : "Einladungen an die Teilnehmer versenden",
     "Please make sure to properly set up the email settings above." : "Stellen Sie sicher, dass die obigen E-Mail-Einstellungen korrekt sind.",
-    "Automatically generate a birthday calendar" : "Automatischen einen Kalender für Geburtstage erstellen",
+    "Automatically generate a birthday calendar" : "Automatisch einen Kalender für Geburtstage erstellen",
     "Birthday calendars will be generated by a background job." : "Kalender für Geburtstage werden von einem Hintergrund-Auftrag erstellt",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Die Einträge werden nicht sofort angezeigt. Nach der Aktivierung wird es ein wenig dauern bis zur Anzeige.",
     "CalDAV server" : "CalDAV-Server"

apps/dav/l10n/fi.js

@@ -55,6 +55,7 @@ OC.L10N.register(
     "Link:" : "Linkki:",
     "Accept" : "Hyväksy",
     "Decline" : "Kieltäydy",
+    "More options …" : "Lisää valintoja…",
     "Contacts" : "Yhteystiedot",
     "WebDAV" : "WebDAV",
     "Technical details" : "Tekniset yksityiskohdat",
@@ -65,6 +66,7 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Hyväksytkö kutsun?",
     "Save" : "Tallenna",
     "Your attendance was updated successfully." : "Osallistumisesi päivitettiin onnistuneesti.",
+    "Calendar server" : "Kalenteripalvelin",
     "Send invitations to attendees" : "Lähetä kutsut osallistujille",
     "Please make sure to properly set up the email settings above." : "Varmista, että määrität sähköpostiasetukset oikein yläpuolelle. ",
     "Automatically generate a birthday calendar" : "Luo syntymäpäiväkalenteri automaattisesti",

apps/dav/l10n/fi.json

@@ -53,6 +53,7 @@
     "Link:" : "Linkki:",
     "Accept" : "Hyväksy",
     "Decline" : "Kieltäydy",
+    "More options …" : "Lisää valintoja…",
     "Contacts" : "Yhteystiedot",
     "WebDAV" : "WebDAV",
     "Technical details" : "Tekniset yksityiskohdat",
@@ -63,6 +64,7 @@
     "Are you accepting the invitation?" : "Hyväksytkö kutsun?",
     "Save" : "Tallenna",
     "Your attendance was updated successfully." : "Osallistumisesi päivitettiin onnistuneesti.",
+    "Calendar server" : "Kalenteripalvelin",
     "Send invitations to attendees" : "Lähetä kutsut osallistujille",
     "Please make sure to properly set up the email settings above." : "Varmista, että määrität sähköpostiasetukset oikein yläpuolelle. ",
     "Automatically generate a birthday calendar" : "Luo syntymäpäiväkalenteri automaattisesti",

apps/dav/l10n/is.js

@@ -56,9 +56,11 @@ OC.L10N.register(
     "Link:" : "Tengill:",
     "Accept" : "Samþykkja",
     "Decline" : "Hafna",
+    "More options …" : "Fleiri valkostir ...",
     "More options at %s" : "Fleiri valkostir á %s",
     "Contacts" : "Tengiliðir",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "WebDAV-endapunktur",
     "Technical details" : "Tæknilegar upplýsingar",
     "Remote Address: %s" : "Fjartengt vistfang: %s",
     "Request ID: %s" : "Beiðni um auðkenni: %s",
@@ -68,6 +70,7 @@ OC.L10N.register(
     "Tentative" : "Bráðabirgða",
     "Save" : "Vista",
     "Your attendance was updated successfully." : "Mætingarstaða þín var uppfærð.",
+    "Calendar server" : "Dagatalaþjónn",
     "Send invitations to attendees" : "Senda boð til þátttakenda",
     "Please make sure to properly set up the email settings above." : "Gakktu úr skugga um að tölvupóststillingarnar hér fyrir ofan séu réttar.",
     "Automatically generate a birthday calendar" : "Útbúa fæðingardagatal sjálfvirkt",

apps/dav/l10n/is.json

@@ -54,9 +54,11 @@
     "Link:" : "Tengill:",
     "Accept" : "Samþykkja",
     "Decline" : "Hafna",
+    "More options …" : "Fleiri valkostir ...",
     "More options at %s" : "Fleiri valkostir á %s",
     "Contacts" : "Tengiliðir",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "WebDAV-endapunktur",
     "Technical details" : "Tæknilegar upplýsingar",
     "Remote Address: %s" : "Fjartengt vistfang: %s",
     "Request ID: %s" : "Beiðni um auðkenni: %s",
@@ -66,6 +68,7 @@
     "Tentative" : "Bráðabirgða",
     "Save" : "Vista",
     "Your attendance was updated successfully." : "Mætingarstaða þín var uppfærð.",
+    "Calendar server" : "Dagatalaþjónn",
     "Send invitations to attendees" : "Senda boð til þátttakenda",
     "Please make sure to properly set up the email settings above." : "Gakktu úr skugga um að tölvupóststillingarnar hér fyrir ofan séu réttar.",
     "Automatically generate a birthday calendar" : "Útbúa fæðingardagatal sjálfvirkt",

apps/dav/l10n/nl.js

@@ -60,6 +60,7 @@ OC.L10N.register(
     "More options at %s" : "Meer opties op %s",
     "Contacts" : "Contactpersonen",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "WebDAV eindpunt",
     "Technical details" : "Technische details",
     "Remote Address: %s" : "Extern adres: %s",
     "Request ID: %s" : "Aanvraag-ID: %s",

apps/dav/l10n/nl.json

@@ -58,6 +58,7 @@
     "More options at %s" : "Meer opties op %s",
     "Contacts" : "Contactpersonen",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "WebDAV eindpunt",
     "Technical details" : "Technische details",
     "Remote Address: %s" : "Extern adres: %s",
     "Request ID: %s" : "Aanvraag-ID: %s",

apps/dav/l10n/pl.js

@@ -54,16 +54,28 @@ OC.L10N.register(
     "Where:" : "Gdzie: ",
     "Description:" : "Opis:",
     "Link:" : "Link: ",
+    "Accept" : "Akceptuj",
+    "Decline" : "Odrzuć",
+    "More options …" : "Więcej opcji...",
+    "More options at %s" : "Więcej opcji na %s",
     "Contacts" : "Kontakty",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "Adres WebDAV",
     "Technical details" : "Szczegóły techniczne",
     "Remote Address: %s" : "Adres zdalny: %s",
     "Request ID: %s" : "ID żądania: %s",
+    "There was an error updating your attendance status." : "Wystąpił błąd zmiany stanu uczestnictwa",
+    "Please contact the organizer directly." : "Skontaktuj się bezpośrednio z orgnizatorem.",
     "Are you accepting the invitation?" : "Czy akceptujesz zaproszenie?",
+    "Tentative" : "Niepewne",
     "Save" : "Zapisz",
+    "Your attendance was updated successfully." : "Twoja obecność została zmieniona.",
+    "Calendar server" : "Serwer kalendarzy",
     "Send invitations to attendees" : "Wyślij uczestnikom zaproszenia",
     "Please make sure to properly set up the email settings above." : "Upewnij się, że dobrze skonfigurowano powyżej ustawienia poczty e-mail.",
     "Automatically generate a birthday calendar" : "Automatycznie generuj kalendarz urodzin",
+    "Birthday calendars will be generated by a background job." : "Kalendarz urodzin będzie generowany przez zadanie w tle.",
+    "Hence they will not be available immediately after enabling but will show up after some time." : "W związku z tym, nie będą one widoczne bezpośrednio po włączeniu, ale pojawią się po jakimś czasie.",
     "CalDAV server" : "Serwer CalDAV"
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");

apps/dav/l10n/pl.json

@@ -52,16 +52,28 @@
     "Where:" : "Gdzie: ",
     "Description:" : "Opis:",
     "Link:" : "Link: ",
+    "Accept" : "Akceptuj",
+    "Decline" : "Odrzuć",
+    "More options …" : "Więcej opcji...",
+    "More options at %s" : "Więcej opcji na %s",
     "Contacts" : "Kontakty",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "Adres WebDAV",
     "Technical details" : "Szczegóły techniczne",
     "Remote Address: %s" : "Adres zdalny: %s",
     "Request ID: %s" : "ID żądania: %s",
+    "There was an error updating your attendance status." : "Wystąpił błąd zmiany stanu uczestnictwa",
+    "Please contact the organizer directly." : "Skontaktuj się bezpośrednio z orgnizatorem.",
     "Are you accepting the invitation?" : "Czy akceptujesz zaproszenie?",
+    "Tentative" : "Niepewne",
     "Save" : "Zapisz",
+    "Your attendance was updated successfully." : "Twoja obecność została zmieniona.",
+    "Calendar server" : "Serwer kalendarzy",
     "Send invitations to attendees" : "Wyślij uczestnikom zaproszenia",
     "Please make sure to properly set up the email settings above." : "Upewnij się, że dobrze skonfigurowano powyżej ustawienia poczty e-mail.",
     "Automatically generate a birthday calendar" : "Automatycznie generuj kalendarz urodzin",
+    "Birthday calendars will be generated by a background job." : "Kalendarz urodzin będzie generowany przez zadanie w tle.",
+    "Hence they will not be available immediately after enabling but will show up after some time." : "W związku z tym, nie będą one widoczne bezpośrednio po włączeniu, ale pojawią się po jakimś czasie.",
     "CalDAV server" : "Serwer CalDAV"
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }

apps/dav/l10n/ru.js

@@ -60,6 +60,7 @@ OC.L10N.register(
     "More options at %s" : "Дополнительные параметры на %s",
     "Contacts" : "Контакты",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "точка подключения WebDAV",
     "Technical details" : "Технические подробности",
     "Remote Address: %s" : "Удаленный адрес: %s",
     "Request ID: %s" : "ID запроса: %s",

apps/dav/l10n/ru.json

@@ -58,6 +58,7 @@
     "More options at %s" : "Дополнительные параметры на %s",
     "Contacts" : "Контакты",
     "WebDAV" : "WebDAV",
+    "WebDAV endpoint" : "точка подключения WebDAV",
     "Technical details" : "Технические подробности",
     "Remote Address: %s" : "Удаленный адрес: %s",
     "Request ID: %s" : "ID запроса: %s",

apps/dav/l10n/sq.js

@@ -41,12 +41,28 @@ OC.L10N.register(
     "A calendar <strong>event</strong> was modified" : "Një <strong>event</strong> në kalendar u modifikua",
     "A calendar <strong>todo</strong> was modified" : "Një kalendar <strong>todo<strong> u modifikua",
     "Contact birthdays" : "Ditëlindjet e kontakteve",
+    "%s via %s" : "%s nëpërmjet %s",
+    "Invitation canceled" : "Ftesa u anullua",
     "Hello %s," : "Përshëndetje %s,",
+    "The meeting »%s« with %s was canceled." : "Takimi »%s« me %s u anullua.",
+    "Invitation updated" : "Ftesa u përditësua",
+    "The meeting »%s« with %s was updated." : "Takimi »%s« me %s u përditësua.",
     "%s invited you to »%s«" : "%s ju ftoi juve tek %s",
+    "When:" : "Kur:",
+    "Where:" : "Ku:",
+    "Description:" : "Përshkrimi:",
     "Link:" : "Link:",
+    "Accept" : "Prano",
+    "Decline" : "Refuzo",
+    "More options …" : "Më shumë opsione ...",
     "Contacts" : "Kontaktet",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detaje teknike",
     "Remote Address: %s" : "Adresa remote: %s",
-    "Request ID: %s" : "ID e kërkesës: %s"
+    "Request ID: %s" : "ID e kërkesës: %s",
+    "Tentative" : "Tentativë",
+    "Save" : "Ruaj",
+    "Your attendance was updated successfully." : "Pjesëmarrja juaj u përditësua me sukses.",
+    "Send invitations to attendees" : "Dërgo ftesa tek pjesëmarrësit"
 },
 "nplurals=2; plural=(n != 1);");

apps/dav/l10n/sq.json

@@ -39,12 +39,28 @@
     "A calendar <strong>event</strong> was modified" : "Një <strong>event</strong> në kalendar u modifikua",
     "A calendar <strong>todo</strong> was modified" : "Një kalendar <strong>todo<strong> u modifikua",
     "Contact birthdays" : "Ditëlindjet e kontakteve",
+    "%s via %s" : "%s nëpërmjet %s",
+    "Invitation canceled" : "Ftesa u anullua",
     "Hello %s," : "Përshëndetje %s,",
+    "The meeting »%s« with %s was canceled." : "Takimi »%s« me %s u anullua.",
+    "Invitation updated" : "Ftesa u përditësua",
+    "The meeting »%s« with %s was updated." : "Takimi »%s« me %s u përditësua.",
     "%s invited you to »%s«" : "%s ju ftoi juve tek %s",
+    "When:" : "Kur:",
+    "Where:" : "Ku:",
+    "Description:" : "Përshkrimi:",
     "Link:" : "Link:",
+    "Accept" : "Prano",
+    "Decline" : "Refuzo",
+    "More options …" : "Më shumë opsione ...",
     "Contacts" : "Kontaktet",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detaje teknike",
     "Remote Address: %s" : "Adresa remote: %s",
-    "Request ID: %s" : "ID e kërkesës: %s"
+    "Request ID: %s" : "ID e kërkesës: %s",
+    "Tentative" : "Tentativë",
+    "Save" : "Ruaj",
+    "Your attendance was updated successfully." : "Pjesëmarrja juaj u përditësua me sukses.",
+    "Send invitations to attendees" : "Dërgo ftesa tek pjesëmarrësit"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/l10n/sv.js

@@ -54,11 +54,22 @@ OC.L10N.register(
     "Where:" : "Var:",
     "Description:" : "Beskrivning:",
     "Link:" : "Länk:",
+    "Accept" : "Acceptera",
+    "Decline" : "Avböj",
+    "More options …" : "Fler alternativ ...",
+    "More options at %s" : "Fler alternativ på %s",
     "Contacts" : "Kontakter",
     "WebDAV" : "WebDAV",
     "Technical details" : "Tekniska detaljer",
     "Remote Address: %s" : "Extern adress: %s",
     "Request ID: %s" : "Begär ID: %s",
+    "There was an error updating your attendance status." : "Ett fel uppstod vid uppdatering av din närvarostatus.",
+    "Please contact the organizer directly." : "Vänligen kontakta arrangören direkt.",
+    "Are you accepting the invitation?" : "Acceptera inbjudan?",
+    "Tentative" : "Preliminärt",
+    "Save" : "Spara",
+    "Your attendance was updated successfully." : "Dina närvaro uppdaterades.",
+    "Calendar server" : "Kalenderserver",
     "Send invitations to attendees" : "Skicka inbjudan till deltagare",
     "Please make sure to properly set up the email settings above." : "Vänligen säkerställ att epost-inställningarna ovan är korrekt angivna",
     "Automatically generate a birthday calendar" : "Generera en födelsedagskalender automatiskt",

apps/dav/l10n/sv.json

@@ -52,11 +52,22 @@
     "Where:" : "Var:",
     "Description:" : "Beskrivning:",
     "Link:" : "Länk:",
+    "Accept" : "Acceptera",
+    "Decline" : "Avböj",
+    "More options …" : "Fler alternativ ...",
+    "More options at %s" : "Fler alternativ på %s",
     "Contacts" : "Kontakter",
     "WebDAV" : "WebDAV",
     "Technical details" : "Tekniska detaljer",
     "Remote Address: %s" : "Extern adress: %s",
     "Request ID: %s" : "Begär ID: %s",
+    "There was an error updating your attendance status." : "Ett fel uppstod vid uppdatering av din närvarostatus.",
+    "Please contact the organizer directly." : "Vänligen kontakta arrangören direkt.",
+    "Are you accepting the invitation?" : "Acceptera inbjudan?",
+    "Tentative" : "Preliminärt",
+    "Save" : "Spara",
+    "Your attendance was updated successfully." : "Dina närvaro uppdaterades.",
+    "Calendar server" : "Kalenderserver",
     "Send invitations to attendees" : "Skicka inbjudan till deltagare",
     "Please make sure to properly set up the email settings above." : "Vänligen säkerställ att epost-inställningarna ovan är korrekt angivna",
     "Automatically generate a birthday calendar" : "Generera en födelsedagskalender automatiskt",

apps/dav/lib/CalDAV/Plugin.php

@@ -28,10 +28,16 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 	const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
 	/**
-	 * @inheritdoc
+	 * Returns the path to a principal's calendar home.
+	 *
+	 * The return url must not end with a slash.
+	 * This function should return null in case a principal did not have
+	 * a calendar home.
+	 *
+	 * @param string $principalUrl
+	 * @return string|null
 	 */
-	function getCalendarHomeForPrincipal($principalUrl):string {
-
+	function getCalendarHomeForPrincipal($principalUrl) {
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::CALENDAR_ROOT . '/' . $principalId;
@@ -44,8 +50,6 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
 		}
-
-		throw new \LogicException('This is not supposed to happen');
 	}
 
 }

apps/dav/lib/CardDAV/Plugin.php

@@ -39,10 +39,9 @@ class Plugin extends \Sabre\CardDAV\Plugin {
 	 * Returns the addressbook home for a given principal
 	 *
 	 * @param string $principal
-	 * @return string
+	 * @return string|null
 	 */
 	protected function getAddressbookHomeForPrincipal($principal) {
-
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
@@ -55,8 +54,6 @@ class Plugin extends \Sabre\CardDAV\Plugin {
 			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
 		}
-
-		throw new \LogicException('This is not supposed to happen');
 	}
 
 	/**

apps/dav/lib/Upload/AssemblyStream.php

@@ -57,6 +57,9 @@ class AssemblyStream implements \Icewind\Streams\File {
 	/** @var int */
 	private $currentNode = 0;
 
+	/** @var int */
+	private $currentNodeRead = 0;
+
 	/**
 	 * @param string $path
 	 * @param string $mode
@@ -110,10 +113,16 @@ class AssemblyStream implements \Icewind\Streams\File {
 		do {
 			$data = fread($this->currentStream, $count);
 			$read = strlen($data);
+			$this->currentNodeRead += $read;
 
 			if (feof($this->currentStream)) {
 				fclose($this->currentStream);
+				$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
+				if ($this->currentNodeRead < $currentNodeSize) {
+					throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
+				}
 				$this->currentNode++;
+				$this->currentNodeRead = 0;
 				if ($this->currentNode < count($this->nodes)) {
 					$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
 				} else {
@@ -182,7 +191,7 @@ class AssemblyStream implements \Icewind\Streams\File {
 	 * @return bool
 	 */
 	public function stream_eof() {
-		return $this->pos >= $this->size;
+		return $this->pos >= $this->size || $this->currentStream === null;
 	}
 
 	/**

apps/dav/tests/unit/CalDAV/PluginTest.php

@@ -63,11 +63,7 @@ class PluginTest extends TestCase  {
 		$this->assertSame($expected, $this->plugin->getCalendarHomeForPrincipal($input));
 	}
 
-	/**
-	 * @expectedException        \LogicException
-	 * @expectedExceptionMessage This is not supposed to happen
-	 */
 	public function testGetCalendarHomeForUnknownPrincipal() {
-		$this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB');
+		$this->assertNull($this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB'));
 	}
 }

apps/encryption/l10n/bg.js

@@ -9,9 +9,9 @@ OC.L10N.register(
     "Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
     "Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
     "Missing parameters" : "Липсващи параметри",
-    "Please provide the old recovery password" : "Моля, въведи старата парола за възстановяване",
+    "Please provide the old recovery password" : "Моля, въведете старата парола за възстановяване",
     "Please provide a new recovery password" : "Моля, задай нова парола за възстановяване",
-    "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
+    "Please repeat the new recovery password" : "Моля, въведете новата парола за възстановяване отново",
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
     "Could not update the private key password." : "Неуспешна промяна на паролата на личния ключ",

apps/encryption/l10n/bg.json

@@ -7,9 +7,9 @@
     "Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
     "Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
     "Missing parameters" : "Липсващи параметри",
-    "Please provide the old recovery password" : "Моля, въведи старата парола за възстановяване",
+    "Please provide the old recovery password" : "Моля, въведете старата парола за възстановяване",
     "Please provide a new recovery password" : "Моля, задай нова парола за възстановяване",
-    "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
+    "Please repeat the new recovery password" : "Моля, въведете новата парола за възстановяване отново",
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
     "Could not update the private key password." : "Неуспешна промяна на паролата на личния ключ",

apps/encryption/l10n/cs.js

@@ -1,28 +1,28 @@
 OC.L10N.register(
     "encryption",
     {
-    "Missing recovery key password" : "Chybí heslo klíče pro obnovu",
-    "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
-    "Repeated recovery key password does not match the provided recovery key password" : "Zadaná hesla pro obnovu se neshodují",
+    "Missing recovery key password" : "Chybí heslo ke klíče pro obnovu",
+    "Please repeat the recovery key password" : "Zopakujte zadání hesla ke klíči, sloužícímu pro obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Zopakované zadání hesla ke klíči, sloužícímu pro obnovu, se neshoduje",
     "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
-    "Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
-    "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
-    "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte své heslo k záchrannému klíči!",
+    "Recovery key successfully disabled" : "Záchranný klíč úspěšně zakázán",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nedaří se zakázat záchranný klíč. Zkontrolujte zadání hesla k němu.",
     "Missing parameters" : "Chybějící parametry",
-    "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
-    "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
-    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
+    "Please provide the old recovery password" : "Zadejte původní heslo pro obnovu",
+    "Please provide a new recovery password" : "Zadejte nové heslo pro obnovu",
+    "Please repeat the new recovery password" : "Zopakujte zadání nového hesla pro obnovu",
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
     "Recovery Key disabled" : "Záchranný klíč není povolen",
     "Recovery Key enabled" : "Záchranný klíč povolen",
-    "Could not enable the recovery key, please try again or contact your administrator" : "Nelze povolit záchranný klíč. Zkuste to prosím znovu nebo kontaktujte svého správce.",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nedaří se povolit záchranný klíč. Zkuste to znovu nebo se obraťte na svého správce.",
     "Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.",
-    "The old password was not correct, please try again." : "Původní heslo nebylo zadáno správně, zkuste to prosím znovu.",
-    "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.",
+    "The old password was not correct, please try again." : "Původní heslo nebylo zadáno správně, zkuste to znovu.",
+    "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to znovu.",
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
     "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 v osobním nastavení, abyste znovu získali přístup ke svým 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, 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é. Odhlaste se a znovu přihlaste.",
     "Please enable server side encryption in the admin settings in order to use the encryption module." : "Chcete-li používat šifrovací modul, povolte prosím šifrování na straně serveru v nastavení administrátora.",
     "Encryption app is enabled and ready" : "Aplikace šifrování je již povolena a připravena",
     "Bad Signature" : "Špatný podpis",
@@ -31,11 +31,13 @@ OC.L10N.register(
     "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.",
     "Default encryption module" : "Výchozí šifrovací modul",
-    "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 '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" : "Ahoj!\n\nAdministrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla '%s'.\n\nPřihlašte se do webového rozhraní, přejděte do nastavení 'základního šifrovacího modulu' a aktualizujte šifrovací heslo zadáním hesla výše do pole 'původní přihlašovací heslo' a svého aktuálního přihlašovacího hesla.\n\n",
-    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Default encryption module for server-side encryption" : "Výchozí modul pro šifrování na straně serveru",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pro používání tohoto šifrovacího modulu je třeba zapnout šifrování na straně serveru\n\t\t ve správním nastavení. Jakmile je zapnutý, tento modul transparentně zašifruje\n\t\tvšechny vaše soubory. Šifrování je založeno na AES 256 klíčích.\n\t\tModul se nedotkne existujících souborů, zašifrovány budou pouze nové soubory\n\t\tpo zapnutí šifrování na straně serveru už není možné\n\t\tho zase vypnout a vrátit se k nešifrovanému systému.\n\t\tNež se rozhodnete zapnout šifrování na straně serveru\n\t\tpřečtěte si dokumentaci, abyste se seznámili se známými důsledky.",
+    "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 '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" : "Zdravíme,\n\nSprávce zapnul šifrování dat na straně serveru. Vaše soubory byly zašifrovány za použití hesla „%s“.\n\nPřihlaste se do webového rozhraní, přejděte do nastavení „základního šifrovacího modulu“ a aktualizujte šifrovací heslo zadáním hesla výše do kolonky „původní přihlašovací heslo“ a svého aktuálního přihlašovacího hesla.\n\n",
+    "The share will expire on %s." : "Platnost sdílení skončí %s.",
     "Cheers!" : "Ať slouží!",
-    "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 \"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>" : "Ahoj!<br><br>Administrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlašte se do webového rozhraní, přejděte do nastavení \"základního šifrovacího modulu\" a aktualizujte šifrovací heslo zadáním hesla výše do pole \"původní přihlašovací heslo\" a svého aktuálního přihlašovacího hesla.<br><br>",
-    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale šifrovací klíče ještě nejsou inicializované. Prosím odhlaste se a znovu se přihlaste",
+    "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 \"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>" : "Ahoj!<br><br>Administrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlašte se do webového rozhraní, přejděte do nastavení „základního šifrovacího modulu“ a aktualizujte šifrovací heslo zadáním hesla výše do pole „původní přihlašovací heslo“ a svého aktuálního přihlašovacího hesla.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale šifrovací klíče ještě nejsou inicializované. Odhlaste se a znovu se přihlaste",
     "Encrypt the home storage" : "Zašifrovat domovské úložiště",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Povolení tohoto nastavení zašifruje všechny soubory uložené v hlavním úložišti, jinak budou šifrovány pouze soubory na externích úložištích.",
     "Enable recovery key" : "Povolit záchranný klíč",
@@ -53,12 +55,12 @@ OC.L10N.register(
     "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
     "Old log-in password" : "Původní přihlašovací heslo",
-    "Current log-in password" : "Aktuální přihlašovací heslo",
-    "Update Private Key Password" : "Změnit heslo soukromého klíče",
+    "Current log-in password" : "Stávající přihlašovací heslo",
+    "Update Private Key Password" : "Změnit heslo k soukromé části klíče",
     "Enable password recovery:" : "Povolit obnovu hesla:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
     "Enabled" : "Povoleno",
     "Disabled" : "Zakázáno",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora."
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Je třeba přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo se obraťte na svého správce."
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/encryption/l10n/cs.json

@@ -1,26 +1,26 @@
 { "translations": {
-    "Missing recovery key password" : "Chybí heslo klíče pro obnovu",
-    "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
-    "Repeated recovery key password does not match the provided recovery key password" : "Zadaná hesla pro obnovu se neshodují",
+    "Missing recovery key password" : "Chybí heslo ke klíče pro obnovu",
+    "Please repeat the recovery key password" : "Zopakujte zadání hesla ke klíči, sloužícímu pro obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Zopakované zadání hesla ke klíči, sloužícímu pro obnovu, se neshoduje",
     "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
-    "Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
-    "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
-    "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte své heslo k záchrannému klíči!",
+    "Recovery key successfully disabled" : "Záchranný klíč úspěšně zakázán",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nedaří se zakázat záchranný klíč. Zkontrolujte zadání hesla k němu.",
     "Missing parameters" : "Chybějící parametry",
-    "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
-    "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
-    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
+    "Please provide the old recovery password" : "Zadejte původní heslo pro obnovu",
+    "Please provide a new recovery password" : "Zadejte nové heslo pro obnovu",
+    "Please repeat the new recovery password" : "Zopakujte zadání nového hesla pro obnovu",
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
     "Recovery Key disabled" : "Záchranný klíč není povolen",
     "Recovery Key enabled" : "Záchranný klíč povolen",
-    "Could not enable the recovery key, please try again or contact your administrator" : "Nelze povolit záchranný klíč. Zkuste to prosím znovu nebo kontaktujte svého správce.",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nedaří se povolit záchranný klíč. Zkuste to znovu nebo se obraťte na svého správce.",
     "Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.",
-    "The old password was not correct, please try again." : "Původní heslo nebylo zadáno správně, zkuste to prosím znovu.",
-    "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.",
+    "The old password was not correct, please try again." : "Původní heslo nebylo zadáno správně, zkuste to znovu.",
+    "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to znovu.",
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
     "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 v osobním nastavení, abyste znovu získali přístup ke svým 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, 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é. Odhlaste se a znovu přihlaste.",
     "Please enable server side encryption in the admin settings in order to use the encryption module." : "Chcete-li používat šifrovací modul, povolte prosím šifrování na straně serveru v nastavení administrátora.",
     "Encryption app is enabled and ready" : "Aplikace šifrování je již povolena a připravena",
     "Bad Signature" : "Špatný podpis",
@@ -29,11 +29,13 @@
     "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.",
     "Default encryption module" : "Výchozí šifrovací modul",
-    "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 '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" : "Ahoj!\n\nAdministrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla '%s'.\n\nPřihlašte se do webového rozhraní, přejděte do nastavení 'základního šifrovacího modulu' a aktualizujte šifrovací heslo zadáním hesla výše do pole 'původní přihlašovací heslo' a svého aktuálního přihlašovacího hesla.\n\n",
-    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Default encryption module for server-side encryption" : "Výchozí modul pro šifrování na straně serveru",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pro používání tohoto šifrovacího modulu je třeba zapnout šifrování na straně serveru\n\t\t ve správním nastavení. Jakmile je zapnutý, tento modul transparentně zašifruje\n\t\tvšechny vaše soubory. Šifrování je založeno na AES 256 klíčích.\n\t\tModul se nedotkne existujících souborů, zašifrovány budou pouze nové soubory\n\t\tpo zapnutí šifrování na straně serveru už není možné\n\t\tho zase vypnout a vrátit se k nešifrovanému systému.\n\t\tNež se rozhodnete zapnout šifrování na straně serveru\n\t\tpřečtěte si dokumentaci, abyste se seznámili se známými důsledky.",
+    "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 '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" : "Zdravíme,\n\nSprávce zapnul šifrování dat na straně serveru. Vaše soubory byly zašifrovány za použití hesla „%s“.\n\nPřihlaste se do webového rozhraní, přejděte do nastavení „základního šifrovacího modulu“ a aktualizujte šifrovací heslo zadáním hesla výše do kolonky „původní přihlašovací heslo“ a svého aktuálního přihlašovacího hesla.\n\n",
+    "The share will expire on %s." : "Platnost sdílení skončí %s.",
     "Cheers!" : "Ať slouží!",
-    "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 \"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>" : "Ahoj!<br><br>Administrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlašte se do webového rozhraní, přejděte do nastavení \"základního šifrovacího modulu\" a aktualizujte šifrovací heslo zadáním hesla výše do pole \"původní přihlašovací heslo\" a svého aktuálního přihlašovacího hesla.<br><br>",
-    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale šifrovací klíče ještě nejsou inicializované. Prosím odhlaste se a znovu se přihlaste",
+    "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 \"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>" : "Ahoj!<br><br>Administrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlašte se do webového rozhraní, přejděte do nastavení „základního šifrovacího modulu“ a aktualizujte šifrovací heslo zadáním hesla výše do pole „původní přihlašovací heslo“ a svého aktuálního přihlašovacího hesla.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale šifrovací klíče ještě nejsou inicializované. Odhlaste se a znovu se přihlaste",
     "Encrypt the home storage" : "Zašifrovat domovské úložiště",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Povolení tohoto nastavení zašifruje všechny soubory uložené v hlavním úložišti, jinak budou šifrovány pouze soubory na externích úložištích.",
     "Enable recovery key" : "Povolit záchranný klíč",
@@ -51,12 +53,12 @@
     "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
     "Old log-in password" : "Původní přihlašovací heslo",
-    "Current log-in password" : "Aktuální přihlašovací heslo",
-    "Update Private Key Password" : "Změnit heslo soukromého klíče",
+    "Current log-in password" : "Stávající přihlašovací heslo",
+    "Update Private Key Password" : "Změnit heslo k soukromé části klíče",
     "Enable password recovery:" : "Povolit obnovu hesla:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
     "Enabled" : "Povoleno",
     "Disabled" : "Zakázáno",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora."
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Je třeba přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo se obraťte na svého správce."
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/encryption/l10n/de.js

@@ -36,7 +36,7 @@ OC.L10N.register(
     "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 '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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und  das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort'-Feld eingegeben wird.\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
     "Cheers!" : "Noch einen schönen Tag!",
-    "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 \"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>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
+    "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 \"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>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde Dich im Web-Interface an, gehe in Deine persönlichen Einstellungen. Dort findest Du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort Dein Verschlüsselungspasswort indem Du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
     "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde Dich ab und wieder an",
     "Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",

apps/encryption/l10n/de.json

@@ -34,7 +34,7 @@
     "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 '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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und  das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort'-Feld eingegeben wird.\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
     "Cheers!" : "Noch einen schönen Tag!",
-    "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 \"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>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
+    "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 \"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>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde Dich im Web-Interface an, gehe in Deine persönlichen Einstellungen. Dort findest Du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort Dein Verschlüsselungspasswort indem Du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
     "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde Dich ab und wieder an",
     "Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",

apps/encryption/l10n/fi.js

@@ -31,6 +31,7 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
     "Default encryption module" : "Oletus salausmoduuli",
+    "Default encryption module for server-side encryption" : "Oletusarvoinen salausmoduuli palvelimella tehtävään salaukseen",
     "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 '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" : "Hei,\n\nYlläpiäjä on ottanut käyttöön palvelimen salauksen. Tiedostosi salattiin salasanalla '%s'.\n\nOle hyvä ja kirjaudu palveluun verkkokäyttöliittymän kautta, siirry henkilökohtaisten asetustesi kohtaan \"perussalausmoduuli\" ja päivitä salaukseen käytettävä salasanasi syöttämällä yllä mainittu salasana \"vanha kirjautumissalasana\"-kenttään ja nykyinen kirjautumissalasanasi.\n\n",
     "The share will expire on %s." : "Jakaminen päättyy %s.",
     "Cheers!" : "Kiitos!",

apps/encryption/l10n/fi.json

@@ -29,6 +29,7 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
     "Default encryption module" : "Oletus salausmoduuli",
+    "Default encryption module for server-side encryption" : "Oletusarvoinen salausmoduuli palvelimella tehtävään salaukseen",
     "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 '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" : "Hei,\n\nYlläpiäjä on ottanut käyttöön palvelimen salauksen. Tiedostosi salattiin salasanalla '%s'.\n\nOle hyvä ja kirjaudu palveluun verkkokäyttöliittymän kautta, siirry henkilökohtaisten asetustesi kohtaan \"perussalausmoduuli\" ja päivitä salaukseen käytettävä salasanasi syöttämällä yllä mainittu salasana \"vanha kirjautumissalasana\"-kenttään ja nykyinen kirjautumissalasanasi.\n\n",
     "The share will expire on %s." : "Jakaminen päättyy %s.",
     "Cheers!" : "Kiitos!",

apps/encryption/l10n/is.js

@@ -31,6 +31,7 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki afkóðað þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki lesið þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Default encryption module" : "Sjálfgefin dulritunareining",
+    "Default encryption module for server-side encryption" : "Sjálfgefin dulritunareining fyrir dulritun á vefþjóni",
     "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 '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" : "Hæ,\n\nkerfisstjórinn virkjaði dulritun á vefþjóni. Skrárnar þínar voru dulritaðar með lykilorðinu '%s'.\n\nSkráðu þig inn í vefviðmótinu, farðu í hlutann 'Grunn-dulritunareining' (basic encryption module) í persónulegu stillingunum þínum og uppfærðu dulritunarlykilorðið þitt með því að setja þetta lykilorð inn í reitinn 'Gamla innskráningarlykilorðið' ásamt núverandi innskráningarlykilorði.\n\n",
     "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
     "Cheers!" : "Til hamingju!",

apps/encryption/l10n/is.json

@@ -29,6 +29,7 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki afkóðað þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki lesið þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Default encryption module" : "Sjálfgefin dulritunareining",
+    "Default encryption module for server-side encryption" : "Sjálfgefin dulritunareining fyrir dulritun á vefþjóni",
     "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 '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" : "Hæ,\n\nkerfisstjórinn virkjaði dulritun á vefþjóni. Skrárnar þínar voru dulritaðar með lykilorðinu '%s'.\n\nSkráðu þig inn í vefviðmótinu, farðu í hlutann 'Grunn-dulritunareining' (basic encryption module) í persónulegu stillingunum þínum og uppfærðu dulritunarlykilorðið þitt með því að setja þetta lykilorð inn í reitinn 'Gamla innskráningarlykilorðið' ásamt núverandi innskráningarlykilorði.\n\n",
     "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
     "Cheers!" : "Til hamingju!",

apps/encryption/l10n/lt_LT.js

@@ -31,6 +31,8 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta iššifruoti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta perskaityti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Default encryption module" : "Numatytasis šifravimo modulis",
+    "Default encryption module for server-side encryption" : "Numatytas šifravimo modulis serverio šifravimui.",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Kad galėtumėte naudoti šį šifravimo modulį,  turite įjungti serverio \n\t\tšifravimą administratoriaus nustatymuose. Įjungus šį modulį visi Jūsų failai bus užšifruoti\n\t\tŠifravimas pagrįstas AES 256 raktais.\n\t\tModulis užšifruos tik naujus failus, palikdamas senuosius taip kaip buvo iki šifravimo įjungimo.\n\t\tNeįmanoma išjungti šifravimą ir vėl sugrįžti prie nešifruojamos sistemos.\n\t\tPrieš nuspręsdami, atidžiai perskaitykite dokumentaciją, kad gerai suprastumėte visas šifravimo pasekmes.",
     "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 '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" : "Sveiki,\n\nAdministratorius įjungė šifravimą sistemoje. Jūsų failai buvo užšifruoti naudojantis šiuo slaptažodžiu: \"%s\".\n\nPrisijunkite prie sistemos, atidarykite nustatymus, pasirinkite skiltį \"Šifravimo įskiepis\" ir atnaujinkite savo šifravimui skirtą slaptažodį pasinaudodami šiuo ir savo prisijungimo slaptažodžiu.\n\n",
     "The share will expire on %s." : "Bendrinimo laikas pasibaigs %s.",
     "Cheers!" : "Sveikinimai!",

apps/encryption/l10n/lt_LT.json

@@ -29,6 +29,8 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta iššifruoti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta perskaityti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Default encryption module" : "Numatytasis šifravimo modulis",
+    "Default encryption module for server-side encryption" : "Numatytas šifravimo modulis serverio šifravimui.",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Kad galėtumėte naudoti šį šifravimo modulį,  turite įjungti serverio \n\t\tšifravimą administratoriaus nustatymuose. Įjungus šį modulį visi Jūsų failai bus užšifruoti\n\t\tŠifravimas pagrįstas AES 256 raktais.\n\t\tModulis užšifruos tik naujus failus, palikdamas senuosius taip kaip buvo iki šifravimo įjungimo.\n\t\tNeįmanoma išjungti šifravimą ir vėl sugrįžti prie nešifruojamos sistemos.\n\t\tPrieš nuspręsdami, atidžiai perskaitykite dokumentaciją, kad gerai suprastumėte visas šifravimo pasekmes.",
     "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 '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" : "Sveiki,\n\nAdministratorius įjungė šifravimą sistemoje. Jūsų failai buvo užšifruoti naudojantis šiuo slaptažodžiu: \"%s\".\n\nPrisijunkite prie sistemos, atidarykite nustatymus, pasirinkite skiltį \"Šifravimo įskiepis\" ir atnaujinkite savo šifravimui skirtą slaptažodį pasinaudodami šiuo ir savo prisijungimo slaptažodžiu.\n\n",
     "The share will expire on %s." : "Bendrinimo laikas pasibaigs %s.",
     "Cheers!" : "Sveikinimai!",

apps/encryption/l10n/nl.js

@@ -31,6 +31,8 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met je te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met je te delen.",
     "Default encryption module" : "Standaard cryptomodule",
+    "Default encryption module for server-side encryption" : "Standaard cryptomodule voor server-side versleuteling",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Om deze cryptomodule te gebruiker moeten de volgende server-side aanpassingen worden gedaan\n\t\tversleuteling in de beheerinstellingen. Na inschakeling versleutelt deze module \n\t\tal je bestanden transparent. De versleuteling is gebaseerd op AES 256 sleutels.\n\t\tDe module raakt geen bestaande bestanden, alleen nieuwe bestanden worden versleuteld.\n\t\tNadat server-side crypto is ingeschakeld. Het is ook niet meer mogelijk\n\t\tom de versleuteling uit te zetten en terug te gaan naar een onversleuteld systeem.\n\t\tLees de documentatie om de gevolgen te kennen voordat je besluit\n\t\tserver-side versleuteling in te schakelen.",
     "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 '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" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Je bestanden werden versleuteld met het wachtwoord '%s'.\n\nLogin op de webinterface, ga naar 'basis cryptomodule' in je persoonlijke instellingen en pas je cryptowachtwoord aan door dit wachtwoord in het 'oude inlog wachtwoord' veld in te vullen alsmede in je huidige inlogwachtwoord.\n",
     "The share will expire on %s." : "De share vervalt op %s.",
     "Cheers!" : "Proficiat!",

apps/encryption/l10n/nl.json

@@ -29,6 +29,8 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met je te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met je te delen.",
     "Default encryption module" : "Standaard cryptomodule",
+    "Default encryption module for server-side encryption" : "Standaard cryptomodule voor server-side versleuteling",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Om deze cryptomodule te gebruiker moeten de volgende server-side aanpassingen worden gedaan\n\t\tversleuteling in de beheerinstellingen. Na inschakeling versleutelt deze module \n\t\tal je bestanden transparent. De versleuteling is gebaseerd op AES 256 sleutels.\n\t\tDe module raakt geen bestaande bestanden, alleen nieuwe bestanden worden versleuteld.\n\t\tNadat server-side crypto is ingeschakeld. Het is ook niet meer mogelijk\n\t\tom de versleuteling uit te zetten en terug te gaan naar een onversleuteld systeem.\n\t\tLees de documentatie om de gevolgen te kennen voordat je besluit\n\t\tserver-side versleuteling in te schakelen.",
     "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 '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" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Je bestanden werden versleuteld met het wachtwoord '%s'.\n\nLogin op de webinterface, ga naar 'basis cryptomodule' in je persoonlijke instellingen en pas je cryptowachtwoord aan door dit wachtwoord in het 'oude inlog wachtwoord' veld in te vullen alsmede in je huidige inlogwachtwoord.\n",
     "The share will expire on %s." : "De share vervalt op %s.",
     "Cheers!" : "Proficiat!",

apps/encryption/l10n/pl.js

@@ -31,6 +31,8 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odczytać tego pliku, prawdopodobnie plik nie jest współdzielony. Proszę zwrócić się do właściciela pliku, aby udostępnił go dla Ciebie.",
     "Default encryption module" : "Domyślny moduł szyfrujący",
+    "Default encryption module for server-side encryption" : "Domyślny moduł szyfrujący po stronie serwera",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Aby korzystać z modułu szyfrowania, musisz włączyć opcję po stronie serwera\n\t\tszyfrowanie w ustawieniach administratora. Po włączeniu opcji moduł będzie szyfrował\n\t\twszystkie Twoje pliki w sposób transparentny. Szyfrowanie oparte jest na kluczach AES 256.\n\t\tModuł nie będzie ingerował w istniejące pliki, tylko nowe pliki będą szyfrowane\n\t\tpo włączeniu szyfrowania po stronie serwera. Nie jest to również możliwe\n\t\tponownie wyłączenie szyfrowania i przełączenie z powrotem do niezaszyfrowanego systemu.\n\t\tPrzeczytaj dokumentację, aby zapoznać się ze wszystkimi konsekwencjami, zanim podejmiesz decyzję\n\t\to włączeniu szyfrowania po stronie serwera.",
     "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 '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" : "Hej tam,\n\nadmin włączył szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane przy użyciu hasła '%s'.\n\nProszę zalogować się do interfejsu internetowego, przejdź do sekcji Nextcloud podstawowy moduł szyfrowania, następnie osobiste ustawienia i zaktualizuj hasło szyfrowania wpisując aktualny login, w polu stare hasło logowania wpisz stare hasło, a następnie aktualne hasło.\n\n",
     "The share will expire on %s." : "Ten zasób wygaśnie %s",
     "Cheers!" : "Dzięki!",

apps/encryption/l10n/pl.json

@@ -29,6 +29,8 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odczytać tego pliku, prawdopodobnie plik nie jest współdzielony. Proszę zwrócić się do właściciela pliku, aby udostępnił go dla Ciebie.",
     "Default encryption module" : "Domyślny moduł szyfrujący",
+    "Default encryption module for server-side encryption" : "Domyślny moduł szyfrujący po stronie serwera",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Aby korzystać z modułu szyfrowania, musisz włączyć opcję po stronie serwera\n\t\tszyfrowanie w ustawieniach administratora. Po włączeniu opcji moduł będzie szyfrował\n\t\twszystkie Twoje pliki w sposób transparentny. Szyfrowanie oparte jest na kluczach AES 256.\n\t\tModuł nie będzie ingerował w istniejące pliki, tylko nowe pliki będą szyfrowane\n\t\tpo włączeniu szyfrowania po stronie serwera. Nie jest to również możliwe\n\t\tponownie wyłączenie szyfrowania i przełączenie z powrotem do niezaszyfrowanego systemu.\n\t\tPrzeczytaj dokumentację, aby zapoznać się ze wszystkimi konsekwencjami, zanim podejmiesz decyzję\n\t\to włączeniu szyfrowania po stronie serwera.",
     "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 '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" : "Hej tam,\n\nadmin włączył szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane przy użyciu hasła '%s'.\n\nProszę zalogować się do interfejsu internetowego, przejdź do sekcji Nextcloud podstawowy moduł szyfrowania, następnie osobiste ustawienia i zaktualizuj hasło szyfrowania wpisując aktualny login, w polu stare hasło logowania wpisz stare hasło, a następnie aktualne hasło.\n\n",
     "The share will expire on %s." : "Ten zasób wygaśnie %s",
     "Cheers!" : "Dzięki!",

apps/encryption/l10n/pt_BR.js

@@ -18,8 +18,8 @@ OC.L10N.register(
     "Recovery Key enabled" : "Chave de recuperação ativada",
     "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível ativar a chave de recuperação. Tente novamente ou entre em contato com o administrador",
     "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
-    "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor tente novamente.",
-    "The current log-in password was not correct, please try again." : "A senha atual de acesso não estava correta, por favor tente novamente.",
+    "The old password was not correct, please try again." : "A senha antiga não estava correta, tente novamente.",
+    "The current log-in password was not correct, please try again." : "A senha atual de acesso não estava correta, tente novamente.",
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida para o aplicativo de criptografia. Atualize a senha da sua chave privada nas configurações pessoais para recuperar o acesso aos seus arquivos criptografados.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "O aplicativo de criptografia está habilitado mas suas chaves não foram inicializadas. Por favor, saia e entre novamente.",

apps/encryption/l10n/pt_BR.json

@@ -16,8 +16,8 @@
     "Recovery Key enabled" : "Chave de recuperação ativada",
     "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível ativar a chave de recuperação. Tente novamente ou entre em contato com o administrador",
     "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
-    "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor tente novamente.",
-    "The current log-in password was not correct, please try again." : "A senha atual de acesso não estava correta, por favor tente novamente.",
+    "The old password was not correct, please try again." : "A senha antiga não estava correta, tente novamente.",
+    "The current log-in password was not correct, please try again." : "A senha atual de acesso não estava correta, tente novamente.",
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida para o aplicativo de criptografia. Atualize a senha da sua chave privada nas configurações pessoais para recuperar o acesso aos seus arquivos criptografados.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "O aplicativo de criptografia está habilitado mas suas chaves não foram inicializadas. Por favor, saia e entre novamente.",

apps/encryption/l10n/ru.js

@@ -25,13 +25,15 @@ OC.L10N.register(
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Приложение шифрования активно, но ваши ключи не инициализированы. Выйдите из системы и войдите заново.",
     "Please enable server side encryption in the admin settings in order to use the encryption module." : "Для использования модуля шифрования включите шифрование на стороне сервера в меню «Настройки» -> «Администрирование» -> «Шифрование».",
     "Encryption app is enabled and ready" : "Приложение шифрования включено и готово к работе",
-    "Bad Signature" : "Некорректная подпись",
+    "Bad Signature" : "Неверная подпись",
     "Missing Signature" : "Подпись отсутствует",
     "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." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
-    "Default encryption module" : "Модуль шифрования по-умолчанию",
-    "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 '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" : "Привет,\n\nадминистратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с использованием пароля «%s».\n\nПожалуйста войдите в веб-приложение, в разделе «простой модуль шифрования» в личных настройках вам нужно обновить пароль шифрования, указав этот пароль в поле \"старый пароль\".\n",
+    "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." : "Не удаётся прочитать файл, возможно это общий файл. Попросите владельца этого файла повторно предоставить вам общий доступ.",
+    "Default encryption module" : "Модуль шифрования по умолчанию",
+    "Default encryption module for server-side encryption" : "Используемый по умолчанию модуль для шифрования данных на сервере",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Перед началом использования использования необходимо включить этот модуль в разделе «Администрирование». Включённый модуль выполняет прозрачное шифрование файлов. Шифрование основано на алгоритме AES 256. Модуль не изменяет существующие файлы, шифруются только файлы, создаваемые после включения шифрования. Также невозможно отключить шифрование и вернуться к незашифрованной системе. Перед включением шифрования обязательно ознакомьтесь с документацией, чтобы узнать все последствия такого действия.",
+    "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 '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" : "Здравствуйте!\n\nАдминистратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с использованием пароля «%s».\n\nЧтобы изменить пароль, пользуемый для шифрования, войдите в систему используя веб-интерфейс, перейдите в раздел «Простой модуль шифрования», расположенный в личных настройках и введите пароль, указанный выше, в поле «Старый пароль учётной записи», а также свой действующий пароль.\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 \"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>Пожалуйста войдите в веб-приложение, в разделе «простой модуль шифрования» в личных настройках вам нужно обновить пароль шифрования, указав этот пароль в поле \"старый пароль\".<br><br>",

apps/encryption/l10n/ru.json

@@ -23,13 +23,15 @@
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Приложение шифрования активно, но ваши ключи не инициализированы. Выйдите из системы и войдите заново.",
     "Please enable server side encryption in the admin settings in order to use the encryption module." : "Для использования модуля шифрования включите шифрование на стороне сервера в меню «Настройки» -> «Администрирование» -> «Шифрование».",
     "Encryption app is enabled and ready" : "Приложение шифрования включено и готово к работе",
-    "Bad Signature" : "Некорректная подпись",
+    "Bad Signature" : "Неверная подпись",
     "Missing Signature" : "Подпись отсутствует",
     "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." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
-    "Default encryption module" : "Модуль шифрования по-умолчанию",
-    "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 '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" : "Привет,\n\nадминистратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с использованием пароля «%s».\n\nПожалуйста войдите в веб-приложение, в разделе «простой модуль шифрования» в личных настройках вам нужно обновить пароль шифрования, указав этот пароль в поле \"старый пароль\".\n",
+    "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." : "Не удаётся прочитать файл, возможно это общий файл. Попросите владельца этого файла повторно предоставить вам общий доступ.",
+    "Default encryption module" : "Модуль шифрования по умолчанию",
+    "Default encryption module for server-side encryption" : "Используемый по умолчанию модуль для шифрования данных на сервере",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Перед началом использования использования необходимо включить этот модуль в разделе «Администрирование». Включённый модуль выполняет прозрачное шифрование файлов. Шифрование основано на алгоритме AES 256. Модуль не изменяет существующие файлы, шифруются только файлы, создаваемые после включения шифрования. Также невозможно отключить шифрование и вернуться к незашифрованной системе. Перед включением шифрования обязательно ознакомьтесь с документацией, чтобы узнать все последствия такого действия.",
+    "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 '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" : "Здравствуйте!\n\nАдминистратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с использованием пароля «%s».\n\nЧтобы изменить пароль, пользуемый для шифрования, войдите в систему используя веб-интерфейс, перейдите в раздел «Простой модуль шифрования», расположенный в личных настройках и введите пароль, указанный выше, в поле «Старый пароль учётной записи», а также свой действующий пароль.\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 \"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>Пожалуйста войдите в веб-приложение, в разделе «простой модуль шифрования» в личных настройках вам нужно обновить пароль шифрования, указав этот пароль в поле \"старый пароль\".<br><br>",

apps/encryption/l10n/sr.js

@@ -31,6 +31,8 @@ OC.L10N.register(
     "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." : "Не могу да читам фајл. Вероватно је дељен. Питајте власника да га поново подели.",
     "Default encryption module" : "Подразумевани модул за шифровање",
+    "Default encryption module for server-side encryption" : "Подразумевани модул шифровања за шифровање на серверу",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Да бисте користили овај модул за шифровање, морате на страни сервера омогућити\n\t\tшифровање у администраторским поставкама. Једном када се укључи, овај модул ће шифровати\n\t\tсве Ваше фајлове транспарентно. Шифровање је базирано на AES 256 кључевима.\n\t\tМодул неће дирати постојеће фајлове, само ће нови фајлови бити шифровани\n\t\tпошто се укључи шифровање на серверској страни. Такође није могуће да\n\t\tсе искључи шифровање и да се пређе на нешифровани систем..\n\t\tПрочитајте документацију да сазнате све импликације пре него што \t\tсе одлучите да укључите шифровање на серверу.",
     "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 '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" : "Поштовање,\n\nадминистратор је укључио шифровање на серверској страни. Ваши фајлови су шифровани лозинком „%s“.\n\nПријавите се на веб сучеље, идите на одељак 'основни модул за шифровање' у личним поставкама и ажурирајте своју лозинку за шифровање уношењем ове лозинке у поље „стара лозинка за пријаву“ и своју тренутну лозинку за пријављивање.\n",
     "The share will expire on %s." : "Дељење истиче %s.",
     "Cheers!" : "Здраво!",

apps/encryption/l10n/sr.json

@@ -29,6 +29,8 @@
     "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." : "Не могу да читам фајл. Вероватно је дељен. Питајте власника да га поново подели.",
     "Default encryption module" : "Подразумевани модул за шифровање",
+    "Default encryption module for server-side encryption" : "Подразумевани модул шифровања за шифровање на серверу",
+    "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Да бисте користили овај модул за шифровање, морате на страни сервера омогућити\n\t\tшифровање у администраторским поставкама. Једном када се укључи, овај модул ће шифровати\n\t\tсве Ваше фајлове транспарентно. Шифровање је базирано на AES 256 кључевима.\n\t\tМодул неће дирати постојеће фајлове, само ће нови фајлови бити шифровани\n\t\tпошто се укључи шифровање на серверској страни. Такође није могуће да\n\t\tсе искључи шифровање и да се пређе на нешифровани систем..\n\t\tПрочитајте документацију да сазнате све импликације пре него што \t\tсе одлучите да укључите шифровање на серверу.",
     "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 '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" : "Поштовање,\n\nадминистратор је укључио шифровање на серверској страни. Ваши фајлови су шифровани лозинком „%s“.\n\nПријавите се на веб сучеље, идите на одељак 'основни модул за шифровање' у личним поставкама и ажурирајте своју лозинку за шифровање уношењем ове лозинке у поље „стара лозинка за пријаву“ и своју тренутну лозинку за пријављивање.\n",
     "The share will expire on %s." : "Дељење истиче %s.",
     "Cheers!" : "Здраво!",

apps/federatedfilesharing/l10n/bg.js

@@ -20,13 +20,14 @@ OC.L10N.register(
     "Not allowed to create a federated share with the same user" : "Не е позволено създаване на федерално споделяне със същият потребител",
     "File is already shared with %s" : "Файлът е вече споделен с %s",
     "Accept" : "Приемам",
+    "Sharing" : "Споделяне",
     "Open documentation" : "Отвори документацията",
     "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки  с други сървъри",
     "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри",
     "HTML Code:" : "HTML код:",
     "The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
     "Not allowed to create a federated share with the owner." : "Не е позволено създаване на федерално споделяне със собственика.",
-    "Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+    "Invalid or untrusted SSL certificate" : "Невалиден или недоверен SSL сертификат",
     "Could not authenticate to remote share, password might be wrong" : "Неуспешно удостоверяване на отдалеченото споделяне, възможно е паролата да е грешна",
     "Storage not valid" : "Невалидно хранилище",
     "Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория."

apps/federatedfilesharing/l10n/bg.json

@@ -18,13 +18,14 @@
     "Not allowed to create a federated share with the same user" : "Не е позволено създаване на федерално споделяне със същият потребител",
     "File is already shared with %s" : "Файлът е вече споделен с %s",
     "Accept" : "Приемам",
+    "Sharing" : "Споделяне",
     "Open documentation" : "Отвори документацията",
     "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки  с други сървъри",
     "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри",
     "HTML Code:" : "HTML код:",
     "The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
     "Not allowed to create a federated share with the owner." : "Не е позволено създаване на федерално споделяне със собственика.",
-    "Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+    "Invalid or untrusted SSL certificate" : "Невалиден или недоверен SSL сертификат",
     "Could not authenticate to remote share, password might be wrong" : "Неуспешно удостоверяване на отдалеченото споделяне, възможно е паролата да е грешна",
     "Storage not valid" : "Невалидно хранилище",
     "Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория."

apps/federatedfilesharing/l10n/cs.js

@@ -1,16 +1,16 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Federated sharing" : "Propojené sdílení",
+    "Federated sharing" : "Federované sdílení",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete přidat vzdálené sdílení {name} od {owner}@{remote}?",
     "Remote share" : "Vzdálené sdílení",
-    "Remote share password" : "Heslo vzdáleného sdílení",
+    "Remote share password" : "Heslo ke vzdálenému sdílení",
     "Cancel" : "Storno",
     "Add remote share" : "Přidat propojené sdílení",
     "Copy" : "Kopie",
     "Copied!" : "Zkopírováno!",
     "Not supported!" : "Nepodporováno!",
-    "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.",
+    "Press ⌘-C to copy." : "Zkopírujete stisknutím ⌘-C.",
     "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.",
     "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID",
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
@@ -19,11 +19,11 @@ OC.L10N.register(
     "Federated Share request sent, you will receive an invitation. Check your notifications." : "Požadavek na spojené sdílení byl odeslán, obdržíte pozvánku. Zkontrolujte vaše upozornění.",
     "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Nepodařilo se ustavit federované sdílení, vypadá to, že server, se kterým má být federováno je příliš starý (Nextcloud <= 9).",
     "It is not allowed to send federated group shares from this server." : "Z tohoto serveru není povoleno posílat federovaná skupinová sdílení.",
-    "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
+    "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s se nezdařilo, protože položka už je s uživatelem %s sdílena",
     "Not allowed to create a federated share with the same user" : "Není povoleno vytvořit propojené sdílení s tím samým uživatelem",
-    "File is already shared with %s" : "Soubor je již sdílen s %s",
+    "File is already shared with %s" : "Soubor je už sdílen s %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Sdílení %s selhalo, %s se nepodařilo nalézt, server pravděpodobně právě není dostupný nebo používá self-signed certifikát.",
-    "Could not find share" : "Nelze nalézt sdílení",
+    "Could not find share" : "Nedaří se nalézt sdílení",
     "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Obdržel(a) jste %3$s jako vzdálené sdílení od %1$s (jménem %2$s)",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Obdržel(a) jste {share} jako vzdálené sdílení od {user} (jménem {behalf})",
     "You received \"%3$s\" as a remote share from %1$s" : "Obdržel(a) jste %3$s jako vzdálené sdílení od %1$s",
@@ -31,9 +31,10 @@ OC.L10N.register(
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #Nextcloud sdruženého cloud ID, více na %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #Nextcloud sdruženého cloud ID",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Sdílejte se mnou pomocí mého #Nextcloud sdruženého cloud ID",
     "Sharing" : "Sdílení",
     "Federated file sharing" : "Federované sdílení souborů",
+    "Provide federated file sharing across servers" : "Poskytnout federované sdílení souborů napříč servery",
     "Federated Cloud Sharing" : "Propojené cloudové sdílení",
     "Open documentation" : "Otevřít dokumentaci",
     "Adjust how people can share between servers." : "Upravte, jak mohou lidé mezi servery sdílet.",
@@ -53,7 +54,7 @@ OC.L10N.register(
     "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje neplatné znaky.",
     "Not allowed to create a federated share with the owner." : "ONení povoleno s autorem vytvořit propojené sdílení.",
     "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
-    "Could not authenticate to remote share, password might be wrong" : "Autentizace ke vzdálenému sdílení selhala, heslo může být nesprávné",
+    "Could not authenticate to remote share, password might be wrong" : "Autentizace ke vzdálenému sdílení se nezdařila, heslo může být nesprávné",
     "Storage not valid" : "Úložiště není platné",
     "Federated share added" : "Propojené sdílení bylo přidáno",
     "Couldn't add remote share" : "Nepodařilo se přidat propojené sdílení",

apps/federatedfilesharing/l10n/cs.json

@@ -1,14 +1,14 @@
 { "translations": {
-    "Federated sharing" : "Propojené sdílení",
+    "Federated sharing" : "Federované sdílení",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete přidat vzdálené sdílení {name} od {owner}@{remote}?",
     "Remote share" : "Vzdálené sdílení",
-    "Remote share password" : "Heslo vzdáleného sdílení",
+    "Remote share password" : "Heslo ke vzdálenému sdílení",
     "Cancel" : "Storno",
     "Add remote share" : "Přidat propojené sdílení",
     "Copy" : "Kopie",
     "Copied!" : "Zkopírováno!",
     "Not supported!" : "Nepodporováno!",
-    "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.",
+    "Press ⌘-C to copy." : "Zkopírujete stisknutím ⌘-C.",
     "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.",
     "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID",
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
@@ -17,11 +17,11 @@
     "Federated Share request sent, you will receive an invitation. Check your notifications." : "Požadavek na spojené sdílení byl odeslán, obdržíte pozvánku. Zkontrolujte vaše upozornění.",
     "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Nepodařilo se ustavit federované sdílení, vypadá to, že server, se kterým má být federováno je příliš starý (Nextcloud <= 9).",
     "It is not allowed to send federated group shares from this server." : "Z tohoto serveru není povoleno posílat federovaná skupinová sdílení.",
-    "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
+    "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s se nezdařilo, protože položka už je s uživatelem %s sdílena",
     "Not allowed to create a federated share with the same user" : "Není povoleno vytvořit propojené sdílení s tím samým uživatelem",
-    "File is already shared with %s" : "Soubor je již sdílen s %s",
+    "File is already shared with %s" : "Soubor je už sdílen s %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Sdílení %s selhalo, %s se nepodařilo nalézt, server pravděpodobně právě není dostupný nebo používá self-signed certifikát.",
-    "Could not find share" : "Nelze nalézt sdílení",
+    "Could not find share" : "Nedaří se nalézt sdílení",
     "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Obdržel(a) jste %3$s jako vzdálené sdílení od %1$s (jménem %2$s)",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Obdržel(a) jste {share} jako vzdálené sdílení od {user} (jménem {behalf})",
     "You received \"%3$s\" as a remote share from %1$s" : "Obdržel(a) jste %3$s jako vzdálené sdílení od %1$s",
@@ -29,9 +29,10 @@
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #Nextcloud sdruženého cloud ID, více na %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #Nextcloud sdruženého cloud ID",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Sdílejte se mnou pomocí mého #Nextcloud sdruženého cloud ID",
     "Sharing" : "Sdílení",
     "Federated file sharing" : "Federované sdílení souborů",
+    "Provide federated file sharing across servers" : "Poskytnout federované sdílení souborů napříč servery",
     "Federated Cloud Sharing" : "Propojené cloudové sdílení",
     "Open documentation" : "Otevřít dokumentaci",
     "Adjust how people can share between servers." : "Upravte, jak mohou lidé mezi servery sdílet.",
@@ -51,7 +52,7 @@
     "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje neplatné znaky.",
     "Not allowed to create a federated share with the owner." : "ONení povoleno s autorem vytvořit propojené sdílení.",
     "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
-    "Could not authenticate to remote share, password might be wrong" : "Autentizace ke vzdálenému sdílení selhala, heslo může být nesprávné",
+    "Could not authenticate to remote share, password might be wrong" : "Autentizace ke vzdálenému sdílení se nezdařila, heslo může být nesprávné",
     "Storage not valid" : "Úložiště není platné",
     "Federated share added" : "Propojené sdílení bylo přidáno",
     "Couldn't add remote share" : "Nepodařilo se přidat propojené sdílení",

apps/federatedfilesharing/l10n/de.js

@@ -2,11 +2,11 @@ OC.L10N.register(
     "federatedfilesharing",
     {
     "Federated sharing" : "Federated-Sharing",
-    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die entfernte Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
-    "Remote share" : "Entfernte Freigabe",
-    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die externe Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
+    "Remote share" : "Externe Freigabe",
+    "Remote share password" : "Passwort für die externe Freigabe",
     "Cancel" : "Abbrechen",
-    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Add remote share" : "Externe Freigabe hinzufügen",
     "Copy" : "Kopieren",
     "Copied!" : "Kopiert!",
     "Not supported!" : "Nicht unterstützt!",
@@ -24,10 +24,10 @@ OC.L10N.register(
     "File is already shared with %s" : "Datei wird bereits mit %s geteilt",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"%3$s\" als eine entfernte Freigabe von \"%1$s\" empfangen (im Auftrag von %2$s)",
-    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du hast {share} als eine entfernte Freigabe von {user} empfangen (im Auftrag von {behalf})",
-    "You received \"%3$s\" as a remote share from %1$s" : "Du hast \"%3$s\" als eine entfernte Freigabe von \"%1$s\" empfangen",
-    "You received {share} as a remote share from {user}" : "Du hast {share} als eine entfernte Freigabe von {user} empfangen",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"%3$s\" als eine externe Freigabe von \"%1$s\" empfangen (im Auftrag von %2$s)",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du hast {share} als eine externe Freigabe von {user} empfangen (im Auftrag von {behalf})",
+    "You received \"%3$s\" as a remote share from %1$s" : "Du hast \"%3$s\" als eine externe Freigabe von \"%1$s\" empfangen",
+    "You received {share} as a remote share from {user}" : "Du hast {share} als eine externe Freigabe von {user} empfangen",
     "Accept" : "Ok",
     "Decline" : "Abgelehnt",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Über meine #Nextcloud Federated-Cloud-ID teilen, siehe %s",
@@ -54,10 +54,10 @@ OC.L10N.register(
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
-    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der externen Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated share added" : "Federated-Share hinzugefügt ",
-    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Externe Freigabe konnte nicht hinzugefügt werden",
     "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen"
 },
 "nplurals=2; plural=(n != 1);");

apps/federatedfilesharing/l10n/de.json

@@ -1,10 +1,10 @@
 { "translations": {
     "Federated sharing" : "Federated-Sharing",
-    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die entfernte Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
-    "Remote share" : "Entfernte Freigabe",
-    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die externe Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
+    "Remote share" : "Externe Freigabe",
+    "Remote share password" : "Passwort für die externe Freigabe",
     "Cancel" : "Abbrechen",
-    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Add remote share" : "Externe Freigabe hinzufügen",
     "Copy" : "Kopieren",
     "Copied!" : "Kopiert!",
     "Not supported!" : "Nicht unterstützt!",
@@ -22,10 +22,10 @@
     "File is already shared with %s" : "Datei wird bereits mit %s geteilt",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"%3$s\" als eine entfernte Freigabe von \"%1$s\" empfangen (im Auftrag von %2$s)",
-    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du hast {share} als eine entfernte Freigabe von {user} empfangen (im Auftrag von {behalf})",
-    "You received \"%3$s\" as a remote share from %1$s" : "Du hast \"%3$s\" als eine entfernte Freigabe von \"%1$s\" empfangen",
-    "You received {share} as a remote share from {user}" : "Du hast {share} als eine entfernte Freigabe von {user} empfangen",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"%3$s\" als eine externe Freigabe von \"%1$s\" empfangen (im Auftrag von %2$s)",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du hast {share} als eine externe Freigabe von {user} empfangen (im Auftrag von {behalf})",
+    "You received \"%3$s\" as a remote share from %1$s" : "Du hast \"%3$s\" als eine externe Freigabe von \"%1$s\" empfangen",
+    "You received {share} as a remote share from {user}" : "Du hast {share} als eine externe Freigabe von {user} empfangen",
     "Accept" : "Ok",
     "Decline" : "Abgelehnt",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Über meine #Nextcloud Federated-Cloud-ID teilen, siehe %s",
@@ -52,10 +52,10 @@
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
-    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der externen Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated share added" : "Federated-Share hinzugefügt ",
-    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Externe Freigabe konnte nicht hinzugefügt werden",
     "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/federatedfilesharing/l10n/de_DE.js

@@ -2,11 +2,11 @@ OC.L10N.register(
     "federatedfilesharing",
     {
     "Federated sharing" : "Federated-Sharing",
-    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
-    "Remote share" : "Entfernte Freigabe",
-    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die externe Freigabe {name} von {owner}@{remote} hinzufügen?",
+    "Remote share" : "Externe Freigabe",
+    "Remote share password" : "Passwort für die externe Freigabe",
     "Cancel" : "Abbrechen",
-    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Add remote share" : "Externe Freigabe hinzufügen",
     "Copy" : "Kopieren",
     "Copied!" : "Kopiert!",
     "Not supported!" : "Nicht unterstützt!",
@@ -24,10 +24,10 @@ OC.L10N.register(
     "File is already shared with %s" : "Datei wird bereits geteilt mit %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Sie empfingen \"%3$s\" als eine entfernte Freigabe von \"%1$s\" (im Auftrag von %2$s)",
-    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Sie empfingen {share} als eine entfernte Freigabe von {user} (im Auftrag von {behalf})",
-    "You received \"%3$s\" as a remote share from %1$s" : "Sie empfingen \"%3$s\" als eine entfernte Freigabe von \"%1$s\"",
-    "You received {share} as a remote share from {user}" : "Sie empfingen {share} als eine entfernte Freigabe von {user} ",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Sie empfingen \"%3$s\" als eine externe Freigabe von \"%1$s\" (im Auftrag von %2$s)",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Sie empfingen {share} als eine externe Freigabe von {user} (im Auftrag von {behalf})",
+    "You received \"%3$s\" as a remote share from %1$s" : "Sie empfingen \"%3$s\" als eine externe Freigabe von \"%1$s\"",
+    "You received {share} as a remote share from {user}" : "Sie empfingen {share} als eine externe Freigabe von {user} ",
     "Accept" : "Akzeptieren",
     "Decline" : "Ablehnen",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #Nextcloud Federated-Cloud-ID, siehe %s",
@@ -54,10 +54,10 @@ OC.L10N.register(
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
-    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der externen Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated share added" : "Federated-Share hinzugefügt ",
-    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Externe Freigabe konnte nicht hinzu gefügt werden",
     "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen"
 },
 "nplurals=2; plural=(n != 1);");

apps/federatedfilesharing/l10n/de_DE.json

@@ -1,10 +1,10 @@
 { "translations": {
     "Federated sharing" : "Federated-Sharing",
-    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
-    "Remote share" : "Entfernte Freigabe",
-    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die externe Freigabe {name} von {owner}@{remote} hinzufügen?",
+    "Remote share" : "Externe Freigabe",
+    "Remote share password" : "Passwort für die externe Freigabe",
     "Cancel" : "Abbrechen",
-    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Add remote share" : "Externe Freigabe hinzufügen",
     "Copy" : "Kopieren",
     "Copied!" : "Kopiert!",
     "Not supported!" : "Nicht unterstützt!",
@@ -22,10 +22,10 @@
     "File is already shared with %s" : "Datei wird bereits geteilt mit %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Sie empfingen \"%3$s\" als eine entfernte Freigabe von \"%1$s\" (im Auftrag von %2$s)",
-    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Sie empfingen {share} als eine entfernte Freigabe von {user} (im Auftrag von {behalf})",
-    "You received \"%3$s\" as a remote share from %1$s" : "Sie empfingen \"%3$s\" als eine entfernte Freigabe von \"%1$s\"",
-    "You received {share} as a remote share from {user}" : "Sie empfingen {share} als eine entfernte Freigabe von {user} ",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Sie empfingen \"%3$s\" als eine externe Freigabe von \"%1$s\" (im Auftrag von %2$s)",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Sie empfingen {share} als eine externe Freigabe von {user} (im Auftrag von {behalf})",
+    "You received \"%3$s\" as a remote share from %1$s" : "Sie empfingen \"%3$s\" als eine externe Freigabe von \"%1$s\"",
+    "You received {share} as a remote share from {user}" : "Sie empfingen {share} als eine externe Freigabe von {user} ",
     "Accept" : "Akzeptieren",
     "Decline" : "Ablehnen",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #Nextcloud Federated-Cloud-ID, siehe %s",
@@ -52,10 +52,10 @@
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
-    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der externen Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated share added" : "Federated-Share hinzugefügt ",
-    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Externe Freigabe konnte nicht hinzu gefügt werden",
     "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/federatedfilesharing/l10n/fi.js

@@ -34,6 +34,7 @@ OC.L10N.register(
     "Share with me through my #Nextcloud Federated Cloud ID" : "Jaa kanssani käyttäen #Nextcloud ja federoitua pilvitunnistetta",
     "Sharing" : "Jakaminen",
     "Federated file sharing" : "Federoitu tiedostojako",
+    "Provide federated file sharing across servers" : "Mahdollistaa federoidun tiedostojaon palvelinten välillä",
     "Federated Cloud Sharing" : "Federoitu pilvijakaminen",
     "Open documentation" : "Avaa ohje",
     "Adjust how people can share between servers." : "Mukauta kuinka ihmiset voivat jakaa palvelinten välillä.",

apps/federatedfilesharing/l10n/fi.json

@@ -32,6 +32,7 @@
     "Share with me through my #Nextcloud Federated Cloud ID" : "Jaa kanssani käyttäen #Nextcloud ja federoitua pilvitunnistetta",
     "Sharing" : "Jakaminen",
     "Federated file sharing" : "Federoitu tiedostojako",
+    "Provide federated file sharing across servers" : "Mahdollistaa federoidun tiedostojaon palvelinten välillä",
     "Federated Cloud Sharing" : "Federoitu pilvijakaminen",
     "Open documentation" : "Avaa ohje",
     "Adjust how people can share between servers." : "Mukauta kuinka ihmiset voivat jakaa palvelinten välillä.",

apps/federatedfilesharing/l10n/is.js

@@ -34,6 +34,7 @@ OC.L10N.register(
     "Share with me through my #Nextcloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #Nextcloud Federated Cloud ID",
     "Sharing" : "Deiling",
     "Federated file sharing" : "Deiling skráa milli þjóna (skýjasambandssameign)",
+    "Provide federated file sharing across servers" : "Sér um deilingu skráa milli skýjaþjóna (skýjasambandssameign)",
     "Federated Cloud Sharing" : "Deiling með skýjasambandi",
     "Open documentation" : "Opna hjálparskjöl",
     "Adjust how people can share between servers." : "Stilltu hvernig fólk getur deilt á milli þjóna.",

apps/federatedfilesharing/l10n/is.json

@@ -32,6 +32,7 @@
     "Share with me through my #Nextcloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #Nextcloud Federated Cloud ID",
     "Sharing" : "Deiling",
     "Federated file sharing" : "Deiling skráa milli þjóna (skýjasambandssameign)",
+    "Provide federated file sharing across servers" : "Sér um deilingu skráa milli skýjaþjóna (skýjasambandssameign)",
     "Federated Cloud Sharing" : "Deiling með skýjasambandi",
     "Open documentation" : "Opna hjálparskjöl",
     "Adjust how people can share between servers." : "Stilltu hvernig fólk getur deilt á milli þjóna.",

apps/federatedfilesharing/l10n/nl.js

@@ -34,6 +34,7 @@ OC.L10N.register(
     "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID",
     "Sharing" : "Delen",
     "Federated file sharing" : "Gefedereerd delen",
+    "Provide federated file sharing across servers" : "Voorzien in gefedereerd delen van bestanden over verschillende servers",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentatie",
     "Adjust how people can share between servers." : "Aanpassen hoe mensen tussen servers kunnen delen.",

apps/federatedfilesharing/l10n/nl.json

@@ -32,6 +32,7 @@
     "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID",
     "Sharing" : "Delen",
     "Federated file sharing" : "Gefedereerd delen",
+    "Provide federated file sharing across servers" : "Voorzien in gefedereerd delen van bestanden over verschillende servers",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentatie",
     "Adjust how people can share between servers." : "Aanpassen hoe mensen tussen servers kunnen delen.",

apps/federatedfilesharing/l10n/ru.js

@@ -14,17 +14,17 @@ OC.L10N.register(
     "Press Ctrl-C to copy." : "Нажмите Ctrl-C для копирования.",
     "Invalid Federated Cloud ID" : "Неверный ID в объединении облачных хранилищ.",
     "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
-    "Couldn't establish a federated share." : "Не удаётся установить федеративный общий доступ.",
-    "Couldn't establish a federated share, maybe the password was wrong." : "Не удаётся установить федеративный общий доступ, возможно неверный пароль.",
-    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Был отправлен запрос общего федеративного доступа, Вы получите приглашение. Проверьте свои уведомления.",
-    "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Не удалось установить федеративный общий доступ, на другом сервере установлена устаревшая версия Nextcloud (версия 9.x или более ранняя).",
-    "It is not allowed to send federated group shares from this server." : "Не допускается предоставление общего федеративного доступа группам пользователей.",
+    "Couldn't establish a federated share." : "Не удалось установить межсерверный общий доступ.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Не удаётся установить межсерверный общий доступ, возможно неверный пароль.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Запрос межсерверного общего доступа оправлен, вы получите приглашение. Проверьте свои уведомления.",
+    "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Не удалось установить межсерверный общий доступ, на другом сервере установлена устаревшая версия Nextcloud (версия 9.x или более ранняя).",
+    "It is not allowed to send federated group shares from this server." : "Не допускается предоставление межсерверного общего доступа группам пользователей.",
     "Sharing %s failed, because this item is already shared with %s" : "Не удалось предоставить доступ к «%s» , пользователю%s доступ уже предоставлен",
-    "Not allowed to create a federated share with the same user" : "Не допускается создание федеративного общего ресурса с тем же пользователем",
+    "Not allowed to create a federated share with the same user" : "Не допускается создание межсерверного общего ресурса с тем же пользователем",
     "File is already shared with %s" : "Доступ к файлу уже предоставлен %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Не удалось поделиться «%s», не удалось найти %s, возможно, сервер недоступен или использует самоподписанный сертификат.",
     "Could not find share" : "Не удалось найти общий ресурс",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Вы получили «%3$s»  в качестве удалённого ресурса из %1$s (от имени %2$s)",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Вам предоставили общий доступ к ресурсу «%3$s»  расположенному на сервере %1$s (от имени %2$s)",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Вы получили «{share}» в качестве удалённого ресурса от {user} (от имени {behalf})",
     "You received \"%3$s\" as a remote share from %1$s" : "Вы получили «%3$s» в качестве удалённого ресурса из %1$s",
     "You received {share} as a remote share from {user}" : "Вы получили {share} в качестве удалённого ресурса от {user}",
@@ -33,12 +33,13 @@ OC.L10N.register(
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #Nextcloud ID в федерации облачных хранилищ, смотрите %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Поделитесь со мной через мой #Nextcloud ID в федерации облачных хранилищ",
     "Sharing" : "Общий доступ",
-    "Federated file sharing" : "Федеративный обмен файлами",
-    "Federated Cloud Sharing" : "Федерация облачных хранилищ",
+    "Federated file sharing" : "Межсерверный обмен файлами",
+    "Provide federated file sharing across servers" : "Приложение позволяет использовать межсерверный обмен файлами",
+    "Federated Cloud Sharing" : "Межсерверный обмен",
     "Open documentation" : "Открыть документацию",
     "Adjust how people can share between servers." : "Настройте общий доступ между серверами.",
     "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
-    "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов",
+    "Allow users on this server to receive shares from other servers" : "Разрешить пользователям получать общие ресурсы с других серверов",
     "Allow users on this server to send shares to groups on other servers" : "Разрешить предоставлять общий доступ для групп пользователей других серверов",
     "Allow users on this server to receive group shares from other servers" : "Разрешить принимать общий доступ, предоставляемый с другого сервера группе пользователей",
     "Search global and public address book for users" : "Искать пользователей в глобальной и открытой адресной книге",

apps/federatedfilesharing/l10n/ru.json

@@ -12,17 +12,17 @@
     "Press Ctrl-C to copy." : "Нажмите Ctrl-C для копирования.",
     "Invalid Federated Cloud ID" : "Неверный ID в объединении облачных хранилищ.",
     "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
-    "Couldn't establish a federated share." : "Не удаётся установить федеративный общий доступ.",
-    "Couldn't establish a federated share, maybe the password was wrong." : "Не удаётся установить федеративный общий доступ, возможно неверный пароль.",
-    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Был отправлен запрос общего федеративного доступа, Вы получите приглашение. Проверьте свои уведомления.",
-    "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Не удалось установить федеративный общий доступ, на другом сервере установлена устаревшая версия Nextcloud (версия 9.x или более ранняя).",
-    "It is not allowed to send federated group shares from this server." : "Не допускается предоставление общего федеративного доступа группам пользователей.",
+    "Couldn't establish a federated share." : "Не удалось установить межсерверный общий доступ.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Не удаётся установить межсерверный общий доступ, возможно неверный пароль.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Запрос межсерверного общего доступа оправлен, вы получите приглашение. Проверьте свои уведомления.",
+    "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Не удалось установить межсерверный общий доступ, на другом сервере установлена устаревшая версия Nextcloud (версия 9.x или более ранняя).",
+    "It is not allowed to send federated group shares from this server." : "Не допускается предоставление межсерверного общего доступа группам пользователей.",
     "Sharing %s failed, because this item is already shared with %s" : "Не удалось предоставить доступ к «%s» , пользователю%s доступ уже предоставлен",
-    "Not allowed to create a federated share with the same user" : "Не допускается создание федеративного общего ресурса с тем же пользователем",
+    "Not allowed to create a federated share with the same user" : "Не допускается создание межсерверного общего ресурса с тем же пользователем",
     "File is already shared with %s" : "Доступ к файлу уже предоставлен %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Не удалось поделиться «%s», не удалось найти %s, возможно, сервер недоступен или использует самоподписанный сертификат.",
     "Could not find share" : "Не удалось найти общий ресурс",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Вы получили «%3$s»  в качестве удалённого ресурса из %1$s (от имени %2$s)",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Вам предоставили общий доступ к ресурсу «%3$s»  расположенному на сервере %1$s (от имени %2$s)",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Вы получили «{share}» в качестве удалённого ресурса от {user} (от имени {behalf})",
     "You received \"%3$s\" as a remote share from %1$s" : "Вы получили «%3$s» в качестве удалённого ресурса из %1$s",
     "You received {share} as a remote share from {user}" : "Вы получили {share} в качестве удалённого ресурса от {user}",
@@ -31,12 +31,13 @@
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #Nextcloud ID в федерации облачных хранилищ, смотрите %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Поделитесь со мной через мой #Nextcloud ID в федерации облачных хранилищ",
     "Sharing" : "Общий доступ",
-    "Federated file sharing" : "Федеративный обмен файлами",
-    "Federated Cloud Sharing" : "Федерация облачных хранилищ",
+    "Federated file sharing" : "Межсерверный обмен файлами",
+    "Provide federated file sharing across servers" : "Приложение позволяет использовать межсерверный обмен файлами",
+    "Federated Cloud Sharing" : "Межсерверный обмен",
     "Open documentation" : "Открыть документацию",
     "Adjust how people can share between servers." : "Настройте общий доступ между серверами.",
     "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
-    "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов",
+    "Allow users on this server to receive shares from other servers" : "Разрешить пользователям получать общие ресурсы с других серверов",
     "Allow users on this server to send shares to groups on other servers" : "Разрешить предоставлять общий доступ для групп пользователей других серверов",
     "Allow users on this server to receive group shares from other servers" : "Разрешить принимать общий доступ, предоставляемый с другого сервера группе пользователей",
     "Search global and public address book for users" : "Искать пользователей в глобальной и открытой адресной книге",

apps/federatedfilesharing/l10n/sr.js

@@ -34,6 +34,7 @@ OC.L10N.register(
     "Share with me through my #Nextcloud Federated Cloud ID" : "Дели са мном преко мог #Некстклауд Здруженог облака",
     "Sharing" : "Дељење",
     "Federated file sharing" : "Здружено дељење фајлова",
+    "Provide federated file sharing across servers" : "Пружа здружено дељење фајлова између сервера",
     "Federated Cloud Sharing" : "Здружено дељење у облаку",
     "Open documentation" : "Отвори документацију",
     "Adjust how people can share between servers." : "Подеси како људи деле фајлове између сервера.",

apps/federatedfilesharing/l10n/sr.json

@@ -32,6 +32,7 @@
     "Share with me through my #Nextcloud Federated Cloud ID" : "Дели са мном преко мог #Некстклауд Здруженог облака",
     "Sharing" : "Дељење",
     "Federated file sharing" : "Здружено дељење фајлова",
+    "Provide federated file sharing across servers" : "Пружа здружено дељење фајлова између сервера",
     "Federated Cloud Sharing" : "Здружено дељење у облаку",
     "Open documentation" : "Отвори документацију",
     "Adjust how people can share between servers." : "Подеси како људи деле фајлове између сервера.",

apps/federation/l10n/cs.js

@@ -3,12 +3,13 @@ OC.L10N.register(
     {
     "Added to the list of trusted servers" : "Přidán na seznam důvěryhodných serverů.",
     "Server is already in the list of trusted servers." : "Server se už nachází na seznamu těch důvěryhodných.",
-    "No server to federate with found" : "Nenalezen žádný server ke sdružování",
+    "No server to federate with found" : "Nenalezen žádný server, se kterým by bylo možné federovat",
     "Could not add server" : "Nepodařilo se přidat server",
     "Federation" : "Federování",
-    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Sdružování vám umožňuje se připojit k dalším důvěryhodným serverům za účelem výměny uživatelských adresářů. Používá se to např. pro automatické doplňování uživatelů při sdruženém sdílení.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federování umožňuje propojit s ostatními servery, kterým věříte a vyměňovat si tak adresář uživatelů.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federování umožňuje propojit s ostatními servery, kterým věříte a vyměňovat si tak adresář uživatelů. Používá se to např. pro automatické doplňování uživatelů při federovaném sdílení.",
     "Trusted servers" : "Důvěryhodné servery",
-    "Add server automatically once a federated share was created successfully" : "Přidat server automaticky jakmile je úspěšně vytvořeno sdružené sdílení",
+    "Add server automatically once a federated share was created successfully" : "Po úspěšném vytvoření federovaného sdílení automaticky přidat server",
     "+ Add trusted server" : "+ Přidat důvěryhodný server",
     "Trusted server" : "Důvěryhodný server",
     "Add" : "Přidat"

apps/federation/l10n/cs.json

@@ -1,12 +1,13 @@
 { "translations": {
     "Added to the list of trusted servers" : "Přidán na seznam důvěryhodných serverů.",
     "Server is already in the list of trusted servers." : "Server se už nachází na seznamu těch důvěryhodných.",
-    "No server to federate with found" : "Nenalezen žádný server ke sdružování",
+    "No server to federate with found" : "Nenalezen žádný server, se kterým by bylo možné federovat",
     "Could not add server" : "Nepodařilo se přidat server",
     "Federation" : "Federování",
-    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Sdružování vám umožňuje se připojit k dalším důvěryhodným serverům za účelem výměny uživatelských adresářů. Používá se to např. pro automatické doplňování uživatelů při sdruženém sdílení.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federování umožňuje propojit s ostatními servery, kterým věříte a vyměňovat si tak adresář uživatelů.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federování umožňuje propojit s ostatními servery, kterým věříte a vyměňovat si tak adresář uživatelů. Používá se to např. pro automatické doplňování uživatelů při federovaném sdílení.",
     "Trusted servers" : "Důvěryhodné servery",
-    "Add server automatically once a federated share was created successfully" : "Přidat server automaticky jakmile je úspěšně vytvořeno sdružené sdílení",
+    "Add server automatically once a federated share was created successfully" : "Po úspěšném vytvoření federovaného sdílení automaticky přidat server",
     "+ Add trusted server" : "+ Přidat důvěryhodný server",
     "Trusted server" : "Důvěryhodný server",
     "Add" : "Přidat"

apps/federation/l10n/fi.js

@@ -6,7 +6,8 @@ OC.L10N.register(
     "No server to federate with found" : "Palvelinta, johon liittyä, ei löytynyt",
     "Could not add server" : "Palvelimen lisääminen ei onnistunut",
     "Federation" : "Federaatio",
-    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjäluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federaatio mahdollistaa yhdistämisen muihin luotettuihin palvelimiin ja siten käyttäjähakemiston vaihtamisen.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjähakemistoihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
     "Trusted servers" : "Luotetut palvelimet",
     "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti",
     "+ Add trusted server" : "+ Lisää luotettu palvelin",

apps/federation/l10n/fi.json

@@ -4,7 +4,8 @@
     "No server to federate with found" : "Palvelinta, johon liittyä, ei löytynyt",
     "Could not add server" : "Palvelimen lisääminen ei onnistunut",
     "Federation" : "Federaatio",
-    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjäluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federaatio mahdollistaa yhdistämisen muihin luotettuihin palvelimiin ja siten käyttäjähakemiston vaihtamisen.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjähakemistoihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
     "Trusted servers" : "Luotetut palvelimet",
     "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti",
     "+ Add trusted server" : "+ Lisää luotettu palvelin",

apps/federation/l10n/is.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst",
     "Could not add server" : "Gat ekki bætt við þjóni",
     "Federation" : "Deilt milli þjóna",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
     "Trusted servers" : "Treystir þjónar",
     "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign",

apps/federation/l10n/is.json

@@ -4,6 +4,7 @@
     "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst",
     "Could not add server" : "Gat ekki bætt við þjóni",
     "Federation" : "Deilt milli þjóna",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
     "Trusted servers" : "Treystir þjónar",
     "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign",

apps/federation/l10n/lt_LT.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "No server to federate with found" : "Nerasta tinkama saugykla",
     "Could not add server" : "Nepavyko prijungti saugyklos",
     "Federation" : "Išorinė saugykla",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federacija jums leidžia prisijungti prie kitų patikimų serverių, kad pakeisti vartotojo katalogą.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Išorinės saugyklos leidžia naudotojams dalintis duomenimis ir adresatais tarpusavyje",
     "Trusted servers" : "Saugyklos",
     "Add server automatically once a federated share was created successfully" : "Prijungti automatiškai užmezgus ryšį",

apps/federation/l10n/lt_LT.json

@@ -4,6 +4,7 @@
     "No server to federate with found" : "Nerasta tinkama saugykla",
     "Could not add server" : "Nepavyko prijungti saugyklos",
     "Federation" : "Išorinė saugykla",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federacija jums leidžia prisijungti prie kitų patikimų serverių, kad pakeisti vartotojo katalogą.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Išorinės saugyklos leidžia naudotojams dalintis duomenimis ir adresatais tarpusavyje",
     "Trusted servers" : "Saugyklos",
     "Add server automatically once a federated share was created successfully" : "Prijungti automatiškai užmezgus ryšį",

apps/federation/l10n/nl.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "No server to federate with found" : "Geen server gevonden om mee te federeren",
     "Could not add server" : "Kon server niet toevoegen",
     "Federation" : "Federatie",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federatie maakt het mogelijk om te verbinden met andere vertrouwde servers om de gebuikersadministratie te delen.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.",
     "Trusted servers" : "Vertrouwde servers",
     "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is",

apps/federation/l10n/nl.json

@@ -4,6 +4,7 @@
     "No server to federate with found" : "Geen server gevonden om mee te federeren",
     "Could not add server" : "Kon server niet toevoegen",
     "Federation" : "Federatie",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federatie maakt het mogelijk om te verbinden met andere vertrouwde servers om de gebuikersadministratie te delen.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.",
     "Trusted servers" : "Vertrouwde servers",
     "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is",

apps/federation/l10n/ru.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "No server to federate with found" : "Сервер для объединения не найден",
     "Could not add server" : "Не удалось добавить сервер",
     "Federation" : "Федерация",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Федерация позволяет подключаться к другим доверенным серверам для обмена каталогами пользователей.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Федерация серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автодополнения имён пользователей при открытии федеративного общего доступа.",
     "Trusted servers" : "Доверенные серверы",
     "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания  федеративного ресурса общего доступа",

apps/federation/l10n/ru.json

@@ -4,6 +4,7 @@
     "No server to federate with found" : "Сервер для объединения не найден",
     "Could not add server" : "Не удалось добавить сервер",
     "Federation" : "Федерация",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Федерация позволяет подключаться к другим доверенным серверам для обмена каталогами пользователей.",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Федерация серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автодополнения имён пользователей при открытии федеративного общего доступа.",
     "Trusted servers" : "Доверенные серверы",
     "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания  федеративного ресурса общего доступа",

apps/federation/l10n/sl.js

@@ -1,15 +1,17 @@
 OC.L10N.register(
     "federation",
     {
-    "Added to the list of trusted servers" : "Dodano na spisek varnih strežnikov",
-    "Server is already in the list of trusted servers." : "Strežnik je že na seznamu potrjenih strežnikov.",
+    "Added to the list of trusted servers" : "Strežnik je dodan na seznam varnih strežnikov.",
+    "Server is already in the list of trusted servers." : "Strežnik je že na seznamu varnih strežnikov.",
     "No server to federate with found" : "Ne najdem strežnika za federiranje",
-    "Could not add server" : "Ni mogoče dodati strežnika.",
-    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federiranje omogoča povezovanje z drugimi varnimi strežniki in izmenjavo spiska uporabnikov. Primer je samodejno dopolnjevanje zunanjih uporabnikov pri federacijski souporabi.",
-    "Trusted servers" : "Zanesljivi strežniki",
-    "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, ko je povezava zveznega oblaka uspešno ustvarjena",
-    "+ Add trusted server" : "+ Dodaj zanesljiv strežnik",
-    "Trusted server" : "Zanesljiv strežnik",
+    "Could not add server" : "Strežnika ni mogoče dodati.",
+    "Federation" : "Zvezni oblaki",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Zvezni oblak omogoča povezovanje zunanjih strežnikov v skupen oblak in izmenjavo datotek in map uporabnikov različnih sistemov.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Zvezni oblak omogoča povezovanje z drugimi varnimi strežniki in izmenjavo datotek in map uporabnikov v enotnem oblaku. Možnost omogoča na primer samodejno dopolnjevanje tudi imen uporabnikov na drugih, zunanjih strežnikih.",
+    "Trusted servers" : "Varni strežniki",
+    "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, ko je povezava zveznega oblaka uspešno ustvarjena.",
+    "+ Add trusted server" : "+ Dodaj varen strežnik",
+    "Trusted server" : "Varen strežnik",
     "Add" : "Dodaj"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");

apps/federation/l10n/sl.json

@@ -1,13 +1,15 @@
 { "translations": {
-    "Added to the list of trusted servers" : "Dodano na spisek varnih strežnikov",
-    "Server is already in the list of trusted servers." : "Strežnik je že na seznamu potrjenih strežnikov.",
+    "Added to the list of trusted servers" : "Strežnik je dodan na seznam varnih strežnikov.",
+    "Server is already in the list of trusted servers." : "Strežnik je že na seznamu varnih strežnikov.",
     "No server to federate with found" : "Ne najdem strežnika za federiranje",
-    "Could not add server" : "Ni mogoče dodati strežnika.",
-    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federiranje omogoča povezovanje z drugimi varnimi strežniki in izmenjavo spiska uporabnikov. Primer je samodejno dopolnjevanje zunanjih uporabnikov pri federacijski souporabi.",
-    "Trusted servers" : "Zanesljivi strežniki",
-    "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, ko je povezava zveznega oblaka uspešno ustvarjena",
-    "+ Add trusted server" : "+ Dodaj zanesljiv strežnik",
-    "Trusted server" : "Zanesljiv strežnik",
+    "Could not add server" : "Strežnika ni mogoče dodati.",
+    "Federation" : "Zvezni oblaki",
+    "Federation allows you to connect with other trusted servers to exchange the user directory." : "Zvezni oblak omogoča povezovanje zunanjih strežnikov v skupen oblak in izmenjavo datotek in map uporabnikov različnih sistemov.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Zvezni oblak omogoča povezovanje z drugimi varnimi strežniki in izmenjavo datotek in map uporabnikov v enotnem oblaku. Možnost omogoča na primer samodejno dopolnjevanje tudi imen uporabnikov na drugih, zunanjih strežnikih.",
+    "Trusted servers" : "Varni strežniki",
+    "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, ko je povezava zveznega oblaka uspešno ustvarjena.",
+    "+ Add trusted server" : "+ Dodaj varen strežnik",
+    "Trusted server" : "Varen strežnik",
     "Add" : "Dodaj"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }