Merge branch 'master' into ext-fs-irods-master

2013-04-18 09:27:43 +02:00 · 2013-04-18 09:27:43 +02:00 · fbd3445d22
commit fbd3445d22
parent 7dd3391117 cbd8b792d9
969 changed files with 11326 additions and 8385 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -3,13 +3,20 @@
 If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].

 ### Guidelines
+* Please search the existing issues first, it's likely that your issue was already reported.
 * [Report the issue](https://github.com/owncloud/core/issues/new) using our [template][template], it includes all the informations we need to track down the issue.
 * This repository is *only* for issues within the ownCloud core code. Issues in other compontents should be reported in their own repositores: 
  - [Android client](https://github.com/owncloud/android/issues)
  - [iOS client](https://github.com/owncloud/ios-issues/issues)
  - [Desktop client](https://github.com/owncloud/mirall/issues)
-  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...)
-* Search the existing issues first, it's likely that your issue was already reported.
+  - Apps:
+      - [Bookmarks](https://github.com/owncloud/bookmarks/issues)
+      - [Calendar](https://github.com/owncloud/calendar/issues)
+      - [Mail](https://github.com/owncloud/mail/issues)
+      - [News](https://github.com/owncloud/news/issues)
+      - [Notes](https://github.com/owncloud/notes/issues)
+      - [Shorty](https://github.com/owncloud/shorty/issues)
+      - [other apps](https://github.com/owncloud/apps/issues) (e.g. Contacts, Pictures, Music, ...)

 If your issue appears to be a bug, and hasn't been reported, open a new issue.

--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@ -12,3 +12,10 @@ OCP\App::addNavigationEntry( array( "id" => "files_index",
 									"name" => $l->t("Files") ));

 OC_Search::registerProvider('OC_Search_Provider_File');
+
+// cache hooks must be connected before all other apps.
+// since 'files' is always loaded first the hooks need to be connected here
+\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
+\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
+\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
+\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Dileu",
+"Error" => "Gwall",
+"Save" => "Cadw",
+"Download" => "Llwytho i lawr",
+"Unshare" => "Dad-rannu"
+);
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@ -25,6 +25,7 @@
 "undo" => "annuler",
 "perform delete operation" => "effectuer l'opération de suppression",
 "1 file uploading" => "1 fichier en cours de téléchargement",
+"files uploading" => "fichiers en cours de téléchargement",
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
 "File name cannot be empty." => "Le nom de fichier ne peut être vide.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@ -55,7 +55,7 @@
 "0 is unlimited" => "0を指定した場合は無制限",
 "Maximum input size for ZIP files" => "ZIPファイルへの最大入力サイズ",
 "Save" => "保存",
-"New" => "新規",
+"New" => "新規作成",
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
 "From link" => "リンク",
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@ -1,11 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
+"Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
+"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
+"No file was uploaded. Unknown error" => "ფაილი არ აიტვირთა. უცნობი შეცდომა",
 "There is no error, the file uploaded with success" => "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
 "The uploaded file was only partially uploaded" => "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
 "No file was uploaded" => "ფაილი არ აიტვირთა",
 "Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს",
 "Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას",
+"Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
+"Invalid directory." => "დაუშვებელი დირექტორია.",
 "Files" => "ფაილები",
+"Delete permanently" => "სრულად წაშლა",
 "Delete" => "წაშლა",
 "Rename" => "გადარქმევა",
 "Pending" => "მოცდის რეჟიმში",
@ -15,10 +23,21 @@
 "cancel" => "უარყოფა",
 "replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
 "undo" => "დაბრუნება",
+"perform delete operation" => "მიმდინარეობს წაშლის ოპერაცია",
 "1 file uploading" => "1 ფაილის ატვირთვა",
+"files uploading" => "ფაილები იტვირთება",
+"'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.",
+"File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული.",
+"Your storage is full, files can not be updated or synced anymore!" => "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
+"Your storage is almost full ({usedSpacePercent}%)" => "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
+"Not enough space available" => "საკმარისი ადგილი არ არის",
 "Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
+"URL cannot be empty." => "URL არ შეიძლება იყოს ცარიელი.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ",
 "Error" => "შეცდომა",
 "Name" => "სახელი",
 "Size" => "ზომა",
@ -39,12 +58,16 @@
 "New" => "ახალი",
 "Text file" => "ტექსტური ფაილი",
 "Folder" => "საქაღალდე",
+"From link" => "მისამართიდან",
+"Deleted files" => "წაშლილი ფაილები",
 "Cancel upload" => "ატვირთვის გაუქმება",
+"You don’t have write permissions here." => "თქვენ არ გაქვთ ჩაწერის უფლება აქ.",
 "Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
 "Download" => "ჩამოტვირთვა",
 "Unshare" => "გაზიარების მოხსნა",
 "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." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.",
-"Current scanning" => "მიმდინარე სკანირება"
+"Current scanning" => "მიმდინარე სკანირება",
+"Upgrading filesystem cache..." => "ფაილური სისტემის ქეშის განახლება...."
 );
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@ -25,6 +25,7 @@
 "undo" => "cofnij",
 "perform delete operation" => "wykonaj operację usunięcia",
 "1 file uploading" => "1 plik wczytywany",
+"files uploading" => "pliki wczytane",
 "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
 "File name cannot be empty." => "Nazwa pliku nie może być pusta.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@ -25,6 +25,7 @@
 "undo" => "desfazer",
 "perform delete operation" => "Executar a tarefa de apagar",
 "1 file uploading" => "A enviar 1 ficheiro",
+"files uploading" => "A enviar os ficheiros",
 "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
 "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Не могу да преместим %s – датотека с овим именом већ постоји",
+"Could not move %s" => "Не могу да преместим %s",
+"Unable to rename file" => "Не могу да преименујем датотеку",
+"No file was uploaded. Unknown error" => "Ниједна датотека није отпремљена услед непознате грешке",
 "There is no error, the file uploaded with success" => "Није дошло до грешке. Датотека је успешно отпремљена.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу",
@ -6,7 +10,10 @@
 "No file was uploaded" => "Датотека није отпремљена",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Failed to write to disk" => "Не могу да пишем на диск",
+"Not enough storage available" => "Нема довољно простора",
+"Invalid directory." => "неисправна фасцикла.",
 "Files" => "Датотеке",
+"Delete permanently" => "Обриши за стално",
 "Delete" => "Обриши",
 "Rename" => "Преименуј",
 "Pending" => "На чекању",
@ -16,11 +23,21 @@
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
 "undo" => "опозови",
+"perform delete operation" => "обриши",
 "1 file uploading" => "Отпремам 1 датотеку",
+"files uploading" => "датотеке се отпремају",
+"'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
+"File name cannot be empty." => "Име датотеке не може бити празно.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
+"Your storage is almost full ({usedSpacePercent}%)" => "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
+"Not enough space available" => "Нема довољно простора",
 "Upload cancelled." => "Отпремање је прекинуто.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
+"URL cannot be empty." => "Адреса не може бити празна.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud.",
 "Error" => "Грешка",
 "Name" => "Назив",
 "Size" => "Величина",
@ -42,12 +59,15 @@
 "Text file" => "текстуална датотека",
 "Folder" => "фасцикла",
 "From link" => "Са везе",
+"Deleted files" => "Обрисане датотеке",
 "Cancel upload" => "Прекини отпремање",
+"You don’t have write permissions here." => "Овде немате дозволу за писање.",
 "Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
 "Download" => "Преузми",
 "Unshare" => "Укини дељење",
 "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." => "Скенирам датотеке…",
-"Current scanning" => "Тренутно скенирање"
+"Current scanning" => "Тренутно скенирање",
+"Upgrading filesystem cache..." => "Дограђујем кеш система датотека…"
 );
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@ -25,6 +25,7 @@
 "undo" => "відмінити",
 "perform delete operation" => "виконати операцію видалення",
 "1 file uploading" => "1 файл завантажується",
+"files uploading" => "файли завантажуються",
 "'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
 "File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@ -7,8 +7,8 @@
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
 "The uploaded file was only partially uploaded" => "只有檔案的一部分被上傳",
-"No file was uploaded" => "無已上傳檔案",
-"Missing a temporary folder" => "遺失暫存資料夾",
+"No file was uploaded" => "沒有檔案被上傳",
+"Missing a temporary folder" => "找不到暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Not enough storage available" => "儲存空間不足",
 "Invalid directory." => "無效的資料夾。",
@ -36,8 +36,8 @@
 "Not enough space available" => "沒有足夠的可用空間",
 "Upload cancelled." => "上傳取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。",
-"URL cannot be empty." => "URL 不能為空白.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 Owncloud 保留",
+"URL cannot be empty." => "URL 不能為空白。",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
 "Error" => "錯誤",
 "Name" => "名稱",
 "Size" => "大小",
@ -61,13 +61,13 @@
 "From link" => "從連結",
 "Deleted files" => "已刪除的檔案",
 "Cancel upload" => "取消上傳",
-"You don’t have write permissions here." => "您在這裏沒有編輯權。",
-"Nothing in here. Upload something!" => "沒有任何東西。請上傳內容！",
+"You don’t have write permissions here." => "您在這裡沒有編輯權。",
+"Nothing in here. Upload something!" => "這裡什麼也沒有，上傳一些東西吧！",
 "Download" => "下載",
 "Unshare" => "取消共享",
 "Upload too large" => "上傳過大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。　",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
 "Current scanning" => "目前掃描",
-"Upgrading filesystem cache..." => "正在更新檔案系統快取..."
+"Upgrading filesystem cache..." => "正在升級檔案系統快取..."
 );
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "ენკრიპცია",
+"File encryption is enabled." => "ფაილის ენკრიპცია ჩართულია.",
+"The following file types will not be encrypted:" => "შემდეგი ფაილური ტიპების ენკრიპცია არ მოხდება:",
+"Exclude the following file types from encryption:" => "ამოიღე შემდეგი ფაილის ტიპები ენკრიპციიდან:",
+"None" => "არა"
+);
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Users" => "Defnyddwyr",
+"Delete" => "Dileu"
+);
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@ -1,5 +1,25 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "დაშვება მინიჭებულია",
+"Error configuring Dropbox storage" => "შეცდომა Dropbox საცავის კონფიგურირების დროს",
+"Grant access" => "დაშვების მინიჭება",
+"Please provide a valid Dropbox app key and secret." => "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
+"Error configuring Google Drive storage" => "შეცდომა Google Drive საცავის კონფიგურირების დროს",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b> \"smbclient\" არ არის ინსტალირებული. CIFS/SMB ზიარების მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b>  FTP მხარდაჭერა არ არის აქტიური ან დაინსტალირებული. FTP ზიარის მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის.",
+"External Storage" => "ექსტერნალ საცავი",
+"Folder name" => "ფოლდერის სახელი",
+"External storage" => "ექსტერნალ საცავი",
+"Configuration" => "კონფიგურაცია",
+"Options" => "ოფცია",
+"Applicable" => "მიღებადი",
+"Add storage" => "საცავის დამატება",
+"None set" => "არაფერია მითითებული",
+"All Users" => "ყველა მომხმარებელი",
 "Groups" => "ჯგუფები",
 "Users" => "მომხმარებელი",
-"Delete" => "წაშლა"
+"Delete" => "წაშლა",
+"Enable User External Storage" => "მომხმარებლის ექსტერნალ საცავის აქტივირება",
+"Allow users to mount their own external storage" => "მიეცით მომხმარებლებს თავისი ექსტერნალ საცავის მონტირების  უფლება",
+"SSL root certificates" => "SSL root სერთიფიკატები",
+"Import Root Certificate" => "Root სერთიფიკატის იმპორტირება"
 );
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Cyfrinair",
+"Submit" => "Cyflwyno",
+"Download" => "Llwytho i lawr",
+"web services under your control" => "gwasanaethau gwe a reolir gennych"
+);
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@ -1,6 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Password" => "პაროლი",
 "Submit" => "გაგზავნა",
+"%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
+"%s shared the file %s with you" => "%s–მა გაგიზიარათ ფაილი %s",
 "Download" => "ჩამოტვირთვა",
+"No preview available for" => "წინასწარი დათვალიერება შეუძლებელია",
 "web services under your control" => "web services under your control"
 );
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Palavra-Passe",
+"Password" => "Password",
 "Submit" => "Submeter",
 "%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
 "%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
-"Download" => "Descarregar",
+"Download" => "Transferir",
 "No preview available for" => "Não há pré-visualização para",
 "web services under your control" => "serviços web sob o seu controlo"
 );
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@ -2,7 +2,20 @@
 <info>
 	<id>files_trashbin</id>
 	<name>Deleted files</name>
