[tx-robot] updated from transifex

56 files changed, 810 insertions, 34 deletions

diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js
index 26a2e48c947..2103b468b8a 100644
--- a/apps/files/l10n/bs.js
+++ b/apps/files/l10n/bs.js
@@ -1,13 +1,34 @@
 OC.L10N.register(
     "files",
     {
+    "Unknown error" : "Nepoznata greška",
+    "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neispravan naziv, '\\', '/', '<', '>', ':', '\"', '|', '?'  i '*' nisu dopušteni.",
+    "No file was uploaded. Unknown error" : "Nijedna datoteka nije učitana. Nepoznata greška.",
+    "There is no error, the file uploaded with success" : "Nema greške, datoteka uspješno učitana.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Učitana datoteka premašuje maksimalnu dopuštenu veličinu datoteke MAX_FILE_SIZE navedene u HTML formi",
+    "The uploaded file was only partially uploaded" : "Učitana datoteka je samo djelomično učitana",
+    "No file was uploaded" : "Nijedna datoteka nije učitana.",
+    "Missing a temporary folder" : "Nedostaje privremeni direktorij.",
+    "Failed to write to disk" : "Zapisivanje na disk nije uspjelo.",
+    "Not enough storage available" : "Prostor za pohranu je nedovoljan",
+    "Favorites" : "Favoriti",
+    "Home" : "Kućni",
+    "Delete" : "Izbriši",
+    "Unshare" : "Prestani dijeliti",
+    "Error" : "Greška",
     "Name" : "Ime",
     "Size" : "Veličina",
     "_%n folder_::_%n folders_" : ["","",""],
     "_%n file_::_%n files_" : ["","",""],
     "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Favorite" : "Favorit",
+    "Upload (max. %s)" : "Učitaj (max. %s)",
     "Save" : "Spasi",
+    "Settings" : "Postavke",
     "New folder" : "Nova fascikla",
-    "Folder" : "Fasikla"
+    "Folder" : "Fasikla",
+    "Upload" : "Učitaj",
+    "Download" : "Preuzmite"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json
index 9f5f58d954a..95b4f8b0289 100644
--- a/apps/files/l10n/bs.json
+++ b/apps/files/l10n/bs.json
@@ -1,11 +1,32 @@
 { "translations": {
+    "Unknown error" : "Nepoznata greška",
+    "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neispravan naziv, '\\', '/', '<', '>', ':', '\"', '|', '?'  i '*' nisu dopušteni.",
+    "No file was uploaded. Unknown error" : "Nijedna datoteka nije učitana. Nepoznata greška.",
+    "There is no error, the file uploaded with success" : "Nema greške, datoteka uspješno učitana.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Učitana datoteka premašuje maksimalnu dopuštenu veličinu datoteke MAX_FILE_SIZE navedene u HTML formi",
+    "The uploaded file was only partially uploaded" : "Učitana datoteka je samo djelomično učitana",
+    "No file was uploaded" : "Nijedna datoteka nije učitana.",
+    "Missing a temporary folder" : "Nedostaje privremeni direktorij.",
+    "Failed to write to disk" : "Zapisivanje na disk nije uspjelo.",
+    "Not enough storage available" : "Prostor za pohranu je nedovoljan",
+    "Favorites" : "Favoriti",
+    "Home" : "Kućni",
+    "Delete" : "Izbriši",
+    "Unshare" : "Prestani dijeliti",
+    "Error" : "Greška",
     "Name" : "Ime",
     "Size" : "Veličina",
     "_%n folder_::_%n folders_" : ["","",""],
     "_%n file_::_%n files_" : ["","",""],
     "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Favorite" : "Favorit",
+    "Upload (max. %s)" : "Učitaj (max. %s)",
     "Save" : "Spasi",
+    "Settings" : "Postavke",
     "New folder" : "Nova fascikla",
-    "Folder" : "Fasikla"
+    "Folder" : "Fasikla",
+    "Upload" : "Učitaj",
+    "Download" : "Preuzmite"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 635c7008a10..f36bd7d4b1b 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Unshare" : "共有解除",
     "Select" : "選択",
     "Pending" : "中断",
+    "Unable to determine date" : "更新日不明",
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
@@ -73,6 +74,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
     "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
     "{dirs} and {files}" : "{dirs} と {files}",
+    "Favorited" : "お気に入り済",
     "Favorite" : "お気に入り",
     "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません",
     "%s could not be renamed" : "%sの名前を変更できませんでした",
@@ -92,10 +94,15 @@ OC.L10N.register(
     "From link" : "リンク",
     "Upload" : "アップロード",
     "Cancel upload" : "アップロードをキャンセル",
+    "No files yet" : "ファイルなし",
+    "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
+    "Select all" : "すべて選択",
     "Download" : "ダウンロード",
     "Upload too large" : "アップロードには大きすぎます。",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
     "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
-    "Currently scanning" : "現在スキャン中"
+    "Currently scanning" : "現在スキャン中",
+    "No favorites" : "お気に入りなし",
+    "Files and folders you mark as favorite will show up here" : "お気に入りに登録されたファイルやフォルダは、ここに表示されます。"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 6f8606d9bad..2cb41a661f2 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -52,6 +52,7 @@
     "Unshare" : "共有解除",
     "Select" : "選択",
     "Pending" : "中断",
+    "Unable to determine date" : "更新日不明",
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
@@ -71,6 +72,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
     "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
     "{dirs} and {files}" : "{dirs} と {files}",
+    "Favorited" : "お気に入り済",
     "Favorite" : "お気に入り",
     "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません",
     "%s could not be renamed" : "%sの名前を変更できませんでした",
@@ -90,10 +92,15 @@
     "From link" : "リンク",
     "Upload" : "アップロード",
     "Cancel upload" : "アップロードをキャンセル",
+    "No files yet" : "ファイルなし",
+    "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
+    "Select all" : "すべて選択",
     "Download" : "ダウンロード",
     "Upload too large" : "アップロードには大きすぎます。",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
     "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
-    "Currently scanning" : "現在スキャン中"
+    "Currently scanning" : "現在スキャン中",
+    "No favorites" : "お気に入りなし",
+    "Files and folders you mark as favorite will show up here" : "お気に入りに登録されたファイルやフォルダは、ここに表示されます。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/bs.js b/apps/files_encryption/l10n/bs.js
new file mode 100644
index 00000000000..29d2d7b47ce
--- /dev/null
+++ b/apps/files_encryption/l10n/bs.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Nepoznata greška",
+    "Disabled" : "Onemogućeno"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_encryption/l10n/bs.json b/apps/files_encryption/l10n/bs.json
new file mode 100644
index 00000000000..47501c496a3
--- /dev/null
+++ b/apps/files_encryption/l10n/bs.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "Nepoznata greška",
+    "Disabled" : "Onemogućeno"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/bs.js b/apps/files_external/l10n/bs.js
index 349554cd2dd..99ba9be44f7 100644
--- a/apps/files_external/l10n/bs.js
+++ b/apps/files_external/l10n/bs.js
@@ -1,7 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Share" : "Podijeli",
-    "Name" : "Ime"
+    "Personal" : "Osobno",
+    "Saved" : "Spremljeno",
+    "Name" : "Ime",
+    "Delete" : "Izbriši"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/bs.json b/apps/files_external/l10n/bs.json
index 123aaea647a..fc99540ecf0 100644
--- a/apps/files_external/l10n/bs.json
+++ b/apps/files_external/l10n/bs.json
@@ -1,5 +1,12 @@
 { "translations": {
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Share" : "Podijeli",
-    "Name" : "Ime"
+    "Personal" : "Osobno",
+    "Saved" : "Spremljeno",
+    "Name" : "Ime",
+    "Delete" : "Izbriši"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 7dd88344d8d..2c21ebe952e 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -30,13 +30,13 @@ OC.L10N.register(
     "Secure ftps://" : "Secure ftps://",
     "Client ID" : "クライアントID",
     "Client secret" : "クライアント秘密キー",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack Object Storage用のオプション)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace Cloud Filesに必須)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack Object Storage用に必要)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack Object Storage用に必要)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack Object Storage用に必要)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack Object Storage用に必要)",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
+    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage用)",
+    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles用)",
+    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage用)",
+    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage用)",
+    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage用)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
     "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
     "Share" : "共有",
     "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用",
@@ -58,6 +58,8 @@ OC.L10N.register(
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
+    "No external storages" : "外部ストレージなし",
+    "You can configure external storages in the personal settings" : "個人設定で外部ストレージを設定することができます。",
     "Name" : "名前",
     "Storage type" : "ストレージ種別",
     "Scope" : "スコープ",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index ecc7e19bb7b..304907b6eea 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -28,13 +28,13 @@
     "Secure ftps://" : "Secure ftps://",
     "Client ID" : "クライアントID",
     "Client secret" : "クライアント秘密キー",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack Object Storage用のオプション)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace Cloud Filesに必須)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack Object Storage用に必要)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack Object Storage用に必要)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack Object Storage用に必要)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack Object Storage用に必要)",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
+    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage用)",
+    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles用)",
+    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage用)",
+    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage用)",
+    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage用)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
     "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
     "Share" : "共有",
     "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用",
@@ -56,6 +56,8 @@
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
+    "No external storages" : "外部ストレージなし",
+    "You can configure external storages in the personal settings" : "個人設定で外部ストレージを設定することができます。",
     "Name" : "名前",
     "Storage type" : "ストレージ種別",
     "Scope" : "スコープ",
