summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-12-25 14:29:29 +0100
committerRobin Appelman <icewind@owncloud.com>2012-12-25 14:29:29 +0100
commit7e36f730ecfe452681f44771b28d1d3c4a5535df (patch)
tree578e604c170219151239e2da345d332b079ed920 /apps/files_versions
parentbf05ff351faa693337107ed4a316e36e9aacd296 (diff)
parent5d59ac07391841677e204958ea20be3fe05cd8ef (diff)
downloadnextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.tar.gz
nextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.zip
merge master into filesystem
Diffstat (limited to 'apps/files_versions')
-rw-r--r--apps/files_versions/appinfo/app.php2
-rw-r--r--apps/files_versions/l10n/ar.php8
-rw-r--r--apps/files_versions/l10n/mk.php8
-rw-r--r--apps/files_versions/templates/settings-personal.php6
4 files changed, 19 insertions, 5 deletions
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 599d302e6e4..afc0a67edba 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -10,7 +10,7 @@ OCP\App::registerPersonal('files_versions', 'settings-personal');
OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'write', "OCA_Versions\Hooks", "write_hook");
// Listen to delete and rename signals
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook");
OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook"); \ No newline at end of file
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
new file mode 100644
index 00000000000..fea7f1c7562
--- /dev/null
+++ b/apps/files_versions/l10n/ar.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "إنهاء تاريخ الإنتهاء لجميع الإصدارات",
+"History" => "السجل الزمني",
+"Versions" => "الإصدارات",
+"This will delete all existing backup versions of your files" => "هذه العملية ستقوم بإلغاء جميع إصدارات النسخ الاحتياطي للملفات",
+"Files Versioning" => "أصدرة الملفات",
+"Enable" => "تفعيل"
+);
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
new file mode 100644
index 00000000000..60a06ad3384
--- /dev/null
+++ b/apps/files_versions/l10n/mk.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Истечи ги сите верзии",
+"History" => "Историја",
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки",
+"Files Versioning" => "Верзии на датотеки",
+"Enable" => "Овозможи"
+);
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index 6d97cea46c3..2b313a07c88 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -3,12 +3,10 @@
<legend>
<strong><?php echo $l->t('Versions'); ?></strong>
</legend>
- <p>
- <?php echo $l->t('This will delete all existing backup versions of your files'); ?>
- </p>
<button id="expireAllBtn">
<?php echo $l->t('Expire all versions'); ?>
<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
- </button>
+ </button>
+ <br /><em><?php echo $l->t('This will delete all existing backup versions of your files'); ?></em>
</fieldset>
</form>