diff --git a/apps/dav/l10n/pl.js b/apps/dav/l10n/pl.js
index 806a23498c36ad801adac43000e64077f1f2c413..d57d8a1b3f1b8a68cf71ee3f8fe8db90fcb78238 100644
--- a/apps/dav/l10n/pl.js
+++ b/apps/dav/l10n/pl.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Remote Address: %s" : "Adres zdalny: %s",
     "Request ID: %s" : "ID żądania: %s",
     "CalDAV server" : "Serwer CalDAV",
-    "Send invitations to attendees" : "Wyślij uczestnikom zaproszenia"
+    "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."
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
diff --git a/apps/dav/l10n/pl.json b/apps/dav/l10n/pl.json
index 618dfd48a6ab6aa895acf8a8e4c30eec61900c54..dc4b7a5a3ac658b4daa2a1d40b504eaddf1b0848 100644
--- a/apps/dav/l10n/pl.json
+++ b/apps/dav/l10n/pl.json
@@ -44,6 +44,7 @@
     "Remote Address: %s" : "Adres zdalny: %s",
     "Request ID: %s" : "ID żądania: %s",
     "CalDAV server" : "Serwer CalDAV",
-    "Send invitations to attendees" : "Wyślij uczestnikom zaproszenia"
+    "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."
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index ed09e5f7968d29deb7743f35bb2f5541fcef4011..93fe93de7260cf780a66a9c10fa796dbd55cfd31 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -22,6 +22,10 @@ OC.L10N.register(
     "The current log-in password was not correct, please try again." : "目前登入的密碼不正確，請再試一次",
     "Private key password successfully updated." : "私人金鑰密碼已成功更新。",
     "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" : "您需要搬移您的加密鑰匙從舊版的加密 (ownCloud <= 8.0) 到新版，請執行 'occ encryption:migrate' 或是聯絡系統管理員",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼，以恢復對加密文件的訪問。",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "已啟用加密應用，但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密，以使用加密模組。",
+    "Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
     "Bad Signature" : "壞的簽章",
     "Missing Signature" : "遺失簽章",
     "one-time password for server-side-encryption" : "一次性密碼用於伺服器端的加密",
@@ -31,6 +35,8 @@ OC.L10N.register(
     "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>加密，請從網頁登入，到 'basic encryption module' 設置您的個人設定並透過更新加密密碼，將這個組密碼設定在 'old log-in password'  以及您的目前登入密碼<br><br>",
+    "Default encryption module" : "預設加密模組",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用，但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
     "Encrypt the home storage" : "加密家目錄空間",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "請啟用這個功能以用來加密主要儲存空間的檔案，否則只有再外部儲存的檔案會加密",
     "Enable recovery key" : "啟用還原金鑰",
@@ -43,6 +49,7 @@ OC.L10N.register(
     "New recovery key password" : "新的還原金鑰密碼",
     "Repeat new recovery key password" : "再輸入新的還原金鑰密碼一次",
     "Change Password" : "變更密碼",
+    "Basic encryption module" : "基本加密模組",
     "Your private key password no longer matches your log-in password." : "您的私人金鑰密碼不符合您的登入密碼",
     "Set your old private key password to your current log-in password:" : "設定您的舊私人金鑰密碼到您現在的登入密碼:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼，可以請求管理員協助取回檔案。",
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index 28ef2eeab622e632d87bb60b166b28290ea3427a..545a78efdda7db3a4cb76665b05f43819d6c03ae 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -20,6 +20,10 @@
     "The current log-in password was not correct, please try again." : "目前登入的密碼不正確，請再試一次",
     "Private key password successfully updated." : "私人金鑰密碼已成功更新。",
     "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" : "您需要搬移您的加密鑰匙從舊版的加密 (ownCloud <= 8.0) 到新版，請執行 'occ encryption:migrate' 或是聯絡系統管理員",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼，以恢復對加密文件的訪問。",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "已啟用加密應用，但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密，以使用加密模組。",
+    "Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
     "Bad Signature" : "壞的簽章",
     "Missing Signature" : "遺失簽章",
     "one-time password for server-side-encryption" : "一次性密碼用於伺服器端的加密",
@@ -29,6 +33,8 @@
     "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>加密，請從網頁登入，到 'basic encryption module' 設置您的個人設定並透過更新加密密碼，將這個組密碼設定在 'old log-in password'  以及您的目前登入密碼<br><br>",
+    "Default encryption module" : "預設加密模組",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用，但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
     "Encrypt the home storage" : "加密家目錄空間",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "請啟用這個功能以用來加密主要儲存空間的檔案，否則只有再外部儲存的檔案會加密",
     "Enable recovery key" : "啟用還原金鑰",
@@ -41,6 +47,7 @@
     "New recovery key password" : "新的還原金鑰密碼",
     "Repeat new recovery key password" : "再輸入新的還原金鑰密碼一次",
     "Change Password" : "變更密碼",
+    "Basic encryption module" : "基本加密模組",
     "Your private key password no longer matches your log-in password." : "您的私人金鑰密碼不符合您的登入密碼",
     "Set your old private key password to your current log-in password:" : "設定您的舊私人金鑰密碼到您現在的登入密碼:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼，可以請求管理員協助取回檔案。",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index a4345368eb0d1e944f63519e19d8c1056a4db304..ca73ab733579db30bc9090bb92d99cc9744eb81a 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Du möchtest{size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 7205c3e98fbc5fffaaff9f1fbad00ae967132bed..0fa4becb1a9927df66dc70a9c22f57598970434f 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -14,6 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Du möchtest{size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index e38dbd1b21fb274016c19a709b9f984e15345766..12eec37f13c2ed0d30f740c13c0882920ec8d694 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 83fd62abffca9fcbf610560853d1f09117b5ec82..346562edbe9c19354d67f609f6fec76fdee6b51f 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -14,6 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index 8e67c6c26a35013b36284e4b552a2e9ce2003b4e..d6051f1307f972a535befbde42d0be46d49f6fa1 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -16,11 +16,13 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
     "Target folder \"{dir}\" does not exist any more" : "資料夾 \"{dir}\" 不存在",
     "Not enough free space" : "空間不足",
+    "Uploading …" : "上傳中...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{totalSize} 中的 {loadedSize} ({bitrate})",
     "Actions" : "動作",
     "Download" : "下載",
     "Rename" : "重新命名",
+    "Move or copy" : "移動或複製",
     "Target folder" : "目標資料夾",
     "Delete" : "刪除",
     "Disconnect storage" : "斷開儲存空間連接",
@@ -35,6 +37,8 @@ OC.L10N.register(
     "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法存取，請檢查伺服器記錄檔或聯絡管理員",
     "Could not move \"{file}\", target exists" : "無法移動 \"{file}\"，目標已經存在",
     "Could not move \"{file}\"" : "無法移動 \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "無法複製\"{file}\"，目標已存在",
+    "Could not copy \"{file}\"" : "無法複製\"{file}\"",
     "{newName} already exists" : "{newName} 已經存在",
     "Could not rename \"{fileName}\", it does not exist any more" : "無法命名檔案 \"{fileName}\"，因為此檔案已經不存在",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名稱 \"{targetName}\" 在這資料夾 \"{dir}\" 已經被使用。請重新選擇不同的名稱",
@@ -71,9 +75,12 @@ OC.L10N.register(
     "Favorite" : "我的最愛",
     "New folder" : "新資料夾",
     "Upload file" : "上傳檔案",
+    "Not favorited" : "未加入至最愛",
+    "Remove from favorites" : "從最愛中移除",
+    "Add to favorites" : "添加到最愛",
     "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
-    "Added to favorites" : "添加到最愛",
-    "Removed from favorites" : "從最愛移除",
+    "Added to favorites" : "已添加到最愛",
+    "Removed from favorites" : "已從最愛中移除",
     "You added {file} to your favorites" : "你已添加 {file} 至最愛",
     "You removed {file} from your favorites" : "你已移除 {file} 從最愛",
     "File changes" : "檔案更動",
@@ -117,6 +124,7 @@ OC.L10N.register(
     "Show hidden files" : "顯示隱藏檔",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>",
+    "Cancel upload" : "取消上傳",
     "No files in here" : "沒有任何檔案",
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
     "No entries found in this folder" : "在此資料夾中沒有任何項目",
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index 3bbfaf8a0836696f25268334b97812e3aed716d8..45cfeb15b6fc6b3ecd2fe442408028ac53f9021a 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -14,11 +14,13 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
     "Target folder \"{dir}\" does not exist any more" : "資料夾 \"{dir}\" 不存在",
     "Not enough free space" : "空間不足",
+    "Uploading …" : "上傳中...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{totalSize} 中的 {loadedSize} ({bitrate})",
     "Actions" : "動作",
     "Download" : "下載",
     "Rename" : "重新命名",
+    "Move or copy" : "移動或複製",
     "Target folder" : "目標資料夾",
     "Delete" : "刪除",
     "Disconnect storage" : "斷開儲存空間連接",
@@ -33,6 +35,8 @@
     "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法存取，請檢查伺服器記錄檔或聯絡管理員",
     "Could not move \"{file}\", target exists" : "無法移動 \"{file}\"，目標已經存在",
     "Could not move \"{file}\"" : "無法移動 \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "無法複製\"{file}\"，目標已存在",
+    "Could not copy \"{file}\"" : "無法複製\"{file}\"",
     "{newName} already exists" : "{newName} 已經存在",
     "Could not rename \"{fileName}\", it does not exist any more" : "無法命名檔案 \"{fileName}\"，因為此檔案已經不存在",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名稱 \"{targetName}\" 在這資料夾 \"{dir}\" 已經被使用。請重新選擇不同的名稱",
@@ -69,9 +73,12 @@
     "Favorite" : "我的最愛",
     "New folder" : "新資料夾",
     "Upload file" : "上傳檔案",
+    "Not favorited" : "未加入至最愛",
+    "Remove from favorites" : "從最愛中移除",
+    "Add to favorites" : "添加到最愛",
     "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
-    "Added to favorites" : "添加到最愛",
-    "Removed from favorites" : "從最愛移除",
+    "Added to favorites" : "已添加到最愛",
+    "Removed from favorites" : "已從最愛中移除",
     "You added {file} to your favorites" : "你已添加 {file} 至最愛",
     "You removed {file} from your favorites" : "你已移除 {file} 從最愛",
     "File changes" : "檔案更動",
@@ -115,6 +122,7 @@
     "Show hidden files" : "顯示隱藏檔",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>",
+    "Cancel upload" : "取消上傳",
     "No files in here" : "沒有任何檔案",
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
     "No entries found in this folder" : "在此資料夾中沒有任何項目",
diff --git a/apps/sharebymail/l10n/gl.js b/apps/sharebymail/l10n/gl.js
index d1f8c55ebadad0fce3702151b32e54a6d84f7d8c..bac9c912b407a1970f73015476501b53306b0690 100644
--- a/apps/sharebymail/l10n/gl.js
+++ b/apps/sharebymail/l10n/gl.js
@@ -1,50 +1,49 @@
 OC.L10N.register(
     "sharebymail",
     {
-    "Shared with %1$s" : "Compartido con %1$s",
+    "Shared with %1$s" : "Compartido con %1$s ",
     "Shared with {email}" : "Compartido con {email}",
-    "Shared with %1$s by %2$s" : "Compartido con %1$s por %2$s",
-    "Shared with {email} by {actor}" : "Compartido con {email} por {actor}Compartido con {email} por {actor}",
-    "Password for mail share sent to %1$s" : "Enviouse un contrasinal para compartir por correo a %1$s",
-    "Password for mail share sent to {email}" : "Enviouse un contrasinal para compartir por correo a {email}",
-    "Password for mail share sent to you" : "Envióuselle un contrasinal para compartir por correo",
+    "Shared with %1$s by %2$s" : "Compartido con %1$spor %2$s",
+    "Shared with {email} by {actor}" : "Compartido con {email} por {actor}",
+    "Password for mail share sent to %1$s" : "Contrasinal para compartir por correo enviada a %1$s",
+    "Password for mail share sent to {email}" : "Contrasinal para compartir por correo enviada a {email}",
+    "Password for mail share sent to you" : "Contrasinal para compartir por correo enviada a tí mesmo",
     "You shared %1$s with %2$s by mail" : "Compartiu %1$s con %2$s por correo",
     "You shared {file} with {email} by mail" : "Compartiu {file} con {email} por correo",
-    "%3$s shared %1$s with %2$s by mail" : "%3$s compartiu %1$s con %2$s por correo",
+    "%3$s shared %1$s with %2$s by mail" : "%3$s compartido %1$scon %2$s por correo",
     "{actor} shared {file} with {email} by mail" : "{actor} compartiu {file} con {email} por correo",
-    "Password to access %1$s was sent to %2s" : "Envióuselle a %2s un contrasinal para acceder a %1$s",
-    "Password to access {file} was sent to {email}" : "Envióuselle a {email} un contrasinal para acceder a {file}",
-    "Password to access %1$s was sent to you" : "Envióuselle a vostede un correo para acceder a %1$s",
-    "Password to access {file} was sent to you" : "Envióuselle a vostede un correo para acceder a {file}",
-    "Sharing %s failed, this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s",
-    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Non é posíbel enviarlle o contrasinal xerado automaticamente. Estabeleza un enderezo de correo correcto nos seus axustes persoais e ténteo de novo.",
-    "Failed to send share by email" : "Fallou o envío do recurso compartido por correo",
-    "%s shared »%s« with you" : "%s compartiu «%s» con vostede",
-    "%s shared »%s« with you." : "%s compartiu «%s» con vostede.",
-    "Click the button below to open it." : "Prema no botón de embaixo para abrilo.",
-    "Open »%s«" : "Abrir «%s»",
+    "Password to access %1$s was sent to %2s" : "Contrasinal para acceder a %1$s foi enviada a %2s",
+    "Password to access {file} was sent to {email}" : "Contrasinal para acceder a {file} foi enviada a {email}",
+    "Password to access %1$s was sent to you" : "Contrasinal para acceder a %1$s foi enviada a tí mesmo",
+    "Password to access {file} was sent to you" : "Contrasinal para acceder a {file} foi enviada a tí mesmo",
+    "Sharing %s failed, this item is already shared with %s" : "Compartir %s fallou, este obxecto xa está compartido con %s",
+    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Non podemos enviarte o contrasinal auto-xenerado. Por favor indica unha dirección de correo válida nas túas preferencias persoais e proba de novo.",
+    "Failed to send share by email" : "Fallou ó envío para compartir por correo",
+    "%s shared »%s« with you" : "%s compartiu »%s«  contigo",
+    "%s shared »%s« with you." : "%s compartiu »%s« contigo.",
+    "Click the button below to open it." : "Prema no botón máis abaixo para abrilo.",
+    "Open »%s«" : "Abrir »%s«",
     "%s via %s" : "%s vía %s",
-    "Password to access »%s« shared to you by %s" : "O contrasinal para acceder a «%s» foi compartido con vostede por %s",
-    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s compartiu «%s» con vostede.\nDebería ter recibido un correo por separado cunha ligazón acceder.\n",
-    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s compartiu «%s» con vostede. Debería ter recibido un correo por separado cunha ligazón acceder.",
-    "Password to access »%s«" : "Contrasinal para acceder a «%s»",
+    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s compartiu »%s« contigo.\nDebes ter recibido xa un correo por separado cun enlace para acceder a él.\n",
+    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s compartiu »%s« contigo. Debes ter recibido xa un correo por separado cun enlace para acceder a él.",
+    "Password to access »%s« shared to you by %s" : "Contrasinal para acceder »%s« compartido contigo por %s",
+    "Password to access »%s«" : "Contrasinal para acceder »%s«",
     "It is protected with the following password: %s" : "Está protexido co seguinte contrasinal: %s",
-    "Password to access »%s« shared with %s" : "Contrasinal para acceder a «%s» compartida con %s",
-    "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Ven de de compartir «%s» con %s. O recurso compartido xa foi enviado ao destinatario. Por mor das regras de seguridade definidas polo administrador de %s cada recurso compartido necesita ser protexido por un contrasinal e non está permitido que vostede envíe o contrasinal directamente ao destinatario. Polo tanto, necesita enviar manualmente o contrasinal ao destinatario.",
+    "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Compartiu »%s« con %s. O recurso a compartir foi xa enviado ó destinatario. Debido ás políticas de seguridade definidas polo administrador de %s cada recurso a compartir precisa ser protexido por contrasinal e non está permitido enviar o contrasinal directamente ó destinatario. Polo tanto precisa reenviar o contrasinal ó destinatario manualmente.",
+    "Password to access »%s« shared with %s" : "Contrasinal para acceder a  »%s« compartido con %s",
     "This is the password: %s" : "Este é o contrasinal: %s",
-    "You can choose a different password at any time in the share dialog." : "Pode escoller un contrasinal diferente en calquera momento no diálogo de compartir.",
-    "Could not find share" : "Non foi posíbel atopar o recurso compartido",
-    "Share by mail" : "Compartido por correo",
-    "Allows users to share a personalized link to a file or folder by putting in an email address." : "Permite que os usuarios compartan unha ligazón personalizada ou un ficheiro ou cartafol enviándoo a un enderezo de correo.",
+    "You can choose a different password at any time in the share dialog." : "Pode elexir un contrasinal diferente en calquer momento no diálogo compartir.",
+    "Could not find share" : "Non puiden atopar o recurso a compartir",
+    "Share by mail" : "Compartir por correo",
+    "Allows users to share a personalized link to a file or folder by putting in an email address." : "Permite a usuarios compartir un enlace personalizado a un ficheiro ou carpeta indicando unha dirección de correo ",
     "Send password by mail" : "Enviar contrasinal por correo",
-    "Enforce password protection" : "Forzar a protección por contrasinal",
-    "Failed to send share by E-mail" : "Fallou o envío do recurso compartido por correo",
-    "%s shared »%s« with you on behalf of %s" : "%s compartiu «%s» con vostede no nome de %s",
-    "Failed to create the E-mail" : "Non foi posíbel crear o correo",
-    "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Ola!,\n\n%s compartiu «%s» con vostede no nome de %s.\n\n%s\n\n",
-    "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Ola!,\n\n%s compartiu «%s» con vostede.\n\n%s\n\n",
-    "Cheers!" : "Saúdos!",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Ola!,<br><br>%s compartiu <a href=\"%s\">%s</a> con vostede no nome de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Ola!,<br><br>%s compartiu <a href=\"%s\">%s</a> con vostede.<br><br>"
+    "Enforce password protection" : "Aplicar protección por contrasinal",
+    "Failed to send share by E-mail" : "Fallou ó compartir por correo",
+    "%s shared »%s« with you on behalf of %s" : "%s compartiu »%s« contigo en representación de %s",
+    "Failed to create the E-mail" : "Fallo ó crear o correo",
+    "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hola,\n\n%s compartiu »%s« contigo en representación de %s.\n\n%s\n\n",
+    "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hola,\n\n%s compartiu »%s« contigo.\n\n%s\n\n",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hola, <br><br>%s compartiu <a href=\"%s\">%s</a> contigo en representación de %s. <br><br>",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola, <br><br>%s compartiu <a href=\"%s\">%s</a>contigo, <br><br>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/gl.json b/apps/sharebymail/l10n/gl.json
index d378a2017e2c735232106ebb7392dc0f364f210e..0e2e007d9ab178a01d65b961b841efbac953ddd6 100644
--- a/apps/sharebymail/l10n/gl.json
+++ b/apps/sharebymail/l10n/gl.json
@@ -1,48 +1,47 @@
 { "translations": {
-    "Shared with %1$s" : "Compartido con %1$s",
+    "Shared with %1$s" : "Compartido con %1$s ",
     "Shared with {email}" : "Compartido con {email}",
-    "Shared with %1$s by %2$s" : "Compartido con %1$s por %2$s",
-    "Shared with {email} by {actor}" : "Compartido con {email} por {actor}Compartido con {email} por {actor}",
-    "Password for mail share sent to %1$s" : "Enviouse un contrasinal para compartir por correo a %1$s",
-    "Password for mail share sent to {email}" : "Enviouse un contrasinal para compartir por correo a {email}",
-    "Password for mail share sent to you" : "Envióuselle un contrasinal para compartir por correo",
+    "Shared with %1$s by %2$s" : "Compartido con %1$spor %2$s",
+    "Shared with {email} by {actor}" : "Compartido con {email} por {actor}",
+    "Password for mail share sent to %1$s" : "Contrasinal para compartir por correo enviada a %1$s",
+    "Password for mail share sent to {email}" : "Contrasinal para compartir por correo enviada a {email}",
+    "Password for mail share sent to you" : "Contrasinal para compartir por correo enviada a tí mesmo",
     "You shared %1$s with %2$s by mail" : "Compartiu %1$s con %2$s por correo",
     "You shared {file} with {email} by mail" : "Compartiu {file} con {email} por correo",
-    "%3$s shared %1$s with %2$s by mail" : "%3$s compartiu %1$s con %2$s por correo",
+    "%3$s shared %1$s with %2$s by mail" : "%3$s compartido %1$scon %2$s por correo",
     "{actor} shared {file} with {email} by mail" : "{actor} compartiu {file} con {email} por correo",
-    "Password to access %1$s was sent to %2s" : "Envióuselle a %2s un contrasinal para acceder a %1$s",
-    "Password to access {file} was sent to {email}" : "Envióuselle a {email} un contrasinal para acceder a {file}",
-    "Password to access %1$s was sent to you" : "Envióuselle a vostede un correo para acceder a %1$s",
-    "Password to access {file} was sent to you" : "Envióuselle a vostede un correo para acceder a {file}",
-    "Sharing %s failed, this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s",
-    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Non é posíbel enviarlle o contrasinal xerado automaticamente. Estabeleza un enderezo de correo correcto nos seus axustes persoais e ténteo de novo.",
-    "Failed to send share by email" : "Fallou o envío do recurso compartido por correo",
-    "%s shared »%s« with you" : "%s compartiu «%s» con vostede",
-    "%s shared »%s« with you." : "%s compartiu «%s» con vostede.",
-    "Click the button below to open it." : "Prema no botón de embaixo para abrilo.",
-    "Open »%s«" : "Abrir «%s»",
+    "Password to access %1$s was sent to %2s" : "Contrasinal para acceder a %1$s foi enviada a %2s",
+    "Password to access {file} was sent to {email}" : "Contrasinal para acceder a {file} foi enviada a {email}",
+    "Password to access %1$s was sent to you" : "Contrasinal para acceder a %1$s foi enviada a tí mesmo",
+    "Password to access {file} was sent to you" : "Contrasinal para acceder a {file} foi enviada a tí mesmo",
+    "Sharing %s failed, this item is already shared with %s" : "Compartir %s fallou, este obxecto xa está compartido con %s",
+    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Non podemos enviarte o contrasinal auto-xenerado. Por favor indica unha dirección de correo válida nas túas preferencias persoais e proba de novo.",
+    "Failed to send share by email" : "Fallou ó envío para compartir por correo",
+    "%s shared »%s« with you" : "%s compartiu »%s«  contigo",
+    "%s shared »%s« with you." : "%s compartiu »%s« contigo.",
+    "Click the button below to open it." : "Prema no botón máis abaixo para abrilo.",
+    "Open »%s«" : "Abrir »%s«",
     "%s via %s" : "%s vía %s",
-    "Password to access »%s« shared to you by %s" : "O contrasinal para acceder a «%s» foi compartido con vostede por %s",
-    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s compartiu «%s» con vostede.\nDebería ter recibido un correo por separado cunha ligazón acceder.\n",
-    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s compartiu «%s» con vostede. Debería ter recibido un correo por separado cunha ligazón acceder.",
-    "Password to access »%s«" : "Contrasinal para acceder a «%s»",
+    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s compartiu »%s« contigo.\nDebes ter recibido xa un correo por separado cun enlace para acceder a él.\n",
+    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s compartiu »%s« contigo. Debes ter recibido xa un correo por separado cun enlace para acceder a él.",
+    "Password to access »%s« shared to you by %s" : "Contrasinal para acceder »%s« compartido contigo por %s",
+    "Password to access »%s«" : "Contrasinal para acceder »%s«",
     "It is protected with the following password: %s" : "Está protexido co seguinte contrasinal: %s",
-    "Password to access »%s« shared with %s" : "Contrasinal para acceder a «%s» compartida con %s",
-    "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Ven de de compartir «%s» con %s. O recurso compartido xa foi enviado ao destinatario. Por mor das regras de seguridade definidas polo administrador de %s cada recurso compartido necesita ser protexido por un contrasinal e non está permitido que vostede envíe o contrasinal directamente ao destinatario. Polo tanto, necesita enviar manualmente o contrasinal ao destinatario.",
+    "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Compartiu »%s« con %s. O recurso a compartir foi xa enviado ó destinatario. Debido ás políticas de seguridade definidas polo administrador de %s cada recurso a compartir precisa ser protexido por contrasinal e non está permitido enviar o contrasinal directamente ó destinatario. Polo tanto precisa reenviar o contrasinal ó destinatario manualmente.",
+    "Password to access »%s« shared with %s" : "Contrasinal para acceder a  »%s« compartido con %s",
     "This is the password: %s" : "Este é o contrasinal: %s",
-    "You can choose a different password at any time in the share dialog." : "Pode escoller un contrasinal diferente en calquera momento no diálogo de compartir.",
-    "Could not find share" : "Non foi posíbel atopar o recurso compartido",
-    "Share by mail" : "Compartido por correo",
-    "Allows users to share a personalized link to a file or folder by putting in an email address." : "Permite que os usuarios compartan unha ligazón personalizada ou un ficheiro ou cartafol enviándoo a un enderezo de correo.",
+    "You can choose a different password at any time in the share dialog." : "Pode elexir un contrasinal diferente en calquer momento no diálogo compartir.",
+    "Could not find share" : "Non puiden atopar o recurso a compartir",
+    "Share by mail" : "Compartir por correo",
+    "Allows users to share a personalized link to a file or folder by putting in an email address." : "Permite a usuarios compartir un enlace personalizado a un ficheiro ou carpeta indicando unha dirección de correo ",
     "Send password by mail" : "Enviar contrasinal por correo",
-    "Enforce password protection" : "Forzar a protección por contrasinal",
-    "Failed to send share by E-mail" : "Fallou o envío do recurso compartido por correo",
-    "%s shared »%s« with you on behalf of %s" : "%s compartiu «%s» con vostede no nome de %s",
-    "Failed to create the E-mail" : "Non foi posíbel crear o correo",
-    "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Ola!,\n\n%s compartiu «%s» con vostede no nome de %s.\n\n%s\n\n",
-    "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Ola!,\n\n%s compartiu «%s» con vostede.\n\n%s\n\n",
-    "Cheers!" : "Saúdos!",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Ola!,<br><br>%s compartiu <a href=\"%s\">%s</a> con vostede no nome de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Ola!,<br><br>%s compartiu <a href=\"%s\">%s</a> con vostede.<br><br>"
+    "Enforce password protection" : "Aplicar protección por contrasinal",
+    "Failed to send share by E-mail" : "Fallou ó compartir por correo",
+    "%s shared »%s« with you on behalf of %s" : "%s compartiu »%s« contigo en representación de %s",
+    "Failed to create the E-mail" : "Fallo ó crear o correo",
+    "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hola,\n\n%s compartiu »%s« contigo en representación de %s.\n\n%s\n\n",
+    "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hola,\n\n%s compartiu »%s« contigo.\n\n%s\n\n",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hola, <br><br>%s compartiu <a href=\"%s\">%s</a> contigo en representación de %s. <br><br>",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola, <br><br>%s compartiu <a href=\"%s\">%s</a>contigo, <br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index 271f482b6f522875469846f2690b06b42a3ba4a0..70284f8868e00b224d40e9677c15a8fd8de7172b 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "core",
     {
-    "Please select a file." : "Hãy chọn một tệp tin.",
-    "File is too big" : "File quá lớn",
+    "Please select a file." : "Hãy chọn một tệp.",
+    "File is too big" : "Tệp quá lớn",
     "The selected file is not an image." : "Tệp tin được chọn không phải là ảnh.",
     "The selected file cannot be read." : "Tệp tin được chọn không thể đọc.",
     "Invalid file provided" : "File không hợp lệ",
@@ -231,7 +231,7 @@ OC.L10N.register(
     "Type: %s" : "Loại: %s",
     "Code: %s" : "Mã: %s",
     "Message: %s" : "Thông điệp:%s",
-    "File: %s" : "%sTệp:",
+    "File: %s" : "Tệp: %s",
     "Line: %s" : "Dòng: %s",
     "Trace" : "Theo dõi",
     "Security warning" : "Cảnh báo bảo mật",
@@ -262,6 +262,7 @@ OC.L10N.register(
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ứng dụng này yêu cầu JavaScript để hoạt động chính xác. Vui lòng {linkstart} bật JavaScript {linkend} và tải lại trang.",
     "More apps" : "Thêm ứng dụng",
     "Search" : "Tìm kiếm",
+    "Reset search" : "Đặt lại tìm kiếm",
     "Confirm your password" : "Xác nhận mật khẩu của bạn",
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index 896fb36966a420bdeef7ab1aa289ee99559950ae..df39b6579884e06d520c1f5505e90e82f3e82c16 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Please select a file." : "Hãy chọn một tệp tin.",
-    "File is too big" : "File quá lớn",
+    "Please select a file." : "Hãy chọn một tệp.",
+    "File is too big" : "Tệp quá lớn",
     "The selected file is not an image." : "Tệp tin được chọn không phải là ảnh.",
     "The selected file cannot be read." : "Tệp tin được chọn không thể đọc.",
     "Invalid file provided" : "File không hợp lệ",
@@ -229,7 +229,7 @@
     "Type: %s" : "Loại: %s",
     "Code: %s" : "Mã: %s",
     "Message: %s" : "Thông điệp:%s",
-    "File: %s" : "%sTệp:",
+    "File: %s" : "Tệp: %s",
     "Line: %s" : "Dòng: %s",
     "Trace" : "Theo dõi",
     "Security warning" : "Cảnh báo bảo mật",
@@ -260,6 +260,7 @@
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ứng dụng này yêu cầu JavaScript để hoạt động chính xác. Vui lòng {linkstart} bật JavaScript {linkend} và tải lại trang.",
     "More apps" : "Thêm ứng dụng",
     "Search" : "Tìm kiếm",
+    "Reset search" : "Đặt lại tìm kiếm",
     "Confirm your password" : "Xác nhận mật khẩu của bạn",
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",