summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-11 15:19:02 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-06-11 15:19:02 +0200
commit20ddd6e1c77224d18d5be74101b80144b7187475 (patch)
tree1320acdc30a977f9294dc0ae2f6c36667982da31 /settings
parent64593e4b84fdd6881a43530461c50464303cc42e (diff)
parentdb6080c5c682a2bbdc420399276b81311c17802c (diff)
downloadnextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.tar.gz
nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.zip
Merge branch 'master' into files_encryption_check_private_key
Conflicts: apps/files_encryption/tests/crypt.php
Diffstat (limited to 'settings')
-rw-r--r--settings/l10n/el.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3558ae72988..24f3a099ccf 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
"Login Name" => "Όνομα Σύνδεσης",
"Create" => "Δημιουργία",
+"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
"Default Storage" => "Προκαθορισμένη Αποθήκευση ",
"Unlimited" => "Απεριόριστο",
"Other" => "Άλλο",