-	<description>Keep a copy of deleted files so that they can be restored if needed</description>
+	<description>
+	ownCloud keeps a copy of your deleted files in case you need them again. 
+	To make sure that the user doesn't run out of memory the deleted files app
+	manages the size of the deleted files for the user. By default deleted files
+	stay in the trash bin for 180 days. ownCloud checks the age of the files
+	every time a new files gets moved to the deleted files and remove all files
+	older than 180 days. The user can adjust this value in the config.php by
+	setting the "trashbin_retention_obligation" value.
+
+	Beside that the delted files app take care to never use more that 50% of
+	your currently available free space. If your deleted files exceed this limit
+	ownCloud deletes the oldest versions until it meets the memory usage limit
+	again.
+	</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
 	<shipped>true</shipped>
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Error" => "Gwall",
+"Delete" => "Dileu"
+);
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@ -1,9 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
+"Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
+"perform restore operation" => "მიმდინარეობს აღდგენის ოპერაცია",
 "Error" => "შეცდომა",
+"delete file permanently" => "ფაილის სრულად წაშლა",
+"Delete permanently" => "სრულად წაშლა",
 "Name" => "სახელი",
+"Deleted" => "წაშლილი",
 "1 folder" => "1 საქაღალდე",
 "{count} folders" => "{count} საქაღალდე",
 "1 file" => "1 ფაილი",
 "{count} files" => "{count} ფაილი",
-"Delete" => "წაშლა"
+"Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
+"Restore" => "აღდგენა",
+"Delete" => "წაშლა",
+"Deleted Files" => "წაშლილი ფაილები"
 );
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
-"perform restore operation" => "Restaurar",
+"perform restore operation" => "executar a operação de restauro",
 "Error" => "Erro",
 "delete file permanently" => "Eliminar permanentemente o(s) ficheiro(s)",
 "Delete permanently" => "Eliminar permanentemente",
@ -11,7 +11,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"Nothing in here. Your trash bin is empty!" => "Não ha ficheiros. O lixo está vazio",
+"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
 "Restore" => "Restaurar",
 "Delete" => "Apagar",
 "Deleted Files" => "Ficheiros Apagados"
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "perform restore operation" => "врати у претходно стање",
 "Error" => "Грешка",
+"Delete permanently" => "Обриши за стално",
 "Name" => "Име",
 "Deleted" => "Обрисано",
 "1 folder" => "1 фасцикла",
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@ -104,27 +104,8 @@ class Trashbin {
 		} else {
 			\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
 		}
-		
-		// get available disk space for user
-		$quota = \OC_Preferences::getValue($user, 'files', 'quota');
-		if ( $quota === null || $quota === 'default') {
-			$quota = \OC_Appconfig::getValue('files', 'default_quota');
-		}
-		if ( $quota === null || $quota === 'none' ) {
-			$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
-		} else {
-			$quota = \OCP\Util::computerFileSize($quota);
-		}
-		
-		// calculate available space for trash bin
-		$rootInfo = $view->getFileInfo('/files');
-		$free = $quota-$rootInfo['size']; // remaining free space for user
-		if ( $free > 0 ) {
-			$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
-		} else {
-			$availableSpace = $free-$trashbinSize;
-		}
-		$trashbinSize -= self::expire($availableSpace);
+
+		$trashbinSize -= self::expire($trashbinSize);
 		
 		self::setTrashbinSize($user, $trashbinSize);

@ -353,13 +334,52 @@ class Trashbin {
 	}

 	/**
-	 * clean up the trash bin
-	 * @param max. available disk space for trashbin
+	 * calculate remaining free space for trash bin
+	 *
+	 * @param $trashbinSize current size of the trash bin
+	 * @return available free space for trash bin
 	 */