diff --git a/apps/files_external/l10n/zh_HK.js b/apps/files_external/l10n/zh_HK.js
index d8446e4dac6..9ad4b8a7bce 100644
--- a/apps/files_external/l10n/zh_HK.js
+++ b/apps/files_external/l10n/zh_HK.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files_external",
     {
     "Port" : "連接埠",
+    "Host" : "主機",
     "Username" : "用戶名稱",
     "Password" : "密碼",
     "Share" : "分享",
diff --git a/apps/files_external/l10n/zh_HK.json b/apps/files_external/l10n/zh_HK.json
index 46d6c0dabe7..955170d618f 100644
--- a/apps/files_external/l10n/zh_HK.json
+++ b/apps/files_external/l10n/zh_HK.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Port" : "連接埠",
+    "Host" : "主機",
     "Username" : "用戶名稱",
     "Password" : "密碼",
     "Share" : "分享",
diff --git a/apps/files_sharing/l10n/bs.js b/apps/files_sharing/l10n/bs.js
index 1be4f1f3fb8..9ff10d77a5b 100644
--- a/apps/files_sharing/l10n/bs.js
+++ b/apps/files_sharing/l10n/bs.js
@@ -1,7 +1,10 @@
 OC.L10N.register(
     "files_sharing",
     {
+    "Cancel" : "Odustani",
     "Shared by" : "Dijeli",
-    "Name" : "Ime"
+    "Password" : "Lozinka",
+    "Name" : "Ime",
+    "Download" : "Preuzmite"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_sharing/l10n/bs.json b/apps/files_sharing/l10n/bs.json
index 48fb8d2209a..c2bfb948e8e 100644
--- a/apps/files_sharing/l10n/bs.json
+++ b/apps/files_sharing/l10n/bs.json
@@ -1,5 +1,8 @@
 { "translations": {
+    "Cancel" : "Odustani",
     "Shared by" : "Dijeli",
-    "Name" : "Ime"
+    "Password" : "Lozinka",
+    "Name" : "Ime",
+    "Download" : "Preuzmite"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index a7ae4987499..4f7885145b0 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -23,9 +23,13 @@ OC.L10N.register(
     "Invalid ownCloud url" : "Invalid ownCloud URL",
     "Shared by" : "Shared by",
     "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
+    "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>",
     "You received a new remote share from %s" : "You received a new remote share from %s",
     "%1$s accepted remote share %2$s" : "%1$s accepted remote share %2$s",
     "%1$s declined remote share %2$s" : "%1$s declined remote share %2$s",
+    "%1$s unshared %2$s from you" : "%1$s unshared %2$s from you",
+    "Public shared folder %1$s was downloaded" : "Public shared folder %1$s was downloaded",
+    "Public shared file %1$s was downloaded" : "Public shared file %1$s was downloaded",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index 71a98749d03..5ef5074334a 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -21,9 +21,13 @@
     "Invalid ownCloud url" : "Invalid ownCloud URL",
     "Shared by" : "Shared by",
     "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
+    "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>",
     "You received a new remote share from %s" : "You received a new remote share from %s",
     "%1$s accepted remote share %2$s" : "%1$s accepted remote share %2$s",
     "%1$s declined remote share %2$s" : "%1$s declined remote share %2$s",
+    "%1$s unshared %2$s from you" : "%1$s unshared %2$s from you",
+    "Public shared folder %1$s was downloaded" : "Public shared folder %1$s was downloaded",
+    "Public shared file %1$s was downloaded" : "Public shared file %1$s was downloaded",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 382c7fb2b4b..114566d5709 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -8,6 +8,12 @@ OC.L10N.register(
     "Shared with you" : "他ユーザーがあなたと共有中",
     "Shared with others" : "他ユーザーと共有中",
     "Shared by link" : "URLリンクで共有中",
+    "Nothing shared with you yet" : "あなたと共有しているファイルはありません。",
+    "Files and folders others share with you will show up here" : "他の人から共有されたファイルやフォルダは、ここに表示されます。",
+    "Nothing shared yet" : "まだ何も共有されていません",
+    "Files and folders you share will show up here" : "共有したファイルやフォルダは、ここに表示されます。",
+    "No shared links" : "共有リンクはありません",
+    "Files and folders you share by link will show up here" : "リンクで共有したファイルやフォルダは、ここに表示されます。",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote} からリモート共有 {name} を追加してもよろしいですか？",
     "Remote share" : "リモート共有",
     "Remote share password" : "リモート共有のパスワード",
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 91f46d8c182..0a8c04741fc 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -6,6 +6,12 @@
     "Shared with you" : "他ユーザーがあなたと共有中",
     "Shared with others" : "他ユーザーと共有中",
     "Shared by link" : "URLリンクで共有中",
+    "Nothing shared with you yet" : "あなたと共有しているファイルはありません。",
+    "Files and folders others share with you will show up here" : "他の人から共有されたファイルやフォルダは、ここに表示されます。",
+    "Nothing shared yet" : "まだ何も共有されていません",
+    "Files and folders you share will show up here" : "共有したファイルやフォルダは、ここに表示されます。",
+    "No shared links" : "共有リンクはありません",
+    "Files and folders you share by link will show up here" : "リンクで共有したファイルやフォルダは、ここに表示されます。",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote} からリモート共有 {name} を追加してもよろしいですか？",
     "Remote share" : "リモート共有",
     "Remote share password" : "リモート共有のパスワード",
diff --git a/apps/files_trashbin/l10n/bs.js b/apps/files_trashbin/l10n/bs.js
index 70b584f2951..94346863df6 100644
--- a/apps/files_trashbin/l10n/bs.js
+++ b/apps/files_trashbin/l10n/bs.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_trashbin",
     {
-    "Name" : "Ime"
+    "Restore" : "Obnovi",
+    "Error" : "Greška",
+    "Name" : "Ime",
+    "Delete" : "Izbriši"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_trashbin/l10n/bs.json b/apps/files_trashbin/l10n/bs.json
index b91bf025992..bf7cf4813e4 100644
--- a/apps/files_trashbin/l10n/bs.json
+++ b/apps/files_trashbin/l10n/bs.json
@@ -1,4 +1,7 @@
 { "translations": {
-    "Name" : "Ime"
+    "Restore" : "Obnovi",
+    "Error" : "Greška",
+    "Name" : "Ime",
+    "Delete" : "Izbriši"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ja.js b/apps/files_trashbin/l10n/ja.js
index 84eed759182..1ec56e8d2fa 100644
--- a/apps/files_trashbin/l10n/ja.js
+++ b/apps/files_trashbin/l10n/ja.js
@@ -8,6 +8,9 @@ OC.L10N.register(
     "Delete permanently" : "完全に削除する",
     "Error" : "エラー",
     "restored" : "復元済",
+    "No deleted files" : "削除されたファイルはありません",
+    "You will be able to recover deleted files from here" : "ここから削除されたファイルを元に戻すことができます。",
+    "Select all" : "すべて選択",
     "Name" : "名前",
     "Deleted" : "削除日時",
     "Delete" : "削除"
diff --git a/apps/files_trashbin/l10n/ja.json b/apps/files_trashbin/l10n/ja.json
index 83f27e4a470..2da8c5af5ba 100644
--- a/apps/files_trashbin/l10n/ja.json
+++ b/apps/files_trashbin/l10n/ja.json
@@ -6,6 +6,9 @@
     "Delete permanently" : "完全に削除する",
     "Error" : "エラー",
     "restored" : "復元済",
+    "No deleted files" : "削除されたファイルはありません",
+    "You will be able to recover deleted files from here" : "ここから削除されたファイルを元に戻すことができます。",
+    "Select all" : "すべて選択",
     "Name" : "名前",
     "Deleted" : "削除日時",
     "Delete" : "削除"
diff --git a/apps/files_versions/l10n/bs.js b/apps/files_versions/l10n/bs.js
new file mode 100644
index 00000000000..21e9851b64c
--- /dev/null
+++ b/apps/files_versions/l10n/bs.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Nije moguće vratiti: %s",
+    "Versions" : "Verzije",
+    "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
+    "More versions..." : "Više verzija...",
+    "No other versions available" : "Druge verzije su nedostupne",
+    "Restore" : "Obnovi"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/bs.json b/apps/files_versions/l10n/bs.json
new file mode 100644
index 00000000000..1bc885614ed
--- /dev/null
+++ b/apps/files_versions/l10n/bs.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Nije moguće vratiti: %s",
+    "Versions" : "Verzije",
+    "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
+    "More versions..." : "Više verzija...",
+    "No other versions available" : "Druge verzije su nedostupne",
+    "Restore" : "Obnovi"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bs.js b/apps/user_ldap/l10n/bs.js
index feccd314874..dbcdcc6d386 100644
--- a/apps/user_ldap/l10n/bs.js
+++ b/apps/user_ldap/l10n/bs.js
@@ -1,8 +1,14 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Deletion failed" : "Brisanje nije uspjelo",
+    "Error" : "Greška",
     "_%s group found_::_%s groups found_" : ["","",""],
     "_%s user found_::_%s users found_" : ["","",""],
-    "Save" : "Spasi"
+    "Save" : "Spasi",
+    "Help" : "Pomoć",
+    "Password" : "Lozinka",
+    "Continue" : "Nastavi",
+    "Advanced" : "Napredno"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_ldap/l10n/bs.json b/apps/user_ldap/l10n/bs.json
index 42f5ec1bffc..69701220561 100644
--- a/apps/user_ldap/l10n/bs.json
+++ b/apps/user_ldap/l10n/bs.json
@@ -1,6 +1,12 @@
 { "translations": {
+    "Deletion failed" : "Brisanje nije uspjelo",
+    "Error" : "Greška",
     "_%s group found_::_%s groups found_" : ["","",""],
     "_%s user found_::_%s users found_" : ["","",""],
-    "Save" : "Spasi"
+    "Save" : "Spasi",
+    "Help" : "Pomoć",
+    "Password" : "Lozinka",
+    "Continue" : "Nastavi",
+    "Advanced" : "Napredno"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/zh_HK.js b/apps/user_ldap/l10n/zh_HK.js
index 27ecbc63e53..2bd0061ab7a 100644
--- a/apps/user_ldap/l10n/zh_HK.js
+++ b/apps/user_ldap/l10n/zh_HK.js
@@ -1,14 +1,26 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Keep settings?" : "儲存設定？",
+    "{nthServer}. Server" : "{nthServer}. 伺服器",
     "Success" : "成功",
     "Error" : "錯誤",
-    "_%s group found_::_%s groups found_" : [""],
-    "_%s user found_::_%s users found_" : [""],
+    "Select groups" : "選擇群組",
+    "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
+    "_%s user found_::_%s users found_" : ["找到 %s 用戶"],
+    "Server" : "伺服器",
     "Save" : "儲存",
+    "Test Configuration" : "測試配置",
     "Help" : "幫助",
+    "1. Server" : "1. 伺服器",
+    "%s. Server:" : "%s. 伺服器：",
+    "Host" : "主機",
     "Port" : "連接埠",
     "Password" : "密碼",
+    "Saving" : "儲存中",
+    "Back" : "返回",
+    "Continue" : "繼續",
+    "LDAP" : "LDAP",
     "Advanced" : "進階"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/zh_HK.json b/apps/user_ldap/l10n/zh_HK.json
index d75229ec90e..5e350517a36 100644
--- a/apps/user_ldap/l10n/zh_HK.json
+++ b/apps/user_ldap/l10n/zh_HK.json
@@ -1,12 +1,24 @@
 { "translations": {
+    "Keep settings?" : "儲存設定？",
+    "{nthServer}. Server" : "{nthServer}. 伺服器",
     "Success" : "成功",
     "Error" : "錯誤",
-    "_%s group found_::_%s groups found_" : [""],
-    "_%s user found_::_%s users found_" : [""],
+    "Select groups" : "選擇群組",
+    "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
+    "_%s user found_::_%s users found_" : ["找到 %s 用戶"],
+    "Server" : "伺服器",
     "Save" : "儲存",
+    "Test Configuration" : "測試配置",
     "Help" : "幫助",
+    "1. Server" : "1. 伺服器",
+    "%s. Server:" : "%s. 伺服器：",
+    "Host" : "主機",
     "Port" : "連接埠",
     "Password" : "密碼",
+    "Saving" : "儲存中",
+    "Back" : "返回",
+    "Continue" : "繼續",
+    "LDAP" : "LDAP",
     "Advanced" : "進階"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index 5e6159cd565..c9f8a9ea5a6 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -6,19 +6,207 @@ OC.L10N.register(
     "Turned off maintenance mode" : "Ugašen modus održavanja",
     "Updated database" : "Aktualizirana baza podataka",
     "Checked database schema update" : "Provjereno aktualiziranje šeme baze podataka",
+    "Checked database schema update for apps" : "Provjereno ažuriranje šeme baze podataka za aplikacije",
     "Updated \"%s\" to %s" : "Aktualizirano \"%s\" do %s",
     "Disabled incompatible apps: %s" : "Deaktivirane nekompatibilne aplikacije: %s",
     "No image or file provided" : "Ne postoji predviđena slika ili datoteka",
     "Unknown filetype" : "Nepoznat tip datoteke",
     "Invalid image" : "Nevažeća datoteka",
+    "No temporary profile picture available, try again" : "Trenutna slika profila nije dostupna, pokušajte ponovo",
     "Sunday" : "Nedjelja",
     "Monday" : "Ponedjeljak",
     "Tuesday" : "Utorak",
     "Wednesday" : "Srijeda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mart",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Avgust",
+    "September" : "Septembar",
+    "October" : "Oktobar",
+    "November" : "Novembar",
+    "December" : "Decembar",
+    "Settings" : "Postavke",
     "Saving..." : "Spašavam...",
+    "Couldn't send reset email. Please contact your administrator." : "Slanje emaila resetovanja nije moguće. Molim kontaktirajte administratora.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetovanje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite u nekom razumnom vremenskom roku, provjerite svoje spam/junk direktorij. <br> Ako nije tamo, kontaktirajte vašeg lokalnog administratora.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali povratni ključ, neećete imati mogućnost povratka vaših podataka nakon što vaša lozinka bude resetovana.<br />Ako niste sigurni šta učiniti, prije nego nastavite, molimo kontaktirajte vašeg administratora. <br />Želite li zaista nastaviti?",
+    "I know what I'm doing" : "Ja znam šta radim",
+    "Password can not be changed. Please contact your administrator." : "Lozinku ne može biti promjenuta. Molimo kontaktirajte vašeg administratora.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izaberite",
+    "Error loading file picker template: {error}" : "Pogrešno učitavanje šablona za izabir datoteke: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Pogrešno učitavanje šablona za poruke: {error}",
+    "read-only" : "samo-čitljivo",
     "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "One file conflict" : "Konflikt jedne datoteke",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Postojeće datoteke",
+    "Which files do you want to keep?" : "Koje datoteke želite zadržati?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ako odaberete obe verzije, kopirana datoteka će imati broj dodan uz njeno ime.",
+    "Cancel" : "Odustani",
+    "Continue" : "Nastavi",
+    "(all selected)" : "(sve odabrano)",
+    "({count} selected)" : "({count} odabranih)",
+    "Error loading file exists template" : "Pogrešno učitavanje postojece datoteke šablona",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Tu-i-tamo lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Vaš web server još nije valjano podešen da bi omogućio sinkronizaciju datoteka jer izgleda da je WebDAV sučelje neispravno.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ovaj server nema uspostavljenu internet konekciju. To znači da neke od njegovih funkcija poput spajanje na vanjsku memoriju, obavještavanje o ažuriranju ili instalaciji aplikacija 3će strane neće raditi. Također, možda je onemogućen daljinski pristup datotekama i slanje obavještajne e-pošte. Savjetujemo uspostavljanje internet konekcije za ovaj server u koliko želite sve njegove funkcije.",
+    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Vaš direktorij podataka i vaše datoteke su vjerovatno dostupne s interneta. Datoteka .htaccess ne radi. Strogo vam preporučujemo da vaš web server konfigurišete tako da je pristup direktoriju podataka nemoguć ili čak direktorij podataka premjestite izvan korijenskog/početnog direktorija web servera.",
+    "Error occurred while checking server setup" : "Došlo je do pogreške prilikom provjere serverskih postavki",
+    "Shared" : "Podijeljen",
+    "Shared with {recipients}" : "Podijeljen sa {recipients}",
     "Share" : "Podijeli",
+    "Error" : "Greška",
+    "Error while sharing" : "Greška pri dijeljenju",
+    "Error while unsharing" : "Ggreška pri prestanku dijeljenja",
+    "Error while changing permissions" : "Greška pri mijenjanju dozvola",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
+    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
+    "Share link" : "Podijelite vezu",
+    "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Link" : "Veza",
+    "Password protect" : "Zaštitita lozinkom",
+    "Password" : "Lozinka",
+    "Choose a password for the public link" : "Izaberite lozinku za javnu vezu",
+    "Allow editing" : "Dozvolite izmjenu",
+    "Email link to person" : "Pošaljite osobi vezu e-poštom",
+    "Send" : "Pošalji",
+    "Set expiration date" : "Postavite datum isteka",
+    "Expiration" : "Istek",
+    "Expiration date" : "Datum isteka",
+    "Adding user..." : "Dodavanje korisnika...",
+    "group" : "grupa",
+    "remote" : "daljinski",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+    "Unshare" : "Prestani dijeliti",
+    "notify by email" : "Obavijesti e-poštom",
+    "can share" : "može dijeliti",
+    "can edit" : "moće mijenjati",
+    "access control" : "Kontrola pristupa",
+    "create" : "kreiraj",
+    "change" : "izmjeni",
+    "delete" : "izbriši",
+    "Password protected" : "Zaštićeno lozinkom",
+    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
+    "Error setting expiration date" : "Pogrešno postavljanje datuma isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Vrsta objekta nije određena.",
+    "Enter new" : "Unesi novi",
+    "Delete" : "Izbriši",
     "Add" : "Dodaj",
-    "_download %n file_::_download %n files_" : ["","",""]
+    "Edit tags" : "Izmjeni oznake",
+    "Error loading dialog template: {error}" : "Pogrešno učitavanje šablona dijaloga: {error}",
+    "No tags selected for deletion." : "Nema odabranih oznaka za brisanje.",
+    "unknown text" : "nepoznat tekst",
+    "Hello world!" : "Halo svijete!",
+    "sunny" : "sunčan",
+    "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}",
+    "_download %n file_::_download %n files_" : ["","",""],
+    "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
+    "Please reload the page." : "Molim, ponovno učitajte stranicu",
+    "The update was unsuccessful. " : "Ažuriranje nije uspjelo.",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Preusmjeravam vas na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nemoguće resetiranje lozinke jer znak nije validan.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Slanje emaila resetovanja nije moguće. Osigurajte se da vam je ispravno korisničko ime.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Slanje emaila resetovanja nije moguće jer za ovo korisničko ime ne postoji email adresa. Molim, kontaktirajte administratora.",
+    "%s password reset" : "%s lozinka resetovana",
+    "Use the following link to reset your password: {link}" : "Za resetovanje vaše lozinke koristite slijedeću vezu: {link}",
+    "New password" : "Nova lozinka",
+    "New Password" : "Nova Lozinka",
+    "Reset password" : "Resetuj lozinku",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba. Korištenje na vlastiti rizik!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Umjesto toga, za najbolje rezultate, molimo razmislite o mogućnosti korištenje GNU/Linux servera.",
+    "Please remove the open_basedir setting within your php.ini or switch to  64bit PHP." : "Molim odstranite open_basedir postavku iz vaše php.ini ili prebacite na 64bit PHP.",
+    "Please install the cURL extension and restart your webserver." : "Molim instalirajte cURL proširenje i ponovo pokrenite svoj server.",
+    "Personal" : "Osobno",
+    "Users" : "Korisnici",
+    "Apps" : "Aplikacije",
+    "Admin" : "Admin",
+    "Help" : "Pomoć",
+    "Error loading tags" : "Greška pri učitavanju oznaka",
+    "Tag already exists" : "Oznaka već postoji",
+    "Error deleting tag(s)" : "Greška pri brisanju znaka(ova)",
+    "Error tagging" : "Greška pri označavanju",
+    "Error untagging" : "Greška pri uklanjanju oznaka",
+    "Error favoriting" : "Greška pri dodavanju u favorite",
+    "Error unfavoriting" : "Greška pri uklanjanju iz favorita",
+    "Access forbidden" : "Zabranjen pristup",
+    "File not found" : "Datoteka nije pronađena",
+    "The specified document has not been found on the server." : "Odabran dokument nije pronađen na serveru.",
+    "You can click here to return to %s." : "Možete kliknuti ovdje da bih se vratili na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej,\n\nsamo da javim da je %s podjelio(la) %s s vama.\nPosjeti: %s\n\n",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
+    "Internal Server Error" : "Unutarnja Server Greška",
+    "More details can be found in the server log." : "Više detalja se mogu naći u server zapisu (log).",
+    "Technical details" : "Tehnički detalji",
+    "Request ID: %s" : "Zahtjevaj ID: %s",
+    "Code: %s" : "Kod (Code): %s",
+    "Message: %s" : "Poruka: %s",
+    "File: %s" : "Datoteka: %s",
+    "Line: %s" : "Red: %s",
+    "Security Warning" : "Sigurnosno Upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Molim aktualizirajte vašu PHP instalaciju da bih sigurno koistili %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaš direktorij podataka i datoteke vjerojatno se mogu pristupiti s interneta jer .htaccess datoteka ne radi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informacije kako da valjano konfigurišete vaš server, molim pogledajte <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
+    "Create an <strong>admin account</strong>" : "Kreirajte <strong>administracioni račun</strong>",
+    "Username" : "Korisničko ime",
+    "Storage & database" : "Pohrana & baza podataka",
+    "Data folder" : "Direktorij podataka",
+    "Configure the database" : "Konfigurišite bazu podataka",
+    "Only %s is available." : "Samo %s je dostupno.",
+    "Database user" : "Korisnik baze podataka",
+    "Database password" : "Lozinka baze podataka",
+    "Database name" : "Naziv baze podataka",
+    "Database tablespace" : "Tablespace (?) baze podataka",
+    "Database host" : "Glavno računalo (host) baze podataka",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
+    "Finish setup" : "Završite postavke",
+    "Finishing …" : "Završavanje...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
+    "%s is available. Get more information on how to update." : "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
+    "Log out" : "Odjava",
+    "Search" : "Potraži",
+    "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
+    "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
+    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetujte ju!",
+    "remember" : "zapamti",
+    "Log in" : "Prijava",
+    "Alternative Logins" : "Alternativne Prijave",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u jednokorisničkom načinu rada.",
+    "This means only administrators can use the instance." : "To znači da tu instancu mogu koristiti samo administratori.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktirajte svog administratora sistema ako se ova poruka ponavlja ili se pojavila neočekivano.",
+    "Thank you for your patience." : "Hvala vam na strpljenju",
+    "You are accessing the server from an untrusted domain." : "Pristupate serveru sa nepouzdane domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molim kontaktirajte vašeg administratora. Ako ste vi administrator ove instance, konfigurišite postavku \"trusted_domain\" u config/config.php. Primjer konfiguracije ponuđen je u config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristiti dugme ispod za povjeru toj domeni.",
+    "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao povjerenu/pouzdanu domenu.",
+    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
+    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene:",
+    "The theme %s has been disabled." : "Tema %s je onemogućena",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego nastavite, molim osigurajte se da su baza podataka, direktorij konfiguracije i direktorij podataka sigurnosno kopirani.",
+    "Start update" : "Započnite ažuriranje",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenuti slijedeću naredbu iz svoga instalacijskog direktorija:",
+    "This %s instance is currently being updated, which may take a while." : "Instanca %s se trenutno ažurira, što može potrajati.",
+    "This page will refresh itself when the %s instance is available again." : "Ova stranica će se sama aktualizirati nakon što instanca %s postane ponovo dostupna."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index 3908dc84fe3..44eb1cd99a6 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -4,19 +4,207 @@
     "Turned off maintenance mode" : "Ugašen modus održavanja",
     "Updated database" : "Aktualizirana baza podataka",
     "Checked database schema update" : "Provjereno aktualiziranje šeme baze podataka",
+    "Checked database schema update for apps" : "Provjereno ažuriranje šeme baze podataka za aplikacije",
     "Updated \"%s\" to %s" : "Aktualizirano \"%s\" do %s",
     "Disabled incompatible apps: %s" : "Deaktivirane nekompatibilne aplikacije: %s",
     "No image or file provided" : "Ne postoji predviđena slika ili datoteka",
     "Unknown filetype" : "Nepoznat tip datoteke",
     "Invalid image" : "Nevažeća datoteka",
+    "No temporary profile picture available, try again" : "Trenutna slika profila nije dostupna, pokušajte ponovo",
     "Sunday" : "Nedjelja",
     "Monday" : "Ponedjeljak",
     "Tuesday" : "Utorak",
     "Wednesday" : "Srijeda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mart",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Avgust",
+    "September" : "Septembar",
+    "October" : "Oktobar",
+    "November" : "Novembar",
+    "December" : "Decembar",
+    "Settings" : "Postavke",
     "Saving..." : "Spašavam...",
+    "Couldn't send reset email. Please contact your administrator." : "Slanje emaila resetovanja nije moguće. Molim kontaktirajte administratora.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetovanje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite u nekom razumnom vremenskom roku, provjerite svoje spam/junk direktorij. <br> Ako nije tamo, kontaktirajte vašeg lokalnog administratora.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali povratni ključ, neećete imati mogućnost povratka vaših podataka nakon što vaša lozinka bude resetovana.<br />Ako niste sigurni šta učiniti, prije nego nastavite, molimo kontaktirajte vašeg administratora. <br />Želite li zaista nastaviti?",
+    "I know what I'm doing" : "Ja znam šta radim",
+    "Password can not be changed. Please contact your administrator." : "Lozinku ne može biti promjenuta. Molimo kontaktirajte vašeg administratora.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izaberite",
+    "Error loading file picker template: {error}" : "Pogrešno učitavanje šablona za izabir datoteke: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Pogrešno učitavanje šablona za poruke: {error}",
+    "read-only" : "samo-čitljivo",
     "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "One file conflict" : "Konflikt jedne datoteke",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Postojeće datoteke",
+    "Which files do you want to keep?" : "Koje datoteke želite zadržati?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ako odaberete obe verzije, kopirana datoteka će imati broj dodan uz njeno ime.",
+    "Cancel" : "Odustani",
+    "Continue" : "Nastavi",
+    "(all selected)" : "(sve odabrano)",
+    "({count} selected)" : "({count} odabranih)",
+    "Error loading file exists template" : "Pogrešno učitavanje postojece datoteke šablona",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Tu-i-tamo lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Vaš web server još nije valjano podešen da bi omogućio sinkronizaciju datoteka jer izgleda da je WebDAV sučelje neispravno.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ovaj server nema uspostavljenu internet konekciju. To znači da neke od njegovih funkcija poput spajanje na vanjsku memoriju, obavještavanje o ažuriranju ili instalaciji aplikacija 3će strane neće raditi. Također, možda je onemogućen daljinski pristup datotekama i slanje obavještajne e-pošte. Savjetujemo uspostavljanje internet konekcije za ovaj server u koliko želite sve njegove funkcije.",
+    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Vaš direktorij podataka i vaše datoteke su vjerovatno dostupne s interneta. Datoteka .htaccess ne radi. Strogo vam preporučujemo da vaš web server konfigurišete tako da je pristup direktoriju podataka nemoguć ili čak direktorij podataka premjestite izvan korijenskog/početnog direktorija web servera.",
+    "Error occurred while checking server setup" : "Došlo je do pogreške prilikom provjere serverskih postavki",
+    "Shared" : "Podijeljen",
+    "Shared with {recipients}" : "Podijeljen sa {recipients}",
     "Share" : "Podijeli",
+    "Error" : "Greška",
+    "Error while sharing" : "Greška pri dijeljenju",
+    "Error while unsharing" : "Ggreška pri prestanku dijeljenja",
+    "Error while changing permissions" : "Greška pri mijenjanju dozvola",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
+    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
+    "Share link" : "Podijelite vezu",
+    "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Link" : "Veza",
+    "Password protect" : "Zaštitita lozinkom",
+    "Password" : "Lozinka",
+    "Choose a password for the public link" : "Izaberite lozinku za javnu vezu",
+    "Allow editing" : "Dozvolite izmjenu",
+    "Email link to person" : "Pošaljite osobi vezu e-poštom",
+    "Send" : "Pošalji",
+    "Set expiration date" : "Postavite datum isteka",
+    "Expiration" : "Istek",
+    "Expiration date" : "Datum isteka",
+    "Adding user..." : "Dodavanje korisnika...",
+    "group" : "grupa",
+    "remote" : "daljinski",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+    "Unshare" : "Prestani dijeliti",
+    "notify by email" : "Obavijesti e-poštom",
+    "can share" : "može dijeliti",
+    "can edit" : "moće mijenjati",
+    "access control" : "Kontrola pristupa",
+    "create" : "kreiraj",
+    "change" : "izmjeni",
+    "delete" : "izbriši",
+    "Password protected" : "Zaštićeno lozinkom",
+    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
+    "Error setting expiration date" : "Pogrešno postavljanje datuma isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Vrsta objekta nije određena.",
+    "Enter new" : "Unesi novi",
+    "Delete" : "Izbriši",
     "Add" : "Dodaj",
-    "_download %n file_::_download %n files_" : ["","",""]
+    "Edit tags" : "Izmjeni oznake",
+    "Error loading dialog template: {error}" : "Pogrešno učitavanje šablona dijaloga: {error}",
+    "No tags selected for deletion." : "Nema odabranih oznaka za brisanje.",
+    "unknown text" : "nepoznat tekst",
+    "Hello world!" : "Halo svijete!",
+    "sunny" : "sunčan",
+    "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}",
+    "_download %n file_::_download %n files_" : ["","",""],
+    "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
+    "Please reload the page." : "Molim, ponovno učitajte stranicu",
+    "The update was unsuccessful. " : "Ažuriranje nije uspjelo.",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Preusmjeravam vas na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nemoguće resetiranje lozinke jer znak nije validan.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Slanje emaila resetovanja nije moguće. Osigurajte se da vam je ispravno korisničko ime.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Slanje emaila resetovanja nije moguće jer za ovo korisničko ime ne postoji email adresa. Molim, kontaktirajte administratora.",
+    "%s password reset" : "%s lozinka resetovana",
+    "Use the following link to reset your password: {link}" : "Za resetovanje vaše lozinke koristite slijedeću vezu: {link}",
+    "New password" : "Nova lozinka",
+    "New Password" : "Nova Lozinka",
+    "Reset password" : "Resetuj lozinku",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba. Korištenje na vlastiti rizik!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Umjesto toga, za najbolje rezultate, molimo razmislite o mogućnosti korištenje GNU/Linux servera.",
+    "Please remove the open_basedir setting within your php.ini or switch to  64bit PHP." : "Molim odstranite open_basedir postavku iz vaše php.ini ili prebacite na 64bit PHP.",
+    "Please install the cURL extension and restart your webserver." : "Molim instalirajte cURL proširenje i ponovo pokrenite svoj server.",
+    "Personal" : "Osobno",
+    "Users" : "Korisnici",
+    "Apps" : "Aplikacije",
+    "Admin" : "Admin",
+    "Help" : "Pomoć",
+    "Error loading tags" : "Greška pri učitavanju oznaka",
+    "Tag already exists" : "Oznaka već postoji",
+    "Error deleting tag(s)" : "Greška pri brisanju znaka(ova)",
+    "Error tagging" : "Greška pri označavanju",
+    "Error untagging" : "Greška pri uklanjanju oznaka",
+    "Error favoriting" : "Greška pri dodavanju u favorite",
+    "Error unfavoriting" : "Greška pri uklanjanju iz favorita",
+    "Access forbidden" : "Zabranjen pristup",
+    "File not found" : "Datoteka nije pronađena",
+    "The specified document has not been found on the server." : "Odabran dokument nije pronađen na serveru.",
+    "You can click here to return to %s." : "Možete kliknuti ovdje da bih se vratili na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej,\n\nsamo da javim da je %s podjelio(la) %s s vama.\nPosjeti: %s\n\n",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
+    "Internal Server Error" : "Unutarnja Server Greška",
+    "More details can be found in the server log." : "Više detalja se mogu naći u server zapisu (log).",
+    "Technical details" : "Tehnički detalji",
+    "Request ID: %s" : "Zahtjevaj ID: %s",
+    "Code: %s" : "Kod (Code): %s",
+    "Message: %s" : "Poruka: %s",
+    "File: %s" : "Datoteka: %s",
+    "Line: %s" : "Red: %s",
+    "Security Warning" : "Sigurnosno Upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Molim aktualizirajte vašu PHP instalaciju da bih sigurno koistili %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaš direktorij podataka i datoteke vjerojatno se mogu pristupiti s interneta jer .htaccess datoteka ne radi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informacije kako da valjano konfigurišete vaš server, molim pogledajte <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
+    "Create an <strong>admin account</strong>" : "Kreirajte <strong>administracioni račun</strong>",
+    "Username" : "Korisničko ime",
+    "Storage & database" : "Pohrana & baza podataka",
+    "Data folder" : "Direktorij podataka",
+    "Configure the database" : "Konfigurišite bazu podataka",
+    "Only %s is available." : "Samo %s je dostupno.",
+    "Database user" : "Korisnik baze podataka",
+    "Database password" : "Lozinka baze podataka",
+    "Database name" : "Naziv baze podataka",
+    "Database tablespace" : "Tablespace (?) baze podataka",
+    "Database host" : "Glavno računalo (host) baze podataka",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
+    "Finish setup" : "Završite postavke",
+    "Finishing …" : "Završavanje...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
+    "%s is available. Get more information on how to update." : "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
+    "Log out" : "Odjava",
+    "Search" : "Potraži",
+    "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
+    "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
+    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetujte ju!",
+    "remember" : "zapamti",
+    "Log in" : "Prijava",
+    "Alternative Logins" : "Alternativne Prijave",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u jednokorisničkom načinu rada.",
+    "This means only administrators can use the instance." : "To znači da tu instancu mogu koristiti samo administratori.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktirajte svog administratora sistema ako se ova poruka ponavlja ili se pojavila neočekivano.",
+    "Thank you for your patience." : "Hvala vam na strpljenju",
+    "You are accessing the server from an untrusted domain." : "Pristupate serveru sa nepouzdane domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molim kontaktirajte vašeg administratora. Ako ste vi administrator ove instance, konfigurišite postavku \"trusted_domain\" u config/config.php. Primjer konfiguracije ponuđen je u config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristiti dugme ispod za povjeru toj domeni.",
+    "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao povjerenu/pouzdanu domenu.",
+    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
+    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene:",
+    "The theme %s has been disabled." : "Tema %s je onemogućena",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego nastavite, molim osigurajte se da su baza podataka, direktorij konfiguracije i direktorij podataka sigurnosno kopirani.",
+    "Start update" : "Započnite ažuriranje",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenuti slijedeću naredbu iz svoga instalacijskog direktorija:",
+    "This %s instance is currently being updated, which may take a while." : "Instanca %s se trenutno ažurira, što može potrajati.",
+    "This page will refresh itself when the %s instance is available again." : "Ova stranica će se sama aktualizirati nakon što instanca %s postane ponovo dostupna."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index b3410b4e006..7b1459906b4 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -83,6 +83,7 @@ OC.L10N.register(
     "Password protect" : "Password protect",
     "Password" : "Password",
     "Choose a password for the public link" : "Choose a password for the public link",
+    "Allow editing" : "Allow editing",
     "Email link to person" : "Email link to person",
     "Send" : "Send",
     "Set expiration date" : "Set expiration date",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Expiration date" : "Expiration date",
     "Adding user..." : "Adding user...",
     "group" : "group",
+    "remote" : "remote",
     "Resharing is not allowed" : "Resharing is not allowed",
     "Shared in {item} with {user}" : "Shared in {item} with {user}",
     "Unshare" : "Unshare",
@@ -98,6 +100,7 @@ OC.L10N.register(
     "can edit" : "can edit",
     "access control" : "access control",
     "create" : "create",
+    "change" : "change",
     "delete" : "delete",
     "Password protected" : "Password protected",
     "Error unsetting expiration date" : "Error unsetting expiration date",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index ae34c515b86..754c8a5733e 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -81,6 +81,7 @@
     "Password protect" : "Password protect",
     "Password" : "Password",
     "Choose a password for the public link" : "Choose a password for the public link",
+    "Allow editing" : "Allow editing",
     "Email link to person" : "Email link to person",
     "Send" : "Send",
     "Set expiration date" : "Set expiration date",
@@ -88,6 +89,7 @@
     "Expiration date" : "Expiration date",
     "Adding user..." : "Adding user...",
     "group" : "group",
+    "remote" : "remote",
     "Resharing is not allowed" : "Resharing is not allowed",
     "Shared in {item} with {user}" : "Shared in {item} with {user}",
     "Unshare" : "Unshare",
@@ -96,6 +98,7 @@
     "can edit" : "can edit",
     "access control" : "access control",
     "create" : "create",
+    "change" : "change",
     "delete" : "delete",
     "Password protected" : "Password protected",
     "Error unsetting expiration date" : "Error unsetting expiration date",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index cc55c685c67..25af7e3cc5f 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -79,9 +79,11 @@ OC.L10N.register(
     "Share with user or group …" : "Compartido con el usuario o con el grupo ...",
     "Share link" : "Enlace compartido",
     "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado",
+    "Link" : "Enlace",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
     "Choose a password for the public link" : "Elija una contraseña para el enlace publico",
+    "Allow editing" : "Permitir edición",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
     "Set expiration date" : "Establecer fecha de caducidad",
@@ -89,6 +91,7 @@ OC.L10N.register(
     "Expiration date" : "Fecha de caducidad",
     "Adding user..." : "Añadiendo usuario...",
     "group" : "grupo",
+    "remote" : "remoto",
     "Resharing is not allowed" : "No se permite compartir de nuevo",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
     "Unshare" : "Dejar de compartir",
@@ -97,6 +100,7 @@ OC.L10N.register(
     "can edit" : "puede editar",
     "access control" : "control de acceso",
     "create" : "crear",
+    "change" : "cambio",
     "delete" : "eliminar",
     "Password protected" : "Protegido con contraseña",
     "Error unsetting expiration date" : "Error eliminando fecha de caducidad",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index b82db999065..e348a3a3ab7 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -77,9 +77,11 @@
     "Share with user or group …" : "Compartido con el usuario o con el grupo ...",
     "Share link" : "Enlace compartido",
     "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado",
+    "Link" : "Enlace",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
     "Choose a password for the public link" : "Elija una contraseña para el enlace publico",
+    "Allow editing" : "Permitir edición",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
     "Set expiration date" : "Establecer fecha de caducidad",
@@ -87,6 +89,7 @@
     "Expiration date" : "Fecha de caducidad",
     "Adding user..." : "Añadiendo usuario...",
     "group" : "grupo",
+    "remote" : "remoto",
     "Resharing is not allowed" : "No se permite compartir de nuevo",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
     "Unshare" : "Dejar de compartir",
@@ -95,6 +98,7 @@
     "can edit" : "puede editar",
     "access control" : "control de acceso",
     "create" : "crear",
+    "change" : "cambio",
     "delete" : "eliminar",
     "Password protected" : "Protegido con contraseña",
     "Error unsetting expiration date" : "Error eliminando fecha de caducidad",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index eb54002f65a..2e9557fe25d 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Error loading file picker template: {error}" : "ファイル選択テンプレートの読み込みエラー: {error}",
     "Ok" : "OK",
     "Error loading message template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "read-only" : "読み取り専用",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} ファイルが競合"],
     "One file conflict" : "1ファイルが競合",
     "New Files" : "新しいファイル",
@@ -78,9 +79,11 @@ OC.L10N.register(
     "Share with user or group …" : "ユーザーもしくはグループと共有 ...",
     "Share link" : "URLで共有",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Link" : "リンク",
     "Password protect" : "パスワード保護を有効化",
     "Password" : "パスワード",
     "Choose a password for the public link" : "URLによる共有のパスワードを入力",
+    "Allow editing" : "編集許可",
     "Email link to person" : "メールリンク",
     "Send" : "送信",
     "Set expiration date" : "有効期限を設定",
@@ -88,6 +91,7 @@ OC.L10N.register(
     "Expiration date" : "有効期限",
     "Adding user..." : "ユーザーを追加しています...",
     "group" : "グループ",
+    "remote" : "リモート",
     "Resharing is not allowed" : "再共有は許可されていません",
     "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
     "Unshare" : "共有解除",
@@ -96,6 +100,7 @@ OC.L10N.register(
     "can edit" : "編集を許可",
     "access control" : "アクセス権限",
     "create" : "作成",
+    "change" : "更新",
     "delete" : "削除",
     "Password protected" : "パスワード保護",
     "Error unsetting expiration date" : "有効期限の未設定エラー",
@@ -117,6 +122,7 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
+    "The update was unsuccessful. " : "アップデートに失敗しました。",
     "The update was successful. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
     "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
     "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
@@ -128,6 +134,10 @@ OC.L10N.register(
     "Reset password" : "パスワードをリセット",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
     "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+    "It seems that this %s instance is running on a 32bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いておりphp.ini に open_basedir が設定されているようです。これにより4GB以上のファイルで問題を引き起こし、非常に残念なことになるでしょう。",
+    "Please remove the open_basedir setting within your php.ini or switch to  64bit PHP." : "php.ini から open_basedir 設定を削除するか、64bit PHPに切り替えて下さい。",
+    "It seems that this %s instance is running on a 32bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いておりcURLがインストールされていないようです。これにより4GB以上のファイルで問題を引き起こし、非常に残念なことになるでしょう。",
+    "Please install the cURL extension and restart your webserver." : "cURL拡張をインストールして、WEBサーバーを再起動して下さい。",
     "Personal" : "個人",
     "Users" : "ユーザー",
     "Apps" : "アプリ",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 623951f54c2..0fabd819e7e 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -44,6 +44,7 @@
     "Error loading file picker template: {error}" : "ファイル選択テンプレートの読み込みエラー: {error}",
     "Ok" : "OK",
     "Error loading message template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "read-only" : "読み取り専用",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} ファイルが競合"],
     "One file conflict" : "1ファイルが競合",
     "New Files" : "新しいファイル",
@@ -76,9 +77,11 @@
     "Share with user or group …" : "ユーザーもしくはグループと共有 ...",
     "Share link" : "URLで共有",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Link" : "リンク",
     "Password protect" : "パスワード保護を有効化",
     "Password" : "パスワード",
     "Choose a password for the public link" : "URLによる共有のパスワードを入力",
+    "Allow editing" : "編集許可",
     "Email link to person" : "メールリンク",
     "Send" : "送信",
     "Set expiration date" : "有効期限を設定",
@@ -86,6 +89,7 @@
     "Expiration date" : "有効期限",
     "Adding user..." : "ユーザーを追加しています...",
     "group" : "グループ",
+    "remote" : "リモート",
     "Resharing is not allowed" : "再共有は許可されていません",
     "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
     "Unshare" : "共有解除",
@@ -94,6 +98,7 @@
     "can edit" : "編集を許可",
     "access control" : "アクセス権限",
     "create" : "作成",
+    "change" : "更新",
     "delete" : "削除",
     "Password protected" : "パスワード保護",
     "Error unsetting expiration date" : "有効期限の未設定エラー",
@@ -115,6 +120,7 @@
     "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
+    "The update was unsuccessful. " : "アップデートに失敗しました。",
     "The update was successful. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
     "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
     "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
@@ -126,6 +132,10 @@
     "Reset password" : "パスワードをリセット",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
     "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+    "It seems that this %s instance is running on a 32bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いておりphp.ini に open_basedir が設定されているようです。これにより4GB以上のファイルで問題を引き起こし、非常に残念なことになるでしょう。",
+    "Please remove the open_basedir setting within your php.ini or switch to  64bit PHP." : "php.ini から open_basedir 設定を削除するか、64bit PHPに切り替えて下さい。",
+    "It seems that this %s instance is running on a 32bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いておりcURLがインストールされていないようです。これにより4GB以上のファイルで問題を引き起こし、非常に残念なことになるでしょう。",
+    "Please install the cURL extension and restart your webserver." : "cURL拡張をインストールして、WEBサーバーを再起動して下さい。",
     "Personal" : "個人",
     "Users" : "ユーザー",
     "Apps" : "アプリ",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index 45a6f4b8d2f..a73e6b87e2f 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Ok" : "確認",
     "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "取消",
+    "Continue" : "繼續",
     "Shared" : "已分享",
     "Share" : "分享",
     "Error" : "錯誤",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index a2b0923c330..fa7f279a27c 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -25,6 +25,7 @@
     "Ok" : "確認",
     "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "取消",
+    "Continue" : "繼續",
     "Shared" : "已分享",
     "Share" : "分享",
     "Error" : "錯誤",
diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js
index de60b71a8ff..96f92d37158 100644
--- a/lib/l10n/bs.js
+++ b/lib/l10n/bs.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "lib",
     {
+    "Help" : "Pomoć",
+    "Personal" : "Osobno",
+    "Settings" : "Postavke",
+    "Users" : "Korisnici",
+    "Admin" : "Admin",
     "Unknown filetype" : "Nepoznat tip datoteke",
     "Invalid image" : "Nevažeća datoteka",
     "_%n day ago_::_%n days ago_" : ["","",""],
diff --git a/lib/l10n/bs.json b/lib/l10n/bs.json
index 9e8570d9291..0a93aa95103 100644
--- a/lib/l10n/bs.json
+++ b/lib/l10n/bs.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Help" : "Pomoć",
+    "Personal" : "Osobno",
+    "Settings" : "Postavke",
+    "Users" : "Korisnici",
+    "Admin" : "Admin",
     "Unknown filetype" : "Nepoznat tip datoteke",
     "Invalid image" : "Nevažeća datoteka",
     "_%n day ago_::_%n days ago_" : ["","",""],
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index 52df26e8bf9..c38e02fb308 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Set an admin password." : "Set an admin password.",
     "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s",
     "%s shared »%s« with you" : "%s shared \"%s\" with you",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "Sharing %s failed, because the backend does not allow shares from type %i",
     "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist",
     "You are not allowed to share %s" : "You are not allowed to share %s",
     "Sharing %s failed, because the user %s is the item owner" : "Sharing %s failed, because the user %s is the item owner",
@@ -87,6 +88,7 @@ OC.L10N.register(
     "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed",
     "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.",
     "Share type %s is not valid for %s" : "Share type %s is not valid for %s",
     "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
     "Setting permissions for %s failed, because the item was not found" : "Setting permissions for %s failed, because the item was not found",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index 77a5b6af9d5..9a59493491f 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -75,6 +75,7 @@
     "Set an admin password." : "Set an admin password.",
     "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s",
     "%s shared »%s« with you" : "%s shared \"%s\" with you",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "Sharing %s failed, because the backend does not allow shares from type %i",
     "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist",
     "You are not allowed to share %s" : "You are not allowed to share %s",
     "Sharing %s failed, because the user %s is the item owner" : "Sharing %s failed, because the user %s is the item owner",
@@ -85,6 +86,7 @@
     "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed",
     "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.",
     "Share type %s is not valid for %s" : "Share type %s is not valid for %s",
     "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
     "Setting permissions for %s failed, because the item was not found" : "Setting permissions for %s failed, because the item was not found",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 4c551827289..0d52b2c28e6 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -11,6 +11,9 @@ OC.L10N.register(
     "PHP with a version lower than %s is required." : "%s 以前のバージョンのPHPが必要です。",
     "Following databases are supported: %s" : "次のデータベースをサポートしています: %s",
     "The command line tool %s could not be found" : "コマンド '%s' は見つかりませんでした。",
+    "The library %s is not available." : " %s ライブラリーが利用できません。",
+    "Library %s with a version higher than %s is required - available version %s." : "%s ライブラリーは、%s よりも新しいバージョンが必要です。利用可能なバージョンは、 %s です。",
+    "Library %s with a version lower than %s is required - available version %s." : "%s ライブラリーは、%s よりも古いバージョンが必要です。利用可能なバージョンは、 %s です。",
     "Following platforms are supported: %s" : "次のプラットフォームをサポートしています: %s",
     "ownCloud %s or higher is required." : "ownCloud %s 以上が必要です。",
     "ownCloud with a version lower than %s is required." : "ownCloud %s 以下が必要です。",
@@ -74,6 +77,7 @@ OC.L10N.register(
     "Set an admin password." : "管理者のパスワードを設定。",
     "Can't create or write into the data directory %s" : "%s データディレクトリに作成、書き込みができません",
     "%s shared »%s« with you" : "%sが あなたと »%s«を共有しました",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "%s の共有に失敗しました。%i タイプからの共有は許可されていないからです。",
     "Sharing %s failed, because the file does not exist" : "%s の共有に失敗しました。そのようなファイルは存在しないからです。",
     "You are not allowed to share %s" : "%s を共有することを許可されていません。",
     "Sharing %s failed, because the user %s is the item owner" : "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
@@ -84,6 +88,7 @@ OC.L10N.register(
     "Sharing %s failed, because %s is not a member of the group %s" : "%s の共有に失敗しました。%s は、グループ %s のメンバーではありません。",
     "You need to provide a password to create a public link, only protected links are allowed" : "公開用リンクの作成にはパスワードの設定が必要です",
     "Sharing %s failed, because sharing with links is not allowed" : "%s の共有に失敗しました。リンクでの共有は許可されていません。",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s の共有に失敗しました。%s が見つかりませんでした。現在サーバーに接続できないようです。",
     "Share type %s is not valid for %s" : "%s の共有方法は、%s には適用できません。",
     "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s の権限設定に失敗しました。%s に許可されている権限を越えています。",
     "Setting permissions for %s failed, because the item was not found" : "%s の権限設定に失敗しました。アイテムが存在しません。",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index b62a15e6f3c..c33f9f2419d 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -9,6 +9,9 @@
     "PHP with a version lower than %s is required." : "%s 以前のバージョンのPHPが必要です。",
     "Following databases are supported: %s" : "次のデータベースをサポートしています: %s",
     "The command line tool %s could not be found" : "コマンド '%s' は見つかりませんでした。",
+    "The library %s is not available." : " %s ライブラリーが利用できません。",
+    "Library %s with a version higher than %s is required - available version %s." : "%s ライブラリーは、%s よりも新しいバージョンが必要です。利用可能なバージョンは、 %s です。",
+    "Library %s with a version lower than %s is required - available version %s." : "%s ライブラリーは、%s よりも古いバージョンが必要です。利用可能なバージョンは、 %s です。",
     "Following platforms are supported: %s" : "次のプラットフォームをサポートしています: %s",
     "ownCloud %s or higher is required." : "ownCloud %s 以上が必要です。",
     "ownCloud with a version lower than %s is required." : "ownCloud %s 以下が必要です。",
@@ -72,6 +75,7 @@
     "Set an admin password." : "管理者のパスワードを設定。",
     "Can't create or write into the data directory %s" : "%s データディレクトリに作成、書き込みができません",
     "%s shared »%s« with you" : "%sが あなたと »%s«を共有しました",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "%s の共有に失敗しました。%i タイプからの共有は許可されていないからです。",
     "Sharing %s failed, because the file does not exist" : "%s の共有に失敗しました。そのようなファイルは存在しないからです。",
     "You are not allowed to share %s" : "%s を共有することを許可されていません。",
     "Sharing %s failed, because the user %s is the item owner" : "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
@@ -82,6 +86,7 @@
     "Sharing %s failed, because %s is not a member of the group %s" : "%s の共有に失敗しました。%s は、グループ %s のメンバーではありません。",
     "You need to provide a password to create a public link, only protected links are allowed" : "公開用リンクの作成にはパスワードの設定が必要です",
     "Sharing %s failed, because sharing with links is not allowed" : "%s の共有に失敗しました。リンクでの共有は許可されていません。",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s の共有に失敗しました。%s が見つかりませんでした。現在サーバーに接続できないようです。",
     "Share type %s is not valid for %s" : "%s の共有方法は、%s には適用できません。",
     "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s の権限設定に失敗しました。%s に許可されている権限を越えています。",
     "Setting permissions for %s failed, because the item was not found" : "%s の権限設定に失敗しました。アイテムが存在しません。",
diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js
index 813162ff8fd..1fa04277511 100644
--- a/lib/l10n/zh_HK.js
+++ b/lib/l10n/zh_HK.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Settings" : "設定",
     "Users" : "用戶",
     "Admin" : "管理",
+    "Recommended" : "建議",
     "today" : "今日",
     "yesterday" : "昨日",
     "_%n day ago_::_%n days ago_" : [""],
diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json
index e78d70ea20e..3ad83045700 100644
--- a/lib/l10n/zh_HK.json
+++ b/lib/l10n/zh_HK.json
@@ -4,6 +4,7 @@
     "Settings" : "設定",
     "Users" : "用戶",
     "Admin" : "管理",
+    "Recommended" : "建議",
     "today" : "今日",
     "yesterday" : "昨日",
     "_%n day ago_::_%n days ago_" : [""],
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
new file mode 100644
index 00000000000..42d52f878df
--- /dev/null
+++ b/settings/l10n/bs.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "Neispravan zahtjev",
+    "Saved" : "Spremljeno",
+    "Email sent" : "E-pošta poslana",
+    "All" : "Svi",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Tu-i-tamo lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Delete" : "Izbriši",
+    "Groups" : "Grupe",
+    "never" : "Nikad",
+    "Security Warning" : "Sigurnosno Upozorenje",
+    "by" : "od strane",
+    "Cheers!" : "Cheers!",
+    "Password" : "Lozinka",
+    "New password" : "Nova lozinka",
+    "Email" : "E-pošta",
+    "Cancel" : "Odustani",
+    "Username" : "Korisničko ime",
+    "Create" : "Kreiraj",
+    "Group" : "Grupa",
+    "Other" : "Ostalo"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
new file mode 100644
index 00000000000..d7d99ddccf7
--- /dev/null
+++ b/settings/l10n/bs.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Invalid request" : "Neispravan zahtjev",
+    "Saved" : "Spremljeno",
+    "Email sent" : "E-pošta poslana",
+    "All" : "Svi",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Tu-i-tamo lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Delete" : "Izbriši",
+    "Groups" : "Grupe",
+    "never" : "Nikad",
+    "Security Warning" : "Sigurnosno Upozorenje",
+    "by" : "od strane",
+    "Cheers!" : "Cheers!",
+    "Password" : "Lozinka",
+    "New password" : "Nova lozinka",
+    "Email" : "E-pošta",
+    "Cancel" : "Odustani",
+    "Username" : "Korisničko ime",
+    "Create" : "Kreiraj",
+    "Group" : "Grupa",
+    "Other" : "Ostalo"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 8ef9ae89327..7325bda0b58 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -46,6 +46,9 @@ OC.L10N.register(
     "Unable to create user." : "Unable to create user.",
     "Your %s account was created" : "Your %s account was created",
     "Unable to delete user." : "Unable to delete user.",
+    "Forbidden" : "Forbidden",
+    "Invalid user" : "Invalid user",
+    "Unable to change mail address" : "Unable to change mail address",
     "Email saved" : "Email saved",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Are you really sure you want add \"{domain}\" as a trusted domain?",
     "Add trusted domain" : "Add trusted domain",
@@ -228,6 +231,8 @@ OC.L10N.register(
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
     "Show user backend" : "Show user backend",
+    "Send email to new user" : "Send email to new user",
+    "Show email address" : "Show email address",
     "Username" : "Username",
     "E-Mail" : "E-Mail",
     "Create" : "Create",
@@ -249,6 +254,7 @@ OC.L10N.register(
     "Last Login" : "Last Login",
     "change full name" : "change full name",
     "set new password" : "set new password",
+    "change email address" : "change email address",
     "Default" : "Default"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index c195436478a..8f166db1862 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -44,6 +44,9 @@
     "Unable to create user." : "Unable to create user.",
     "Your %s account was created" : "Your %s account was created",
     "Unable to delete user." : "Unable to delete user.",
+    "Forbidden" : "Forbidden",
+    "Invalid user" : "Invalid user",
+    "Unable to change mail address" : "Unable to change mail address",
     "Email saved" : "Email saved",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Are you really sure you want add \"{domain}\" as a trusted domain?",
     "Add trusted domain" : "Add trusted domain",
@@ -226,6 +229,8 @@
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
     "Show user backend" : "Show user backend",
+    "Send email to new user" : "Send email to new user",
+    "Show email address" : "Show email address",
     "Username" : "Username",
     "E-Mail" : "E-Mail",
     "Create" : "Create",
@@ -247,6 +252,7 @@
     "Last Login" : "Last Login",
     "change full name" : "change full name",
     "set new password" : "set new password",
+    "change email address" : "change email address",
     "Default" : "Default"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 1c06531e485..1686b5c3207 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -44,6 +44,7 @@ OC.L10N.register(
     "You need to set your user email before being able to send test emails." : "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
     "Invalid mail address" : "Dirección de correo inválida",
     "Unable to create user." : "No se pudo crear el usuario.",
+    "Your %s account was created" : "Su %s cuenta fue creada",
     "Unable to delete user." : "No se pudo eliminar el usuario.",
     "Forbidden" : "Prohibido",
     "Invalid user" : "Usuario no válido",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index f70c5c9f352..d24014756cd 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -42,6 +42,7 @@
     "You need to set your user email before being able to send test emails." : "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
     "Invalid mail address" : "Dirección de correo inválida",
     "Unable to create user." : "No se pudo crear el usuario.",
+    "Your %s account was created" : "Su %s cuenta fue creada",
     "Unable to delete user." : "No se pudo eliminar el usuario.",
     "Forbidden" : "Prohibido",
     "Invalid user" : "Usuario no válido",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 2a7b7ad1667..1e125e1a92e 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -44,7 +44,10 @@ OC.L10N.register(
     "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
     "Invalid mail address" : "無効なメールアドレスです",
     "Unable to create user." : "ユーザを追加できません",
+    "Your %s account was created" : "アカウント %s を作成しました",
     "Unable to delete user." : "ユーザを削除できません",
+    "Forbidden" : "禁止",
+    "Invalid user" : "無効なユーザー",
     "Unable to change mail address" : "メールアドレスを変更できません",
     "Email saved" : "メールアドレスを保存しました",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
@@ -86,6 +89,7 @@ OC.L10N.register(
     "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
     "Error creating user" : "ユーザー作成エラー",
     "A valid password must be provided" : "有効なパスワードを指定する必要があります",
+    "A valid email must be provided" : "有効なメールアドレスを指定する必要があります",
     "__language_name__" : "Japanese (日本語)",
     "Personal Info" : "個人情報",
     "SSL root certificates" : "SSLルート証明書",
@@ -178,7 +182,9 @@ OC.L10N.register(
     "Update to %s" : "%sにアップデート",
     "Enable only for specific groups" : "特定のグループのみ有効に",
     "Uninstall App" : "アプリをアンインストール",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "それでは！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "こんにちは、\n\nあなたのアカウント %s が利用可能になったことをお知らせします。\n\nユーザー名: %s\n接続URL: %s\n\n",
     "Administrator Documentation" : "管理者ドキュメント",
     "Online Documentation" : "オンラインドキュメント",
     "Forum" : "フォーラム",
@@ -225,7 +231,10 @@ OC.L10N.register(
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザバックエンドを表示",
+    "Send email to new user" : "新規ユーザーにメールを送信",
+    "Show email address" : "メールアドレスを表示",
     "Username" : "ユーザーID",
+    "E-Mail" : "Eメール",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
@@ -245,6 +254,7 @@ OC.L10N.register(
     "Last Login" : "最終ログイン",
     "change full name" : "名前を変更",
     "set new password" : "新しいパスワードを設定",
+    "change email address" : "メールアドレスを変更",
     "Default" : "デフォルト"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 412f45d67d5..b6ee77bd2cb 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -42,7 +42,10 @@
     "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
     "Invalid mail address" : "無効なメールアドレスです",
     "Unable to create user." : "ユーザを追加できません",
+    "Your %s account was created" : "アカウント %s を作成しました",
     "Unable to delete user." : "ユーザを削除できません",
+    "Forbidden" : "禁止",
+    "Invalid user" : "無効なユーザー",
     "Unable to change mail address" : "メールアドレスを変更できません",
     "Email saved" : "メールアドレスを保存しました",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
@@ -84,6 +87,7 @@
     "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
     "Error creating user" : "ユーザー作成エラー",
     "A valid password must be provided" : "有効なパスワードを指定する必要があります",
+    "A valid email must be provided" : "有効なメールアドレスを指定する必要があります",
     "__language_name__" : "Japanese (日本語)",
     "Personal Info" : "個人情報",
     "SSL root certificates" : "SSLルート証明書",
@@ -176,7 +180,9 @@
     "Update to %s" : "%sにアップデート",
     "Enable only for specific groups" : "特定のグループのみ有効に",
     "Uninstall App" : "アプリをアンインストール",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "それでは！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "こんにちは、\n\nあなたのアカウント %s が利用可能になったことをお知らせします。\n\nユーザー名: %s\n接続URL: %s\n\n",
     "Administrator Documentation" : "管理者ドキュメント",
     "Online Documentation" : "オンラインドキュメント",
     "Forum" : "フォーラム",
@@ -223,7 +229,10 @@
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザバックエンドを表示",
+    "Send email to new user" : "新規ユーザーにメールを送信",
+    "Show email address" : "メールアドレスを表示",
     "Username" : "ユーザーID",
+    "E-Mail" : "Eメール",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
@@ -243,6 +252,7 @@
     "Last Login" : "最終ログイン",
     "change full name" : "名前を変更",
     "set new password" : "新しいパスワードを設定",
+    "change email address" : "メールアドレスを変更",
     "Default" : "デフォルト"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index e57291c7474..d18e7efc536 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -1,30 +1,64 @@
 OC.L10N.register(
     "settings",
     {
+    "Sharing" : "分享",
+    "Security" : "安全",
+    "Email Server" : "電子郵件伺服器",
+    "Log" : "日誌",
     "Wrong password" : "密碼錯誤",
     "Enabled" : "啟用",
+    "Not enabled" : "未啟用",
+    "Recommended" : "建議",
     "Saved" : "已儲存",
+    "test email settings" : "測試電子郵件設定",
     "Email sent" : "郵件已傳",
     "Sending..." : "發送中...",
+    "All" : "所有",
+    "Please wait...." : "請稍候....",
     "Disable" : "停用",
     "Enable" : "啟用",
     "Updating...." : "更新中....",
     "Updated" : "已更新",
+    "Uninstalling ...." : "正在解除安裝 ....",
+    "Uninstall" : "解除安裝",
     "Delete" : "刪除",
     "Groups" : "群組",
+    "undo" : "復原",
     "Encryption" : "加密",
     "None" : "空",
     "Login" : "登入",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "days" : "天",
+    "Enforce HTTPS" : "強制使用 HTTPS",
+    "Server address" : "伺服器地址",
     "Port" : "連接埠",
+    "SMTP Username" : "SMTP 使用者名稱",
+    "SMTP Password" : "SMTP 密碼",
+    "Log level" : "日誌等級",
     "More" : "更多",
+    "Version" : "版本",
+    "More apps" : "更多應用程式",
+    "Forum" : "討論區",
+    "Android app" : "Android 應用程式",
+    "iOS app" : "iOS 應用程式",
     "Password" : "密碼",
     "New password" : "新密碼",
     "Change password" : "更改密碼",
     "Email" : "電郵",
+    "Your email address" : "你的電郵地址",
+    "Remove image" : "刪除圖片",
     "Cancel" : "取消",
+    "Language" : "語言",
+    "Help translate" : "幫忙翻譯",
+    "Log-in password" : "登入密碼",
     "Username" : "用戶名稱",
-    "Create" : "新增"
+    "Create" : "新增",
+    "Group" : "群組",
+    "Everyone" : "所有人",
+    "Unlimited" : "無限",
+    "Other" : "其他",
+    "Last Login" : "最後登入",
+    "Default" : "預設"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index 7fd1b79909f..e984020fcbc 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -1,28 +1,62 @@
 { "translations": {
+    "Sharing" : "分享",
+    "Security" : "安全",
+    "Email Server" : "電子郵件伺服器",
+    "Log" : "日誌",
     "Wrong password" : "密碼錯誤",
     "Enabled" : "啟用",
+    "Not enabled" : "未啟用",
+    "Recommended" : "建議",
     "Saved" : "已儲存",
+    "test email settings" : "測試電子郵件設定",
     "Email sent" : "郵件已傳",
     "Sending..." : "發送中...",
+    "All" : "所有",
+    "Please wait...." : "請稍候....",
     "Disable" : "停用",
     "Enable" : "啟用",
     "Updating...." : "更新中....",
     "Updated" : "已更新",
+    "Uninstalling ...." : "正在解除安裝 ....",
+    "Uninstall" : "解除安裝",
     "Delete" : "刪除",
     "Groups" : "群組",
+    "undo" : "復原",
     "Encryption" : "加密",
     "None" : "空",
     "Login" : "登入",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "days" : "天",
+    "Enforce HTTPS" : "強制使用 HTTPS",
+    "Server address" : "伺服器地址",
     "Port" : "連接埠",
+    "SMTP Username" : "SMTP 使用者名稱",
+    "SMTP Password" : "SMTP 密碼",
+    "Log level" : "日誌等級",
     "More" : "更多",
+    "Version" : "版本",
+    "More apps" : "更多應用程式",
+    "Forum" : "討論區",
+    "Android app" : "Android 應用程式",
+    "iOS app" : "iOS 應用程式",
     "Password" : "密碼",
     "New password" : "新密碼",
     "Change password" : "更改密碼",
     "Email" : "電郵",
+    "Your email address" : "你的電郵地址",
+    "Remove image" : "刪除圖片",
     "Cancel" : "取消",
+    "Language" : "語言",
+    "Help translate" : "幫忙翻譯",
+    "Log-in password" : "登入密碼",
     "Username" : "用戶名稱",
-    "Create" : "新增"
+    "Create" : "新增",
+    "Group" : "群組",
+    "Everyone" : "所有人",
+    "Unlimited" : "無限",
+    "Other" : "其他",
+    "Last Login" : "最後登入",
+    "Default" : "預設"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file