Merge branch 'master' into type-hinting

Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php

9 files changed, 42 insertions, 3 deletions

diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 661d64aa979..a735caee945 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -9,7 +9,7 @@
 	<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
+	the user doesn't run out of space. The 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;
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 4adf14745de..b452bc25b13 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 		// Add versions button to 'files/index.php'
 		FileActions.register(
 			'file'
-			, t('files_versions', 'Versions')
+			, 'Versions'
 			, OC.PERMISSION_UPDATE
 			, function() {
 				// Specify icon for hitory button
@@ -36,6 +36,7 @@ $(document).ready(function(){
 					createVersionsDropdown(filename, file);
 				}
 			}
+			, t('files_versions', 'Versions')
 		);
 	}
 
diff --git a/apps/files_versions/l10n/ja.php b/apps/files_versions/l10n/ja.php
new file mode 100644
index 00000000000..ec2601aafbd
--- /dev/null
+++ b/apps/files_versions/l10n/ja.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "元に戻せませんでした: %s",
+"Versions" => "バージョン",
+"Failed to revert {file} to revision {timestamp}." => "{file} を {timestamp} のリヴィジョンに戻すことができません。",
+"More versions..." => "もっと他のバージョン...",
+"No other versions available" => "利用可能な他のバージョンはありません",
+"Restore" => "復元"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/km.php b/apps/files_versions/l10n/km.php
new file mode 100644
index 00000000000..3673d002a7c
--- /dev/null
+++ b/apps/files_versions/l10n/km.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "មិន​អាច​ត្រឡប់៖ %s",
+"Versions" => "កំណែ",
+"Failed to revert {file} to revision {timestamp}." => "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
+"More versions..." => "កំណែ​ច្រើន​ទៀត...",
+"No other versions available" => "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
+"Restore" => "ស្ដារ​មក​វិញ"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index 2a0a6d8a76d..4c0c8c65bac 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,6 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Could not revert: %s" => "Klarte ikke å tilbakeføre: %s",
 "Versions" => "Versjoner",
+"Failed to revert {file} to revision {timestamp}." => "Klarte ikke å tilbakeføre {file} til revisjon {timestamp}.",
+"More versions..." => "Flere versjoner",
+"No other versions available" => "Det finnes ingen andre versjoner",
 "Restore" => "Gjenopprett"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sq.php b/apps/files_versions/l10n/sq.php
index 5a7a23a217f..e8a0e797485 100644
--- a/apps/files_versions/l10n/sq.php
+++ b/apps/files_versions/l10n/sq.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Could not revert: %s" => "Nuk mund të ktheje: %s",
+"Versions" => "Versioni",
+"Failed to revert {file} to revision {timestamp}." => "Dështoi në ktheje {skedar} të rishikimit {kohëstampe}.",
+"More versions..." => "Versione m'shumë...",
+"No other versions available" => "Nuk ka versione të tjera në dispozicion",
 "Restore" => "Rivendos"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 9d72612c2ad..a6f515ed0ad 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -2,6 +2,9 @@
 $TRANSLATIONS = array(
 "Could not revert: %s" => "Không thể khôi phục: %s",
 "Versions" => "Phiên bản",
+"Failed to revert {file} to revision {timestamp}." => "Thất bại khi trở lại {file} khi sử đổi {timestamp}.",
+"More versions..." => "Nhiều phiên bản ...",
+"No other versions available" => "Không có các phiên bản khác có sẵn",
 "Restore" => "Khôi phục"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 767ca1cf646..279ec2eff82 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -2,6 +2,9 @@
 $TRANSLATIONS = array(
 "Could not revert: %s" => "无法恢复: %s",
 "Versions" => "版本",
+"Failed to revert {file} to revision {timestamp}." => "无法恢复 {file} 到 {timestamp} 的版本。",
+"More versions..." => "更多版本...",
+"No other versions available" => "无其他版本可用",
 "Restore" => "恢复"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 2bd9c15bae4..290264a90cc 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -178,6 +178,7 @@ class Storage {
 					$versionsSize = self::calculateSize($uid);
 				}
 				foreach ($versions as $v) {
+					\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $abs_path . $v['version']));
 					unlink($abs_path . $v['version']);
 					\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $abs_path . $v['version']));
 					$versionsSize -= $v['size'];
@@ -542,8 +543,9 @@ class Storage {
 			}
 
 			foreach($toDelete as $key => $path) {
-				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path));
+				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path));
 				$versionsFileview->unlink($path);
+				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path));
 				unset($allVersions[$key]); // update array with the versions we keep
 				\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::DEBUG);
 			}
@@ -555,6 +557,7 @@ class Storage {
 			$i = 0;
 			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$version = current($allVersions);
+				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));
 				$versionsFileview->unlink($version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version']));
 				\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::DEBUG);