-	private static function expire($availableSpace) {
+	private static function calculateFreeSpace($trashbinSize) {
+		$softQuota = true;
+		$user = \OCP\User::getUser();
+		$quota = \OC_Preferences::getValue($user, 'files', 'quota');
+		$view = new \OC\Files\View('/'.$user);
+		if ( $quota === null || $quota === 'default') {
+			$quota = \OC_Appconfig::getValue('files', 'default_quota');
+		}
+		if ( $quota === null || $quota === 'none' ) {
+			$quota = \OC\Files\Filesystem::free_space('/');
+			$softQuota = false;
+		} else {
+			$quota = \OCP\Util::computerFileSize($quota);
+		}
+
+		// calculate available space for trash bin
+		// subtract size of files and current trash bin size from quota
+		if ($softQuota) {
+			$rootInfo = $view->getFileInfo('/files/');
+			$free = $quota-$rootInfo['size']; // remaining free space for user
+			if ( $free > 0 ) {
+				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
+			} else {
+				$availableSpace = $free-$trashbinSize;
+			}
+		} else {
+			$availableSpace = $quota;
+		}
+
+		return $availableSpace;
+	}
+
+	/**
+	 * clean up the trash bin
+	 * @param current size of the trash bin
+	 */
+	private static function expire($trashbinSize) {

 		$user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/'.$user);
+		$availableSpace = self::calculateFreeSpace($trashbinSize);
 		$size = 0;

 		$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash` WHERE `user`=?');
@ -375,6 +395,7 @@ class Trashbin {
 			$filename = $r['id'];
 			if ( $r['timestamp'] < $limit ) {
 				$size += self::delete($filename, $timestamp);
+				\OC_Log::write('files_trashbin', 'remove "'.$filename.'" fom trash bin because it is older than '.$retention_obligation, \OC_log::INFO);
 			}
 		}
 		$availableSpace = $availableSpace + $size;
@ -387,6 +408,7 @@ class Trashbin {
 			$i = 0;
 			while ( $i < $length &&   $availableSpace < 0 ) {
 				$tmp = self::delete($result[$i]['id'], $result[$i]['timestamp']);
+				\OC_Log::write('files_trashbin', 'remove "'.$result[$i]['id'].'" ('.$tmp.'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
 				$availableSpace += $tmp;
 				$size += $tmp;
 				$i++;
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@ -6,7 +6,25 @@
 	<author>Frank Karlitschek</author>
 	<require>4.93</require>
 	<shipped>true</shipped>
-	<description>Versioning of files</description>
+	<description>
+	ownCloud supports simple version control for files.	The versioning app
+	expires old versions automatically to make sure that
+	the user doesn't run out of space. Following pattern is used to delete
+	old versions:
+	For the first 10 seconds ownCloud keeps one version every 2 seconds;
+	For the first hour ownCloud keeps one version every minute;
+	For the first 24 hours ownCloud keeps one version every hour;
+	For the first 30 days ownCloud keeps one version every day;
+	After the first 30 days ownCloud keeps one version every week.
+
+	The versions are adjusted along this pattern every time a new version gets
+	created.
+
+	Beside that the version app takes care to never use more that 50% of the users
+	currently available free space. If the stored versions exceed this limit
+	ownCloud deletes the oldest versions until it meets the memory usage limit
+	again.
+	</description>
 	<types>
 		<filesystem/>
 	</types>
--- a/apps/files_versions/l10n/ka_GE.php
+++ b/apps/files_versions/l10n/ka_GE.php
@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "ვერ მოხერხდა უკან დაბრუნება: %s",
+"success" => "დასრულდა",
+"File %s was reverted to version %s" => "ფაილი %s დაბრუნდა ვერსიაზე %s",
+"failure" => "შეცდომა",
+"File %s could not be reverted to version %s" => "ვერ მოხერხდა %s ფაილის %s ვერსიაზე დაბრუნება",
+"No old versions available" => "ძველი ვერსია არ არსებობს",
+"No path specified" => "გზა არ არის მითითებული",
+"Versions" => "ვერსიები",
+"Revert a file to a previous version by clicking on its revert button" => "დააბრუნეთ ფაილი წინა პოზიციაზე revert ღილაკზე დაჭერით"
+);
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@ -378,12 +378,14 @@ class Storage {
 			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');

 			// get available disk space for user
+			$softQuota = true;
 			$quota = \OC_Preferences::getValue($uid, 'files', 'quota');
 			if ( $quota === null || $quota === 'default') {
 				$quota = \OC_Appconfig::getValue('files', 'default_quota');
 			}
 			if ( $quota === null || $quota === 'none' ) {
-				$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
+				$quota = \OC\Files\Filesystem::free_space('/');
+				$softQuota = false;
 			} else {
 				$quota = \OCP\Util::computerFileSize($quota);
 			}
@ -397,15 +399,21 @@ class Storage {
 			}

 			// calculate available space for version history
-			$files_view = new \OC\Files\View('/'.$uid.'/files');
-			$rootInfo = $files_view->getFileInfo('/');
-			$free = $quota-$rootInfo['size']; // remaining free space for user
-			if ( $free > 0 ) {
-				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+			// subtract size of files and current versions size from quota
+			if ($softQuota) {
+				$files_view = new \OC\Files\View('/'.$uid.'/files');
+				$rootInfo = $files_view->getFileInfo('/');
+				$free = $quota-$rootInfo['size']; // remaining free space for user
+				if ( $free > 0 ) {
+					$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+				} else {
+					$availableSpace = $free-$versionsSize;
+				}
 			} else {
-				$availableSpace = $free-$versionsSize;
+				$availableSpace = $quota;
 			}

+
 			// after every 1000s run reduce the number of all versions not only for the current file
 			$random = rand(0, 1000);
 			if ($random == 0) {
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Cyfrinair",
+"Help" => "Cymorth"
+);
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@ -4,6 +4,7 @@
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Μη έγκυρες ρυθμίσεις. Παρακαλώ ελέγξτε τις καταγραφές του ownCloud για περισσότερες λεπτομέρειες.",
 "Deletion failed" => "Η διαγραφή απέτυχε",
+"Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
 "Keep settings?" => "Διατήρηση ρυθμίσεων;",
 "Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
 "Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
@ -17,6 +18,7 @@
 "Host" => "Διακομιστής",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
 "Base DN" => "Base DN",
+"One Base DN per line" => "Ένα DN Βάσης ανά γραμμή ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
 "User DN" => "User DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
@ -32,22 +34,42 @@
 "Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
 "Connection Settings" => "Ρυθμίσεις Σύνδεσης",
+"Configuration Active" => "Ενεργοποιηση ρυθμισεων",
+"When unchecked, this configuration will be skipped." => "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
 "Port" => "Θύρα",
+"Backup (Replica) Host" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Host ",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη.",
+"Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
+"Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη",
+"When switched on, ownCloud will only connect to the replica server." => "Όταν ενεργοποιηθεί, με το ownCloud θα συνδεθείτε με το διακομιστή ρεπλίκα.",
 "Use TLS" => "Χρήση TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
 "Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.",
 "Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
+"Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
 "Directory Settings" => "Ρυθμίσεις Καταλόγου",
 "User Display Name Field" => "Πεδίο Ονόματος Χρήστη",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud.",
 "Base User Tree" => "Base User Tree",
+"One User Base DN per line" => "Ένα DN βάσης χρηστών ανά γραμμή",
+"User Search Attributes" => "Χαρακτηριστικά αναζήτησης των χρηστών ",
+"Optional; one attribute per line" => "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή ",
 "Group Display Name Field" => "Group Display Name Field",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud.",
 "Base Group Tree" => "Base Group Tree",
+"One Group Base DN per line" => "Μια ομαδικη Βάση DN ανά γραμμή",
+"Group Search Attributes" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
 "Group-Member association" => "Group-Member association",
+"Special Attributes" => "Ειδικά Χαρακτηριστικά ",
+"Quota Field" => "Ποσοσταση πεδιου",
+"Quota Default" => "Προκαθισμενο πεδιο",
 "in bytes" => "σε bytes",
+"Email Field" => "Email τυπος",
+"User Home Folder Naming Rule" => "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας ",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.",
+"Test Configuration" => "Δοκιμαστικες ρυθμισεις",
 "Help" => "Βοήθεια"
 );
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
-"The configuration is valid and the connection could be established!" => "La configuration est valide est la connexion peut être établie !",
+"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "La configuration est invalide. Veuillez vous référer aux fichiers de journaux ownCloud pour plus d'information.",
 "Deletion failed" => "La suppression a échoué",
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@ -1,4 +1,75 @@
 <?php $TRANSLATIONS = array(
-"Deletion failed" => "წაშლის ველი",
+"Failed to delete the server configuration" => "შეცდომა სერვერის კონფიგურაციის წაშლისას",
+"The configuration is valid and the connection could be established!" => "კონფიგურაცია მართებულია და კავშირი დამყარდება!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "კონფიგურაცია არ არის მართებული. გთხოვთ ჩაიხედოთ დეტალური ინფორმაციისთვის ownCloud –ის ლოგში.",
+"Deletion failed" => "წაშლა ვერ განხორციელდა",
+"Take over settings from recent server configuration?" => "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
+"Keep settings?" => "დავტოვოთ პარამეტრები?",
+"Cannot add server configuration" => "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+"Connection test succeeded" => "კავშირის ტესტირება მოხერხდა",
+"Connection test failed" => "კავშირის ტესტირება ვერ მოხერხდა",
+"Do you really want to delete the current Server Configuration?" => "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
+"Confirm Deletion" => "წაშლის დადასტურება",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>გაფრთხილება:</b>  აპლიკაციის user_ldap და user_webdavauth არათავსებადია. თქვენ შეიძლება შეეჩეხოთ მოულოდნელ შშედეგებს. თხოვეთ თქვენს ადმინისტრატორს ჩათიშოს ერთერთი.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის.",
+"Server configuration" => "სერვერის პარამეტრები",
+"Add Server Configuration" => "სერვერის პარამეტრების დამატება",
+"Host" => "ჰოსტი",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
+"Base DN" => "საწყისი DN",
+"One Base DN per line" => "ერთი საწყისი DN ერთ ხაზზე",
+"You can specify Base DN for users and groups in the Advanced tab" => "თქვენ შეგიძლიათ მიუთითოთ საწყისი DN მომხმარებლებისთვის და ჯგუფებისთვის Advanced ტაბში",
+"User DN" => "მომხმარებლის DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი.",
+"Password" => "პაროლი",
+"For anonymous access, leave DN and Password empty." => "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი.",
+"User Login Filter" => "მომხმარებლის ფილტრი",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\"",
+"User List Filter" => "მომხმარებლებიის სიის ფილტრი",
+"Defines the filter to apply, when retrieving users." => "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება.",
+"without any placeholder, e.g. \"objectClass=person\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\".",
+"Group Filter" => "ჯგუფის ფილტრი",
+"Defines the filter to apply, when retrieving groups." => "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\".",
+"Connection Settings" => "კავშირის პარამეტრები",
+"Configuration Active" => "კონფიგურაცია აქტიურია",
+"When unchecked, this configuration will be skipped." => "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
+"Port" => "პორტი",
+"Backup (Replica) Host" => "ბექაფ  (რეპლიკა)  ჰოსტი",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა.",
+"Backup (Replica) Port" => "ბექაფ (რეპლიკა) პორტი",
+"Disable Main Server" => "გამორთეთ ძირითადი სერვერი",
+"When switched on, ownCloud will only connect to the replica server." => "როცა მონიშნულია, ownCloud დაუკავშირდება მხოლოდ რეპლიკა სერვერს.",
+"Use TLS" => "გამოიყენეთ TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება.",
+"Case insensitve LDAP server (Windows)" => "LDAP server (Windows)",
+"Turn off SSL certificate validation." => "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "იმ შემთხვევაში თუ მუშაობს მხოლოდ ეს ოფცია, დააიმპორტეთ LDAP სერვერის SSL სერთიფიკატი თქვენს ownCloud სერვერზე.",
+"Not recommended, use for testing only." => "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ.",
+"Cache Time-To-Live" => "ქეშის სიცოცხლის ხანგრძლივობა",
+"in seconds. A change empties the cache." => "წამებში. ცვლილება ასუფთავებს ქეშს.",
+"Directory Settings" => "დირექტორიის პარამეტრები",
+"User Display Name Field" => "მომხმარებლის დისფლეის სახელის ფილდი",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP ატრიბუტი მომხმარებლის  ownCloud სახელის გენერაციისთვის.",
+"Base User Tree" => "ძირითად მომხმარებელთა სია",
+"One User Base DN per line" => "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე",
+"User Search Attributes" => "მომხმარებლის ძებნის ატრიბუტი",
+"Optional; one attribute per line" => "ოფციონალური; თითო ატრიბუტი თითო ხაზზე",
+"Group Display Name Field" => "ჯგუფის დისფლეის სახელის ფილდი",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP ატრიბუტი ჯგუფის  ownCloud სახელის გენერაციისთვის.",
+"Base Group Tree" => "ძირითად ჯგუფთა სია",
+"One Group Base DN per line" => "ერთი ჯგუფის საწყისი DN ერთ ხაზზე",
+"Group Search Attributes" => "ჯგუფური ძებნის ატრიბუტი",
+"Group-Member association" => "ჯგუფის წევრობის ასოციაცია",
+"Special Attributes" => "სპეციალური ატრიბუტები",
+"Quota Field" => "ქვოტას ველი",
+"Quota Default" => "საწყისი ქვოტა",
+"in bytes" => "ბაიტებში",
+"Email Field" => "იმეილის ველი",
+"User Home Folder Naming Rule" => "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი.",
+"Test Configuration" => "კავშირის ტესტირება",
 "Help" => "დახმარება"
 );
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ b/apps/user_webdavauth/l10n/ka_GE.php
@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV აუთენთიფიკაცია",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud–ი გამოგიგზავნით ანგარიშის მონაცემებს ამ URL–ზე. ეს პლაგინი შეამოწმებს პასუხს და მოახდენს მის ინტერპრეტაციას HTTP სტატუსკოდებში 401 და 403 დაუშვებელი მონაცემებისთვის, ხოლო სხვა დანარჩენს დაშვებადი მონაცემებისთვის."
+);
--- a/core/css/styles.css
+++ b/core/css/styles.css
@ -89,7 +89,7 @@ input[type="button"]:hover, input[type="button"]:focus,
 button:hover, button:focus,
 .button:hover, .button:focus,
 select:hover, select:focus, select:active {
-	background:rgba(250,250,250,.9);
+	background-color:rgba(250,250,250,.9);
 	color:#333;
 }
 input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
@ -98,7 +98,8 @@ input[type="submit"] img, input[type="button"] img, button img, .button img { cu
 /* disabled input fields and buttons */
 input:disabled, input:disabled:hover, input:disabled:focus,
 button:disabled, button:disabled:hover, button:disabled:focus,
-.button:disabled, .button:disabled:hover, .button:disabled:focus {
+.button:disabled, .button:disabled:hover, .button:disabled:focus,
+a.disabled, a.disabled:hover, a.disabled:focus {
 	background: rgba(230,230,230,.9);
 	color: #999;
 	cursor: default;
@ -221,11 +222,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }

 /* Show password toggle */
-#show { position:absolute; right:1em; top:.8em; float:right; }
-#show, #personal-show { display:none; }
-#show + label { right:1em; top:1.25em!important; }
-#show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-#show + label, #personal-show + label {
+#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
+#show, #dbpassword, #personal-show { display:none; }
+#show + label, #dbpassword + label { right:1em; top:1.25em!important; }
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
+#show + label, #dbpassword + label, #personal-show + label {
 	position:absolute!important; height:14px; width:24px;
 	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
@ -265,19 +266,42 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 	-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
 	overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
 }
-#navigation:hover { overflow-y:auto; }
+#navigation:hover { overflow-y:auto; } /* show scrollbar only on hover */
 #navigation a span {
 	display:block;
 	text-decoration:none; font-size:10px; text-align:center;
 	color:#fff; text-shadow:#000 0 -1px 0;
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5;
 	white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
 }
-	#navigation a:hover, #navigation a:focus { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-	#navigation a.active .icon, #navigation a.active span { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+
+	/* icon opacity and hover effect */
+	#navigation a img,
+	#navigation a span {
+		/* 50% opacity when inactive */
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+		filter: alpha(opacity=50);
+		opacity: .5;
+	}
+	#navigation a:hover img, #navigation a:focus img,
+	#navigation a:hover span, #navigation a:focus span {
+		/* 80% opacity when hovered or focused */
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+		filter: alpha(opacity=80);
+		opacity: .8;
+	}
+	#navigation a.active img,
+	#navigation a.active span {
+		 /* full opacity for the active app */
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+		filter: alpha(opacity=100);
+		opacity: 1;
+	}
+
+	/* positioning */
 	#navigation .icon {
-		display:block; width:32px; height:32px; margin:0 16px 0; padding:8px 0 4px; 	
-		-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5;
+		display:block;
+		width:32px; height:32px;
+		margin:0 16px 0; padding:8px 0 4px;
 	}
 	#navigation li:first-child a { padding-top:16px; }

@ -335,17 +359,17 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat;  border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
 .error { color:#FF3B3B; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
-.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777777; padding-left:25px; background-position:0 0.3em;}
+.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;}
 .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; }

 a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px }

-.exception{color:#000000;}
+.exception{color:#000;}
 .exception textarea{width:95%;height:200px;background:#ffe;border:0;}

 .ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); }
 .ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); }
-.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#ffffff; }
+.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }

 /* ---- DIALOGS ---- */
 #dirup {width:4%;}
@ -366,7 +390,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 #category_addinput { width:10em; }

 /* ---- APP SETTINGS ---- */
-.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888888; color:#333333; padding:10px; position:fixed !important; z-index:200; }
+.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
 .popup.topright { top:7em; right:1em; }
 .popup.bottomleft { bottom:1em; left:33em; }
 .popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; }
@ -413,7 +437,8 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; }
 	-moz-box-sizing: border-box; box-sizing: border-box;
 	text-shadow: 0 1px 0 rgba(255,255,255,.9);
 }
-#app-navigation .active { /* active navigation entry or folder */
+#app-navigation .active,
+#app-navigation .active a { /* active navigation entry or folder */
 	background-color: #ddd;
 	text-shadow: 0 1px 0 rgba(255,255,255,.7);
 }
--- a/core/js/js.js
+++ b/core/js/js.js
@ -605,6 +605,7 @@ $(document).ready(function(){
 	setShowPassword($('#password'), $('label[for=show]'));
 	setShowPassword($('#adminpass'), $('label[for=show]'));
 	setShowPassword($('#pass2'), $('label[for=personal-show]'));
+	setShowPassword($('#dbpass'), $('label[for=dbpassword]'));

 	//use infield labels
 	$("label.infield").inFieldLabels({
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@ -0,0 +1,101 @@
+/**
+ * jQuery plugin for micro templates
+ *
+ * Strings are automatically escaped, but that can be disabled by setting escapeFunction to null.
+ *
+ * Usage examples:
+ *
+ *	var htmlStr = '<p>Bake, uncovered, until the {greasystuff} is melted and the {pasta} is heated through, about {min} minutes.</p>'
+ *	$(htmlStr).octemplate({greasystuff: 'cheese', pasta: 'macaroni', min: 10});
+ *
+ * 	var htmlStr = '<p>Welcome back {user}</p>';
+ *	$(htmlStr).octemplate({user: 'John Q. Public'}, {escapeFunction: null});
+ *
+ * Be aware that the target string must be wrapped in an HTML element for the plugin to work. The following won't work:
+ * 
+ *      var textStr = 'Welcome back {user}';
+ *      $(textStr).octemplate({user: 'John Q. Public'});
+ *
+ * For anything larger than one-liners, you can use a simple $.get() ajax request to get the template,
+ * or you can embed them it the page using the text/template type:
+ *
+ * <script id="contactListItemTemplate" type="text/template">
+ *	<tr class="contact" data-id="{id}">
+ *		<td class="name">
+ *			<input type="checkbox" name="id" value="{id}" /><span class="nametext">{name}</span>
+ *		</td>
+ *		<td class="email">
+ *			<a href="mailto:{email}">{email}</a>
+ *		</td>
+ *		<td class="phone">{phone}</td>
+ *	</tr>
+ * </script>
+ *
+ * var $tmpl = $('#contactListItemTemplate');
+ * var contacts = // fetched in some ajax call
+ *
+ * $.each(contacts, function(idx, contact) {
+ * 		$contactList.append(
+ * 			$tmpl.octemplate({
+ * 				id: contact.getId(),
+ * 				name: contact.getDisplayName(),
+ * 				email: contact.getPreferredEmail(),
+ * 				phone: contact.getPreferredPhone(),
+ * 			});
+ * 		);
+ * });
+ */
+(function( $ ) {
+	/**
+	* Object Template
+	* Inspired by micro templating done by e.g. underscore.js
+	*/
+	var Template = {
+		init: function(vars, options, elem) {
+			// Mix in the passed in options with the default options
+			this.vars = vars;
+			this.options = $.extend({},this.options,options);
+
+			this.elem = elem;
+			var self = this;
+
+			if(typeof this.options.escapeFunction === 'function') {
+				$.each(this.vars, function(key, val) {
+					if(typeof val === 'string') {
+						self.vars[key] = self.options.escapeFunction(val);
+					}
+				});
+			}
+
+			var _html = this._build(this.vars);
+			return $(_html);
+		},
+		// From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
+		_build: function(o){
+			var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : this.elem.get(0).outerHTML;
+			try {
+				return data.replace(/{([^{}]*)}/g,
+					function (a, b) {
+						var r = o[b];
+						return typeof r === 'string' || typeof r === 'number' ? r : a;
+					}
+				);
+			} catch(e) {
+				console.error(e, 'data:', data)
+			}
+		},
+		options: {
+			escapeFunction: function(str) {return $('<i></i>').text(str).html();}
+		}
+	};
+
+	$.fn.octemplate = function(vars, options) {
+		var vars = vars ? vars : {};
+		if(this.length) {
+			var _template = Object.create(Template);
+			return _template.init(vars, options, this);
+		}
+	};
+
+})( jQuery );
+
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@ -44,11 +44,11 @@
 "months ago" => "شهر مضى",
 "last year" => "السنةالماضية",
 "years ago" => "سنة مضت",
-"Choose" => "اختيار",
-"Cancel" => "الغاء",
-"No" => "لا",
-"Yes" => "نعم",
 "Ok" => "موافق",
+"Cancel" => "الغاء",
+"Choose" => "اختيار",
+"Yes" => "نعم",
+"No" => "لا",
 "The object type is not specified." => "نوع العنصر غير محدد.",
 "Error" => "خطأ",
 "The app name is not specified." => "اسم التطبيق غير محدد.",
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@ -43,11 +43,11 @@
 "months ago" => "মাস পূর্বে",
 "last year" => "গত বছর",
 "years ago" => "বছর পূর্বে",
-"Choose" => "বেছে নিন",
-"Cancel" => "বাতির",
-"No" => "না",
-"Yes" => "হ্যাঁ",
 "Ok" => "তথাস্তু",
+"Cancel" => "বাতির",
+"Choose" => "বেছে নিন",
+"Yes" => "হ্যাঁ",
+"No" => "না",
 "The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
 "Error" => "সমস্যা",
 "The app name is not specified." => "অ্যাপের নামটি  সুনির্দিষ্ট নয়।",
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@ -44,11 +44,11 @@
 "months ago" => "mesos enrere",
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
-"Choose" => "Escull",
-"Cancel" => "Cancel·la",
-"No" => "No",
-"Yes" => "Sí",
 "Ok" => "D'acord",
+"Cancel" => "Cancel·la",
+"Choose" => "Escull",
+"Yes" => "Sí",
+"No" => "No",
 "The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
 "Error" => "Error",
 "The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@ -44,11 +44,11 @@
 "months ago" => "před měsíci",
 "last year" => "minulý rok",
 "years ago" => "před lety",
-"Choose" => "Vybrat",
-"Cancel" => "Zrušit",
-"No" => "Ne",
-"Yes" => "Ano",
 "Ok" => "Ok",
+"Cancel" => "Zrušit",
+"Choose" => "Vybrat",
+"Yes" => "Ano",
+"No" => "Ne",
 "The object type is not specified." => "Není určen typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "Není určen název aplikace.",
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@ -0,0 +1,139 @@
+<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Rhannodd defnyddiwr %s ffeil â chi",
+"User %s shared a folder with you" => "Rhannodd defnyddiwr %s blygell â chi",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Rhannodd defnyddiwr %s ffeil \"%s\" â chi. Gellir ei llwytho lawr o fan hyn: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Rhannodd defnyddiwr %s blygell \"%s\" â chi. Gellir ei llwytho lawr o fan hyn: %s",
+"Category type not provided." => "Math o gategori heb ei ddarparu.",
+"No category to add?" => "Dim categori i'w ychwanegu?",
+"This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s",
+"Object type not provided." => "Math o wrthrych heb ei ddarparu.",
+"%s ID not provided." => "%s ID heb ei ddarparu.",
+"Error adding %s to favorites." => "Gwall wrth ychwanegu %s at ffefrynnau.",
+"No categories selected for deletion." => "Ni ddewiswyd categorïau i'w dileu.",
+"Error removing %s from favorites." => "Gwall wrth dynnu %s o ffefrynnau.",
+"Sunday" => "Sul",
+"Monday" => "Llun",
+"Tuesday" => "Mawrth",
+"Wednesday" => "Mercher",
+"Thursday" => "Iau",
+"Friday" => "Gwener",
+"Saturday" => "Sadwrn",
+"January" => "Ionawr",
+"February" => "Chwefror",
+"March" => "Mawrth",
+"April" => "Ebrill",
+"May" => "Mai",
+"June" => "Mehefin",
+"July" => "Gorffennaf",
+"August" => "Awst",
+"September" => "Medi",
+"October" => "Hydref",
+"November" => "Tachwedd",
+"December" => "Rhagfyr",
+"Settings" => "Gosodiadau",
+"seconds ago" => "eiliad yn ôl",
+"1 minute ago" => "1 munud yn ôl",
+"{minutes} minutes ago" => "{minutes} munud yn ôl",
+"1 hour ago" => "1 awr yn ôl",
+"{hours} hours ago" => "{hours} awr yn ôl",
+"today" => "heddiw",
+"yesterday" => "ddoe",
+"{days} days ago" => "{days} diwrnod yn ôl",
+"last month" => "mis diwethaf",
+"{months} months ago" => "{months} mis yn ôl",
+"months ago" => "misoedd yn ôl",
+"last year" => "y llynedd",
+"years ago" => "blwyddyn yn ôl",
+"Ok" => "Iawn",
+"Cancel" => "Diddymu",
+"Choose" => "Dewisiwch",
+"Yes" => "Ie",
+"No" => "Na",
+"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
+"Error" => "Gwall",
+"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
+"The required file {file} is not installed!" => "Nid yw'r ffeil ofynnol {file} wedi ei gosod!",
+"Shared" => "Rhannwyd",
+"Share" => "Rhannu",
+"Error while sharing" => "Gwall wrth rannu",
+"Error while unsharing" => "Gwall wrth ddad-rannu",
+"Error while changing permissions" => "Gwall wrth newid caniatâd",
+"Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+"Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
+"Share with" => "Rhannu gyda",
+"Share with link" => "Dolen ar gyfer rhannu",
+"Password protect" => "Diogelu cyfrinair",
+"Password" => "Cyfrinair",
+"Email link to person" => "E-bostio dolen at berson",
+"Send" => "Anfon",
+"Set expiration date" => "Gosod dyddiad dod i ben",
+"Expiration date" => "Dyddiad dod i ben",
+"Share via email:" => "Rhannu drwy e-bost:",
+"No people found" => "Heb ganfod pobl",
+"Resharing is not allowed" => "Does dim hawl ail-rannu",
+"Shared in {item} with {user}" => "Rhannwyd yn {item} â {user}",
+"Unshare" => "Dad-rannu",
+"can edit" => "yn gallu golygu",
+"access control" => "rheolaeth mynediad",
+"create" => "creu",
+"update" => "diweddaru",
+"delete" => "dileu",
+"share" => "rhannu",
+"Password protected" => "Diogelwyd â chyfrinair",
+"Error unsetting expiration date" => "Gwall wrth ddad-osod dyddiad dod i ben",
+"Error setting expiration date" => "Gwall wrth osod dyddiad dod i ben",
+"Sending ..." => "Yn anfon ...",
+"Email sent" => "Anfonwyd yr e-bost",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
+"ownCloud password reset" => "ailosod cyfrinair ownCloud",
+"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+"Reset email send." => "Ailosod anfon e-bost.",
+"Request failed!" => "Methodd y cais!",
+"Username" => "Enw defnyddiwr",
+"Request reset" => "Gwneud cais i ailosod",
+"Your password was reset" => "Ailosodwyd eich cyfrinair",
+"To login page" => "I'r dudalen mewngofnodi",
+"New password" => "Cyfrinair newydd",
+"Reset password" => "Ailosod cyfrinair",
+"Personal" => "Personol",
+"Users" => "Defnyddwyr",
+"Apps" => "Pecynnau",
+"Admin" => "Gweinyddu",
+"Help" => "Cymorth",
+"Access forbidden" => "Mynediad wedi'i wahardd",
+"Cloud not found" => "Methwyd canfod cwmwl",
+"Edit categories" => "Golygu categorïau",
+"Add" => "Ychwanegu",
+"Security Warning" => "Rhybudd Diogelwch",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraeddd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ddogfennaeth</a>.",
+"Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
+"Advanced" => "Uwch",
+"Data folder" => "Plygell data",
+"Configure the database" => "Cyflunio'r gronfa ddata",
+"will be used" => "ddefnyddir",
+"Database user" => "Defnyddiwr cronfa ddata",
+"Database password" => "Cyfrinair cronfa ddata",
+"Database name" => "Enw cronfa ddata",
+"Database tablespace" => "Tablespace cronfa ddata",
+"Database host" => "Gwesteiwr cronfa ddata",
+"Finish setup" => "Gorffen sefydlu",
+"web services under your control" => "gwasanaethau gwe a reolir gennych",
+"Log out" => "Allgofnodi",
+"Automatic logon rejected!" => "Gwrthodwyd mewngofnodi awtomatig!",
+"If you did not change your password recently, your account may be compromised!" => "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!",
+"Please change your password to secure your account again." => "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto.",
+"Lost your password?" => "Wedi colli'ch cyfrinair?",
+"remember" => "cofio",
+"Log in" => "Mewngofnodi",
+"Alternative Logins" => "Mewngofnodiadau Amgen",
+"prev" => "blaenorol",
+"next" => "nesaf",
+"Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
+);
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@ -44,11 +44,11 @@
 "months ago" => "måneder siden",
 "last year" => "sidste år",
 "years ago" => "år siden",
-"Choose" => "Vælg",
-"Cancel" => "Fortryd",
-"No" => "Nej",
-"Yes" => "Ja",
 "Ok" => "OK",
+"Cancel" => "Fortryd",
+"Choose" => "Vælg",
+"Yes" => "Ja",
+"No" => "Nej",
 "The object type is not specified." => "Objekttypen er ikke angivet.",
 "Error" => "Fejl",
 "The app name is not specified." => "Den app navn er ikke angivet.",
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@ -44,11 +44,11 @@
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
-"No" => "Nein",
-"Yes" => "Ja",
 "Ok" => "OK",
+"Cancel" => "Abbrechen",
+"Choose" => "Auswählen",
+"Yes" => "Ja",
+"No" => "Nein",
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Error" => "Fehler",
 "The app name is not specified." => "Der App-Name ist nicht angegeben.",
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@ -44,11 +44,11 @@
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
-"No" => "Nein",
-"Yes" => "Ja",
 "Ok" => "OK",
+"Cancel" => "Abbrechen",
+"Choose" => "Auswählen",
+"Yes" => "Ja",
+"No" => "Nein",
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Error" => "Fehler",
 "The app name is not specified." => "Der App-Name ist nicht angegeben.",
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@ -43,11 +43,11 @@
 "months ago" => "monatoj antaŭe",
 "last year" => "lastajare",
 "years ago" => "jaroj antaŭe",
-"Choose" => "Elekti",
-"Cancel" => "Nuligi",
-"No" => "Ne",
-"Yes" => "Jes",
 "Ok" => "Akcepti",
+"Cancel" => "Nuligi",
+"Choose" => "Elekti",
+"Yes" => "Jes",
+"No" => "Ne",
 "The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
 "Error" => "Eraro",
 "The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.",
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@ -44,11 +44,11 @@
 "months ago" => "hace meses",
 "last year" => "año pasado",
 "years ago" => "hace años",
-"Choose" => "Seleccionar",
-"Cancel" => "Cancelar",
-"No" => "No",
-"Yes" => "Sí",
 "Ok" => "Aceptar",
+"Cancel" => "Cancelar",
+"Choose" => "Seleccionar",
+"Yes" => "Sí",
+"No" => "No",
 "The object type is not specified." => "El tipo de objeto no se ha especificado.",
 "Error" => "Fallo",
 "The app name is not specified." => "El nombre de la app no se ha especificado.",
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@ -44,11 +44,11 @@
 "months ago" => "meses atrás",
 "last year" => "el año pasado",
 "years ago" => "años atrás",
-"Choose" => "Elegir",
-"Cancel" => "Cancelar",
-"No" => "No",
-"Yes" => "Sí",
 "Ok" => "Aceptar",
+"Cancel" => "Cancelar",
+"Choose" => "Elegir",
+"Yes" => "Sí",
+"No" => "No",
 "The object type is not specified." => "El tipo de objeto no esta especificado. ",
 "Error" => "Error",
 "The app name is not specified." => "El nombre de la aplicación no esta especificado.",
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@ -44,11 +44,11 @@
 "months ago" => "hilabete",
 "last year" => "joan den urtean",
 "years ago" => "urte",
-"Choose" => "Aukeratu",
-"Cancel" => "Ezeztatu",
-"No" => "Ez",
-"Yes" => "Bai",
 "Ok" => "Ados",
+"Cancel" => "Ezeztatu",
+"Choose" => "Aukeratu",
+"Yes" => "Bai",
+"No" => "Ez",
 "The object type is not specified." => "Objetu mota ez dago zehaztuta.",
 "Error" => "Errorea",
 "The app name is not specified." => "App izena ez dago zehaztuta.",
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@ -44,11 +44,11 @@
 "months ago" => "ماه‌های قبل",
 "last year" => "سال قبل",
 "years ago" => "سال‌های قبل",
-"Choose" => "انتخاب کردن",
-"Cancel" => "منصرف شدن",
-"No" => "نه",
-"Yes" => "بله",
 "Ok" => "قبول",
+"Cancel" => "منصرف شدن",
+"Choose" => "انتخاب کردن",
+"Yes" => "بله",
+"No" => "نه",
 "The object type is not specified." => "نوع شی تعیین نشده است.",
 "Error" => "خطا",
 "The app name is not specified." => "نام برنامه تعیین نشده است.",
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@ -42,11 +42,11 @@
 "months ago" => "kuukautta sitten",
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
-"Choose" => "Valitse",
-"Cancel" => "Peru",
-"No" => "Ei",
-"Yes" => "Kyllä",
 "Ok" => "Ok",
+"Cancel" => "Peru",
+"Choose" => "Valitse",
+"Yes" => "Kyllä",
+"No" => "Ei",
 "Error" => "Virhe",
 "The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
 "The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@ -44,11 +44,11 @@
 "months ago" => "il y a plusieurs mois",
 "last year" => "l'année dernière",
 "years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
-"Cancel" => "Annuler",
-"No" => "Non",
-"Yes" => "Oui",
 "Ok" => "Ok",
+"Cancel" => "Annuler",
+"Choose" => "Choisir",
+"Yes" => "Oui",
+"No" => "Non",
 "The object type is not specified." => "Le type d'objet n'est pas spécifié.",
 "Error" => "Erreur",
 "The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@ -44,11 +44,11 @@
 "months ago" => "meses atrás",
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"Choose" => "Escoller",
-"Cancel" => "Cancelar",
-"No" => "Non",
-"Yes" => "Si",
 "Ok" => "Aceptar",
+"Cancel" => "Cancelar",
+"Choose" => "Escoller",
+"Yes" => "Si",
+"No" => "Non",
 "The object type is not specified." => "Non se especificou o tipo de obxecto.",
 "Error" => "Erro",
 "The app name is not specified." => "Non se especificou o nome do aplicativo.",
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@ -44,11 +44,11 @@
 "months ago" => "חודשים",
 "last year" => "שנה שעברה",
 "years ago" => "שנים",
-"Choose" => "בחירה",
-"Cancel" => "ביטול",
-"No" => "לא",
-"Yes" => "כן",
 "Ok" => "בסדר",
+"Cancel" => "ביטול",
+"Choose" => "בחירה",
+"Yes" => "כן",
+"No" => "לא",
 "The object type is not specified." => "סוג הפריט לא צוין.",
 "Error" => "שגיאה",
 "The app name is not specified." => "שם היישום לא צוין.",
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@ -28,11 +28,11 @@
 "months ago" => "mjeseci",
 "last year" => "prošlu godinu",
 "years ago" => "godina",
-"Choose" => "Izaberi",
-"Cancel" => "Odustani",
-"No" => "Ne",
-"Yes" => "Da",
 "Ok" => "U redu",
+"Cancel" => "Odustani",
+"Choose" => "Izaberi",
+"Yes" => "Da",
+"No" => "Ne",
 "Error" => "Pogreška",
 "Share" => "Podijeli",
 "Error while sharing" => "Greška prilikom djeljenja",
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@ -44,11 +44,11 @@
 "months ago" => "több hónapja",
 "last year" => "tavaly",
 "years ago" => "több éve",
-"Choose" => "Válasszon",
-"Cancel" => "Mégse",
-"No" => "Nem",
-"Yes" => "Igen",
 "Ok" => "Ok",
+"Cancel" => "Mégse",
+"Choose" => "Válasszon",
+"Yes" => "Igen",
+"No" => "Nem",
 "The object type is not specified." => "Az objektum típusa nincs megadva.",
 "Error" => "Hiba",
 "The app name is not specified." => "Az alkalmazás neve nincs megadva.",
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@ -43,11 +43,11 @@
 "months ago" => "mánuðir síðan",
 "last year" => "síðasta ári",
 "years ago" => "árum síðan",
-"Choose" => "Veldu",
-"Cancel" => "Hætta við",
-"No" => "Nei",
-"Yes" => "Já",
 "Ok" => "Í lagi",
+"Cancel" => "Hætta við",
+"Choose" => "Veldu",
+"Yes" => "Já",
+"No" => "Nei",
 "The object type is not specified." => "Tegund ekki tilgreind",
 "Error" => "Villa",
 "The app name is not specified." => "Nafn forrits ekki tilgreint",
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@ -44,11 +44,11 @@
 "months ago" => "mesi fa",
 "last year" => "anno scorso",
 "years ago" => "anni fa",
-"Choose" => "Scegli",
-"Cancel" => "Annulla",
-"No" => "No",
-"Yes" => "Sì",
 "Ok" => "Ok",
+"Cancel" => "Annulla",
+"Choose" => "Scegli",
+"Yes" => "Sì",
+"No" => "No",
 "The object type is not specified." => "Il tipo di oggetto non è specificato.",
 "Error" => "Errore",
 "The app name is not specified." => "Il nome dell'applicazione non è specificato.",
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@ -31,7 +31,7 @@
 "November" => "11月",
 "December" => "12月",
 "Settings" => "設定",
-"seconds ago" => "秒前",
+"seconds ago" => "数秒前",
 "1 minute ago" => "1 分前",
 "{minutes} minutes ago" => "{minutes} 分前",
 "1 hour ago" => "1 時間前",
@ -44,11 +44,11 @@
 "months ago" => "月前",
 "last year" => "一年前",
 "years ago" => "年前",
-"Choose" => "選択",
-"Cancel" => "キャンセル",
-"No" => "いいえ",
-"Yes" => "はい",
 "Ok" => "OK",
+"Cancel" => "キャンセル",
+"Choose" => "選択",
+"Yes" => "はい",
+"No" => "いいえ",
 "The object type is not specified." => "オブジェクタイプが指定されていません。",
 "Error" => "エラー",
 "The app name is not specified." => "アプリ名がしていされていません。",
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "მომხმარებელმა  %s გაგიზიარათ ფაილი",
+"User %s shared a folder with you" => "მომხმარებელმა  %s გაგიზიარათ ფოლდერი",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "მომხმარებელმა %s გაგიზიარათ ფაილი \"%s\". ის ხელმისაწვდომია გადმოსაწერად აქ: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "მომხმარებელმა %s გაგიზიარათ ფოლდერი \"%s\". ის ხელმისაწვდომია გადმოსაწერად აქ: %s",
+"Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.",
 "No category to add?" => "არ არის კატეგორია დასამატებლად?",
+"This category already exists: %s" => "კატეგორია უკვე არსებობს: %s",
+"Object type not provided." => "ობიექტის ტიპი არ არის განხილული.",
+"%s ID not provided." => "%s ID არ არის განხილული",
+"Error adding %s to favorites." => "შეცდომა %s–ის ფევორიტებში დამატების დროს.",
 "No categories selected for deletion." => "სარედაქტირებელი კატეგორია არ არის არჩეული ",
+"Error removing %s from favorites." => "შეცდომა  %s–ის ფევორიტებიდან წაშლის დროს.",
 "Sunday" => "კვირა",
 "Monday" => "ორშაბათი",
 "Tuesday" => "სამშაბათი",
@ -24,32 +34,44 @@
 "seconds ago" => "წამის წინ",
 "1 minute ago" => "1 წუთის წინ",
 "{minutes} minutes ago" => "{minutes} წუთის წინ",
+"1 hour ago" => "1 საათის წინ",
+"{hours} hours ago" => "{hours} საათის წინ",
 "today" => "დღეს",
 "yesterday" => "გუშინ",
 "{days} days ago" => "{days} დღის წინ",
 "last month" => "გასულ თვეში",
+"{months} months ago" => "{months} თვის წინ",
 "months ago" => "თვის წინ",
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
-"Choose" => "არჩევა",
-"Cancel" => "უარყოფა",
-"No" => "არა",
-"Yes" => "კი",
 "Ok" => "დიახ",
+"Cancel" => "უარყოფა",
+"Choose" => "არჩევა",
+"Yes" => "კი",
+"No" => "არა",
+"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
 "Error" => "შეცდომა",
+"The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.",
+"The required file {file} is not installed!" => "მოთხოვნილი ფაილი  {file} არ არის დაინსტალირებული.",
+"Shared" => "გაზიარებული",
 "Share" => "გაზიარება",
 "Error while sharing" => "შეცდომა გაზიარების დროს",
 "Error while unsharing" => "შეცდომა გაზიარების გაუქმების დროს",
 "Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
+"Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+"Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
 "Share with" => "გაუზიარე",
 "Share with link" => "გაუზიარე ლინკით",
 "Password protect" => "პაროლით დაცვა",
 "Password" => "პაროლი",
+"Email link to person" => "ლინკის პიროვნების იმეილზე გაგზავნა",
+"Send" => "გაგზავნა",
 "Set expiration date" => "მიუთითე ვადის გასვლის დრო",
 "Expiration date" => "ვადის გასვლის დრო",
 "Share via email:" => "გააზიარე მეილზე",
 "No people found" => "მომხმარებელი არ არის ნაპოვნი",
 "Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
+"Shared in {item} with {user}" => "გაზიარდა {item}–ში  {user}–ის მიერ",
 "Unshare" => "გაზიარების მოხსნა",
 "can edit" => "შეგიძლია შეცვლა",
 "access control" => "დაშვების კონტროლი",
@ -60,9 +82,15 @@
 "Password protected" => "პაროლით დაცული",
 "Error unsetting expiration date" => "შეცდომა ვადის გასვლის მოხსნის დროს",
 "Error setting expiration date" => "შეცდომა ვადის გასვლის მითითების დროს",
+"Sending ..." => "გაგზავნა ....",
+"Email sent" => "იმეილი გაიგზავნა",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "განახლება ვერ განხორციელდა. გთხოვთ შეგვატყობინოთ ამ პრობლემის შესახებ აქ: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
 "ownCloud password reset" => "ownCloud პაროლის შეცვლა",
 "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
 "You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
+"Reset email send." => "რესეტის მეილი გაიგზავნა",
+"Request failed!" => "მოთხოვნა შეწყდა!",
 "Username" => "მომხმარებელი",
 "Request reset" => "პაროლის შეცვლის მოთხოვნა",
 "Your password was reset" => "თქვენი პაროლი შეცვლილია",
@ -79,10 +107,14 @@
 "Edit categories" => "კატეგორიების რედაქტირება",
 "Add" => "დამატება",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "იმისათვის რომ გამოიყენოთ ownCloud უსაფრთხოდ, გთხოვთ განაახლოთ თქვენი  PHP ვერსია.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "სერვერის კორექტულად დასაკონფიგურირებლად, ნახეთ შემდეგი  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">დოკუმენტაცია</a>.",
 "Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
-"Advanced" => "Advanced",
+"Advanced" => "დამატებითი ფუნქციები",
 "Data folder" => "მონაცემთა საქაღალდე",
 "Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
 "will be used" => "გამოყენებული იქნება",
@ -95,9 +127,13 @@
 "web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
 "Log out" => "გამოსვლა",
 "Automatic logon rejected!" => "ავტომატური შესვლა უარყოფილია!",
+"If you did not change your password recently, your account may be compromised!" => "თუ თქვენ არ შეცვლით პაროლს, თქვენი ანგარიში შეიძლება იყოს დაშვებადი სხვებისთვის",
+"Please change your password to secure your account again." => "გთხოვთ შეცვალოთ თქვენი პაროლი, თქვენი ანგარიშის დასაცავად.",
 "Lost your password?" => "დაგავიწყდათ პაროლი?",
 "remember" => "დამახსოვრება",
 "Log in" => "შესვლა",
+"Alternative Logins" => "ალტერნატიული Login–ი",
 "prev" => "წინა",
-"next" => "შემდეგი"
+"next" => "შემდეგი",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud–ის განახლება %s–ვერსიამდე. ეს მოითხოვს გარკვეულ დროს."
 );
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@ -43,11 +43,11 @@
 "months ago" => "개월 전",
 "last year" => "작년",
 "years ago" => "년 전",
-"Choose" => "선택",
-"Cancel" => "취소",
-"No" => "아니요",
-"Yes" => "예",
 "Ok" => "승락",
+"Cancel" => "취소",
+"Choose" => "선택",
+"Yes" => "예",
+"No" => "아니요",
 "The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
 "Error" => "오류",
 "The app name is not specified." => "앱 이름이 지정되지 않았습니다.",
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@ -28,11 +28,11 @@
 "months ago" => "Méint hier",
 "last year" => "Läscht Joer",
 "years ago" => "Joren hier",
-"Choose" => "Auswielen",
-"Cancel" => "Ofbriechen",
-"No" => "Nee",
-"Yes" => "Jo",
 "Ok" => "OK",
+"Cancel" => "Ofbriechen",
+"Choose" => "Auswielen",
+"Yes" => "Jo",
+"No" => "Nee",
 "Error" => "Fehler",
 "Share" => "Deelen",
 "Password" => "Passwuert",
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@ -31,11 +31,11 @@
 "months ago" => "prieš mėnesį",
 "last year" => "praeitais metais",
 "years ago" => "prieš metus",
-"Choose" => "Pasirinkite",
-"Cancel" => "Atšaukti",
-"No" => "Ne",
-"Yes" => "Taip",
 "Ok" => "Gerai",
+"Cancel" => "Atšaukti",
+"Choose" => "Pasirinkite",
+"Yes" => "Taip",
+"No" => "Ne",
 "Error" => "Klaida",
 "Share" => "Dalintis",
 "Error while sharing" => "Klaida, dalijimosi metu",
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@ -44,11 +44,11 @@
 "months ago" => "mēnešus atpakaļ",
 "last year" => "gājušajā gadā",
 "years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
-"Cancel" => "Atcelt",
-"No" => "Nē",
-"Yes" => "Jā",
 "Ok" => "Labi",
+"Cancel" => "Atcelt",
+"Choose" => "Izvēlieties",
+"Yes" => "Jā",
+"No" => "Nē",
 "The object type is not specified." => "Nav norādīts objekta tips.",
 "Error" => "Kļūda",
 "The app name is not specified." => "Nav norādīts lietotnes nosaukums.",
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@ -43,11 +43,11 @@
 "months ago" => "пред месеци",
 "last year" => "минатата година",
 "years ago" => "пред години",
-"Choose" => "Избери",
-"Cancel" => "Откажи",
-"No" => "Не",
-"Yes" => "Да",
 "Ok" => "Во ред",
+"Cancel" => "Откажи",
+"Choose" => "Избери",
+"Yes" => "Да",
+"No" => "Не",
 "The object type is not specified." => "Не е специфициран типот на објект.",
 "Error" => "Грешка",
 "The app name is not specified." => "Името на апликацијата не е специфицирано.",
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@ -21,10 +21,10 @@
 "November" => "November",
 "December" => "Disember",
 "Settings" => "Tetapan",
-"Cancel" => "Batal",
-"No" => "Tidak",
-"Yes" => "Ya",
 "Ok" => "Ok",
+"Cancel" => "Batal",
+"Yes" => "Ya",
+"No" => "Tidak",
 "Error" => "Ralat",
 "Share" => "Kongsi",
 "Password" => "Kata laluan",
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@ -21,11 +21,11 @@
 "last month" => "ပြီးခဲ့သောလ",
 "last year" => "မနှစ်က",
 "years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးချယ်",
-"Cancel" => "ပယ်ဖျက်မည်",
-"No" => "မဟုတ်ဘူး",
-"Yes" => "ဟုတ်",
 "Ok" => "အိုကေ",
+"Cancel" => "ပယ်ဖျက်မည်",
+"Choose" => "ရွေးချယ်",
+"Yes" => "ဟုတ်",
+"No" => "မဟုတ်ဘူး",
 "Password" => "စကားဝှက်",
 "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
 "Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@ -34,11 +34,11 @@
 "months ago" => "måneder siden",
 "last year" => "forrige år",
 "years ago" => "år siden",
-"Choose" => "Velg",
-"Cancel" => "Avbryt",
-"No" => "Nei",
-"Yes" => "Ja",
 "Ok" => "Ok",
+"Cancel" => "Avbryt",
+"Choose" => "Velg",
+"Yes" => "Ja",
+"No" => "Nei",
 "Error" => "Feil",
 "Share" => "Del",
 "Error while sharing" => "Feil under deling",
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@ -44,11 +44,11 @@
 "months ago" => "maanden geleden",
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Cancel" => "Annuleren",
-"No" => "Nee",
-"Yes" => "Ja",
 "Ok" => "Ok",
+"Cancel" => "Annuleren",
+"Choose" => "Kies",
+"Yes" => "Ja",
+"No" => "Nee",
 "The object type is not specified." => "Het object type is niet gespecificeerd.",
 "Error" => "Fout",
 "The app name is not specified." => "De app naam is niet gespecificeerd.",
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@ -29,11 +29,11 @@
 "months ago" => "meses  a",
 "last year" => "an passat",
 "years ago" => "ans a",
-"Choose" => "Causís",
-"Cancel" => "Anulla",
-"No" => "Non",
-"Yes" => "Òc",
 "Ok" => "D'accòrdi",
+"Cancel" => "Anulla",
+"Choose" => "Causís",
+"Yes" => "Òc",
+"No" => "Non",
 "Error" => "Error",
 "Share" => "Parteja",
 "Error while sharing" => "Error al partejar",
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@ -44,11 +44,11 @@
 "months ago" => "miesięcy temu",
 "last year" => "w zeszłym roku",
 "years ago" => "lat temu",
-"Choose" => "Wybierz",
-"Cancel" => "Anuluj",
-"No" => "Nie",
-"Yes" => "Tak",
 "Ok" => "OK",
+"Cancel" => "Anuluj",
+"Choose" => "Wybierz",
+"Yes" => "Tak",
+"No" => "Nie",
 "The object type is not specified." => "Nie określono typu obiektu.",
 "Error" => "Błąd",
 "The app name is not specified." => "Nie określono nazwy aplikacji.",
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@ -44,11 +44,11 @@
 "months ago" => "meses atrás",
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Cancel" => "Cancelar",
-"No" => "Não",
-"Yes" => "Sim",
 "Ok" => "Ok",
+"Cancel" => "Cancelar",
+"Choose" => "Escolha",
+"Yes" => "Sim",
+"No" => "Não",
 "The object type is not specified." => "O tipo de objeto não foi especificado.",
 "Error" => "Erro",
 "The app name is not specified." => "O nome do app não foi especificado.",
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@ -44,11 +44,11 @@
 "months ago" => "meses atrás",
 "last year" => "ano passado",
 "years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Cancel" => "Cancelar",
-"No" => "Não",
-"Yes" => "Sim",
 "Ok" => "Ok",
+"Cancel" => "Cancelar",
+"Choose" => "Escolha",
+"Yes" => "Sim",
+"No" => "Não",
 "The object type is not specified." => "O tipo de objecto não foi especificado",
 "Error" => "Erro",
 "The app name is not specified." => "O nome da aplicação não foi especificado",
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@ -43,11 +43,11 @@
 "months ago" => "luni în urmă",
 "last year" => "ultimul an",
 "years ago" => "ani în urmă",
-"Choose" => "Alege",
-"Cancel" => "Anulare",
-"No" => "Nu",
-"Yes" => "Da",
 "Ok" => "Ok",
+"Cancel" => "Anulare",
+"Choose" => "Alege",
+"Yes" => "Da",
+"No" => "Nu",
 "The object type is not specified." => "Tipul obiectului nu a fost specificat",
 "Error" => "Eroare",
 "The app name is not specified." => "Numele aplicației nu a fost specificat",
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@ -44,11 +44,11 @@
 "months ago" => "несколько месяцев назад",
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
-"Choose" => "Выбрать",
-"Cancel" => "Отмена",
-"No" => "Нет",
-"Yes" => "Да",
 "Ok" => "Ок",
+"Cancel" => "Отмена",
+"Choose" => "Выбрать",
+"Yes" => "Да",
+"No" => "Нет",
 "The object type is not specified." => "Тип объекта не указан",
 "Error" => "Ошибка",
 "The app name is not specified." => "Имя приложения не указано",
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@ -44,11 +44,11 @@
 "months ago" => "месяц назад",
 "last year" => "в прошлом году",
 "years ago" => "лет назад",
-"Choose" => "Выбрать",
-"Cancel" => "Отмена",
-"No" => "Нет",
-"Yes" => "Да",
 "Ok" => "Да",
+"Cancel" => "Отмена",
+"Choose" => "Выбрать",
+"Yes" => "Да",
+"No" => "Нет",
 "The object type is not specified." => "Тип объекта не указан.",
 "Error" => "Ошибка",
 "The app name is not specified." => "Имя приложения не указано.",
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@ -28,11 +28,11 @@
 "months ago" => "මාස කීපයකට පෙර",
 "last year" => "පෙර අවුරුද්දේ",
 "years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "තෝරන්න",
-"Cancel" => "එපා",
-"No" => "නැහැ",
-"Yes" => "ඔව්",
 "Ok" => "හරි",
+"Cancel" => "එපා",
+"Choose" => "තෝරන්න",
+"Yes" => "ඔව්",
+"No" => "නැහැ",
 "Error" => "දෝෂයක්",
 "Share" => "බෙදා හදා ගන්න",
 "Share with" => "බෙදාගන්න",
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@ -44,11 +44,11 @@
 "months ago" => "pred mesiacmi",
 "last year" => "minulý rok",
 "years ago" => "pred rokmi",
-"Choose" => "Výber",
-"Cancel" => "Zrušiť",
-"No" => "Nie",
-"Yes" => "Áno",
 "Ok" => "Ok",
+"Cancel" => "Zrušiť",
+"Choose" => "Výber",
+"Yes" => "Áno",
+"No" => "Nie",
 "The object type is not specified." => "Nešpecifikovaný typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "Nešpecifikované meno aplikácie.",
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@ -44,11 +44,11 @@
 "months ago" => "mesecev nazaj",
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
-"Choose" => "Izbor",
-"Cancel" => "Prekliči",
-"No" => "Ne",
-"Yes" => "Da",
 "Ok" => "V redu",
+"Cancel" => "Prekliči",
+"Choose" => "Izbor",
+"Yes" => "Da",
+"No" => "Ne",
 "The object type is not specified." => "Vrsta predmeta ni podana.",
 "Error" => "Napaka",
 "The app name is not specified." => "Ime programa ni podano.",
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@ -44,11 +44,11 @@
 "months ago" => "muaj më parë",
 "last year" => "vitin e shkuar",
 "years ago" => "vite më parë",
-"Choose" => "Zgjidh",
-"Cancel" => "Anulo",
-"No" => "Jo",
-"Yes" => "Po",
 "Ok" => "Në rregull",
+"Cancel" => "Anulo",
+"Choose" => "Zgjidh",
+"Yes" => "Po",
+"No" => "Jo",
 "The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
 "Error" => "Veprim i gabuar",
 "The app name is not specified." => "Nuk është specifikuar emri i app-it.",
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@ -41,11 +41,11 @@
 "months ago" => "месеци раније",
 "last year" => "прошле године",
 "years ago" => "година раније",
-"Choose" => "Одабери",
-"Cancel" => "Откажи",
-"No" => "Не",
-"Yes" => "Да",
 "Ok" => "У реду",
+"Cancel" => "Откажи",
+"Choose" => "Одабери",
+"Yes" => "Да",
+"No" => "Не",
 "The object type is not specified." => "Врста објекта није подешена.",
 "Error" => "Грешка",
 "The app name is not specified." => "Име програма није унето.",
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@ -44,11 +44,11 @@
 "months ago" => "månader sedan",
 "last year" => "förra året",
 "years ago" => "år sedan",
-"Choose" => "Välj",
-"Cancel" => "Avbryt",
-"No" => "Nej",
-"Yes" => "Ja",
 "Ok" => "Ok",
+"Cancel" => "Avbryt",
+"Choose" => "Välj",
+"Yes" => "Ja",
+"No" => "Nej",
 "The object type is not specified." => "Objekttypen är inte specificerad.",
 "Error" => "Fel",
 "The app name is not specified." => " Namnet på appen är inte specificerad.",
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@ -39,11 +39,11 @@
 "months ago" => "மாதங்களுக்கு முன்",
 "last year" => "கடந்த வருடம்",
 "years ago" => "வருடங்களுக்கு முன்",
-"Choose" => "தெரிவுசெய்க ",
-"Cancel" => "இரத்து செய்க",
-"No" => "இல்லை",
-"Yes" => "ஆம்",
 "Ok" => "சரி",
+"Cancel" => "இரத்து செய்க",
+"Choose" => "தெரிவுசெய்க ",
+"Yes" => "ஆம்",
+"No" => "இல்லை",
 "The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
 "Error" => "வழு",
 "The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@ -33,10 +33,10 @@
 "months ago" => "నెలల క్రితం",
 "last year" => "పోయిన సంవత్సరం",
 "years ago" => "సంవత్సరాల క్రితం",
-"Cancel" => "రద్దుచేయి",
-"No" => "కాదు",
-"Yes" => "అవును",
 "Ok" => "సరే",
+"Cancel" => "రద్దుచేయి",
+"Yes" => "అవును",
+"No" => "కాదు",
 "Error" => "పొరపాటు",
 "Password" => "సంకేతపదం",
 "Send" => "పంపించు",
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@ -43,11 +43,11 @@
 "months ago" => "เดือน ที่ผ่านมา",
 "last year" => "ปีที่แล้ว",
 "years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลือก",
-"Cancel" => "ยกเลิก",
-"No" => "ไม่ตกลง",
-"Yes" => "ตกลง",
 "Ok" => "ตกลง",
+"Cancel" => "ยกเลิก",
+"Choose" => "เลือก",
+"Yes" => "ตกลง",
+"No" => "ไม่ตกลง",
 "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
 "Error" => "พบข้อผิดพลาด",
 "The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ",
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@ -44,11 +44,11 @@
 "months ago" => "ay önce",
 "last year" => "geçen yıl",
 "years ago" => "yıl önce",
-"Choose" => "seç",
-"Cancel" => "İptal",
-"No" => "Hayır",
-"Yes" => "Evet",
 "Ok" => "Tamam",
+"Cancel" => "İptal",
+"Choose" => "seç",
+"Yes" => "Evet",
+"No" => "Hayır",
 "The object type is not specified." => "Nesne türü belirtilmemiş.",
 "Error" => "Hata",
 "The app name is not specified." => "uygulama adı belirtilmedi.",
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@ -44,11 +44,11 @@
 "months ago" => "місяці тому",
 "last year" => "минулого року",
 "years ago" => "роки тому",
-"Choose" => "Обрати",
-"Cancel" => "Відмінити",
-"No" => "Ні",
-"Yes" => "Так",
 "Ok" => "Ok",
+"Cancel" => "Відмінити",
+"Choose" => "Обрати",
+"Yes" => "Так",
+"No" => "Ні",
 "The object type is not specified." => "Не визначено тип об'єкту.",
 "Error" => "Помилка",
 "The app name is not specified." => "Не визначено ім'я програми.",
@ -107,6 +107,8 @@
 "Edit categories" => "Редагувати категорії",
 "Add" => "Додати",
 "Security Warning" => "Попередження про небезпеку",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Будь ласка, оновіть інсталяцію PHP для безпечного використання ownCloud.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@ -14,11 +14,11 @@
 "November" => "نومبر",
 "December" => "دسمبر",
 "Settings" => "سیٹینگز",
-"Choose" => "منتخب کریں",
-"Cancel" => "منسوخ کریں",
-"No" => "نہیں",
-"Yes" => "ہاں",
 "Ok" => "اوکے",
+"Cancel" => "منسوخ کریں",
+"Choose" => "منتخب کریں",
+"Yes" => "ہاں",
+"No" => "نہیں",
 "Error" => "ایرر",
 "Error while sharing" => "شئیرنگ کے دوران ایرر",
 "Error while unsharing" => "شئیرنگ ختم کرنے  کے دوران ایرر",
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@ -44,11 +44,11 @@
 "months ago" => "tháng trước",
 "last year" => "năm trước",
 "years ago" => "năm trước",
-"Choose" => "Chọn",
-"Cancel" => "Hủy",
-"No" => "Không",
-"Yes" => "Có",
 "Ok" => "Đồng ý",
+"Cancel" => "Hủy",
+"Choose" => "Chọn",
+"Yes" => "Có",
+"No" => "Không",
 "The object type is not specified." => "Loại đối tượng không được chỉ định.",
 "Error" => "Lỗi",
 "The app name is not specified." => "Tên ứng dụng không được chỉ định.",
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@ -41,11 +41,11 @@
 "months ago" => "月前",
 "last year" => "去年",
 "years ago" => "年前",
-"Choose" => "选择",
-"Cancel" => "取消",
-"No" => "否",
-"Yes" => "是",
 "Ok" => "好的",
+"Cancel" => "取消",
+"Choose" => "选择",
+"Yes" => "是",
+"No" => "否",
 "The object type is not specified." => "未指定对象类型。",
 "Error" => "错误",
 "The app name is not specified." => "未指定应用名称。",
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@ -44,11 +44,11 @@
 "months ago" => "月前",
 "last year" => "去年",
 "years ago" => "年前",
-"Choose" => "选择(&C)...",
-"Cancel" => "取消",
-"No" => "否",
-"Yes" => "是",
 "Ok" => "好",
+"Cancel" => "取消",
+"Choose" => "选择(&C)...",
+"Yes" => "是",
+"No" => "否",
 "The object type is not specified." => "未指定对象类型。",
 "Error" => "错误",
 "The app name is not specified." => "未指定App名称。",
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@ -23,10 +23,10 @@
 "yesterday" => "昨日",
 "last month" => "前一月",
 "months ago" => "個月之前",
-"Cancel" => "取消",
-"No" => "No",
-"Yes" => "Yes",
 "Ok" => "OK",
+"Cancel" => "取消",
+"Yes" => "Yes",
+"No" => "No",
 "Error" => "錯誤",
 "Shared" => "已分享",
 "Share" => "分享",
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@ -44,11 +44,11 @@
 "months ago" => "幾個月前",
 "last year" => "去年",
 "years ago" => "幾年前",
-"Choose" => "選擇",
+"Ok" => "好",
 "Cancel" => "取消",
-"No" => "No",
-"Yes" => "Yes",
-"Ok" => "Ok",
+"Choose" => "選擇",
+"Yes" => "是",
+"No" => "否",
 "The object type is not specified." => "未指定物件類型。",
 "Error" => "錯誤",
 "The app name is not specified." => "沒有指定 app 名稱。",
@ -68,7 +68,7 @@
 "Send" => "寄出",
 "Set expiration date" => "設置到期日",
 "Expiration date" => "到期日",
-"Share via email:" => "透過 email 分享：",
+"Share via email:" => "透過電子郵件分享：",
 "No people found" => "沒有找到任何人",
 "Resharing is not allowed" => "不允許重新分享",
 "Shared in {item} with {user}" => "已和 {user} 分享 {item}",
@ -82,18 +82,18 @@
 "Password protected" => "受密碼保護",
 "Error unsetting expiration date" => "解除過期日設定失敗",
 "Error setting expiration date" => "錯誤的到期日設定",
-"Sending ..." => "正在寄出...",
+"Sending ..." => "正在傳送...",
 "Email sent" => "Email 已寄出",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗，請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。",
 "ownCloud password reset" => "ownCloud 密碼重設",
-"Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼： {link}",
+"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
 "Reset email send." => "重設郵件已送出。",
 "Request failed!" => "請求失敗！",
 "Username" => "使用者名稱",
 "Request reset" => "請求重設",
-"Your password was reset" => "你的密碼已重設",
+"Your password was reset" => "您的密碼已重設",
 "To login page" => "至登入頁面",
 "New password" => "新密碼",
 "Reset password" => "重設密碼",
@ -107,8 +107,8 @@
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的PHP版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "請更新您的PHP安裝以更安全地使用ownCloud。",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "請更新您的 PHP 安裝以更安全地使用 ownCloud 。",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的亂數產生器，請啟用 PHP 中的 OpenSSL 擴充功能。",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "若沒有安全的亂數產生器，攻擊者可能可以預測密碼重設信物，然後控制您的帳戶。",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
@ -124,11 +124,11 @@
 "Database tablespace" => "資料庫 tablespace",
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
-"web services under your control" => "網路服務在您控制之下",
+"web services under your control" => "由您控制的網路服務",
 "Log out" => "登出",
 "Automatic logon rejected!" => "自動登入被拒！",
 "If you did not change your password recently, your account may be compromised!" => "如果您最近並未更改密碼，您的帳號可能已經遭到入侵！",
-"Please change your password to secure your account again." => "請更改您的密碼以再次取得您的帳戶的控制權。",
+"Please change your password to secure your account again." => "請更改您的密碼以再次取得您帳戶的控制權。",
 "Lost your password?" => "忘記密碼？",
 "remember" => "記住",
 "Log in" => "登入",
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@ -63,6 +63,7 @@
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
 			<input type="text" name="directory" id="directory"
+				placeholder="<?php p(OC::$SERVERROOT."/data"); ?>"
 				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
@ -138,9 +139,11 @@
 					value="<?php p(OC_Helper::init_var('dbuser')); ?>" autocomplete="off" />
 			</p>
 			<p class="infield groupmiddle">
-				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
-				<input type="password" name="dbpass" id="dbpass" placeholder=""
+				<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" 
 					value="<?php p(OC_Helper::init_var('dbpass')); ?>" />
+				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
+				<input type="checkbox" id="dbpassword" name="dbpassword" />
+				<label for="dbpassword"></label>
 			</p>
 			<p class="infield groupmiddle">
 				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
--- a/cron.php
+++ b/cron.php
@ -21,7 +21,7 @@
 */

 // Unfortunately we need this class for shutdown function
-class my_temporary_cron_class {
+class TemporaryCronClass {
 	public static $sent = false;
 	public static $lockfile = "";
 	public static $keeplock = false;
@ -30,12 +30,12 @@ class my_temporary_cron_class {
 // We use this function to handle (unexpected) shutdowns
 function handleUnexpectedShutdown() {
 	// Delete lockfile
-	if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) {
-		unlink( my_temporary_cron_class::$lockfile );
+	if( !TemporaryCronClass::$keeplock && file_exists( TemporaryCronClass::$lockfile )) {
+		unlink( TemporaryCronClass::$lockfile );
 	}
 	
 	// Say goodbye if the app did not shutdown properly
-	if( !my_temporary_cron_class::$sent ) {
+	if( !TemporaryCronClass::$sent ) {
 		if( OC::$CLI ) {
 			echo 'Unexpected error!'.PHP_EOL;
 		}
@ -64,7 +64,7 @@ OC_Helper::cleanTmpNoClean();
 // Exit if background jobs are disabled!
 $appmode = OC_BackgroundJob::getExecutionType();
 if( $appmode == 'none' ) {
-	my_temporary_cron_class::$sent = true;
+	TemporaryCronClass::$sent = true;
 	if( OC::$CLI ) {
 		echo 'Background Jobs are disabled!'.PHP_EOL;
 	}
@ -76,7 +76,7 @@ if( $appmode == 'none' ) {

 if( OC::$CLI ) {
 	// Create lock file first
-	my_temporary_cron_class::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
+	TemporaryCronClass::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
 	
 	// We call ownCloud from the CLI (aka cron)
 	if( $appmode != 'cron' ) {
@ -85,15 +85,15 @@ if( OC::$CLI ) {
 	}

 	// check if backgroundjobs is still running
-	if( file_exists( my_temporary_cron_class::$lockfile )) {
-		my_temporary_cron_class::$keeplock = true;
-		my_temporary_cron_class::$sent = true;
+	if( file_exists( TemporaryCronClass::$lockfile )) {
+		TemporaryCronClass::$keeplock = true;
+		TemporaryCronClass::$sent = true;
 		echo "Another instance of cron.php is still running!";
 		exit( 1 );
 	}

 	// Create a lock file
-	touch( my_temporary_cron_class::$lockfile );
+	touch( TemporaryCronClass::$lockfile );

 	// Work
 	OC_BackgroundJob_Worker::doAllSteps();
@ -112,5 +112,5 @@ else{
 }

 // done!
-my_temporary_cron_class::$sent = true;
+TemporaryCronClass::$sent = true;
 exit();
--- a/db_structure.xml
+++ b/db_structure.xml
@ -910,7 +910,6 @@
 				<name>displayname</name>
 				<type>text</type>
 				<default></default>
-				<notnull>true</notnull>
 				<length>64</length>
 			</field>

--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@ -161,76 +161,76 @@ msgstr ""
 msgid "Settings"
 msgstr "Instellings"

-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""

-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""

-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""

-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""

-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""

-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""

-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""

-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""

-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""

-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""

-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""

-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""

-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""

-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""

-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""

-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""

-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""

-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""

 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@ -238,8 +238,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""

-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
 msgstr ""
@ -532,23 +534,23 @@ msgstr "sal gebruik word"
 msgid "Database user"
 msgstr "Databasis-gebruiker"

-#: templates/installation.php:141
+#: templates/installation.php:143
 msgid "Database password"
 msgstr "Databasis-wagwoord"

-#: templates/installation.php:146
+#: templates/installation.php:148
 msgid "Database name"
 msgstr "Databasis naam"

-#: templates/installation.php:156
+#: templates/installation.php:158
 msgid "Database tablespace"
 msgstr ""

-#: templates/installation.php:163
+#: templates/installation.php:165
 msgid "Database host"
 msgstr ""

-#: templates/installation.php:169
+#: templates/installation.php:171
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"

--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/files_external.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@ -37,13 +37,13 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""

-#: lib/config.php:421
+#: lib/config.php:424
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""

-#: lib/config.php:424
+#: lib/config.php:427
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -25,24 +25,24 @@ msgstr "Wagwoord"
 msgid "Submit"
 msgstr ""

-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""

-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""

-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""

-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""

-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""

-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""

-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""

--- a/Show more
+++ b/Show more