summaryrefslogtreecommitdiffstats
path: root/core/l10n/el.php
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-10-02 18:23:59 +0200
committerBart Visscher <bartv@thisnet.nl>2013-10-02 18:23:59 +0200
commita90ea2c069998d378ec49825ce53b7651a459c1a (patch)
tree7b1afe4ef7dd5509f25c4be7829aa6834877a979 /core/l10n/el.php
parent5db98aadd30b9f1218dda8f836acca0062ce1d9f (diff)
parent551e80979046358b9cbc8a0f8db0ff9cdf919e33 (diff)
downloadnextcloud-server-a90ea2c069998d378ec49825ce53b7651a459c1a.tar.gz
nextcloud-server-a90ea2c069998d378ec49825ce53b7651a459c1a.zip
Merge remote-tracking branch 'origin/master' into setup
Diffstat (limited to 'core/l10n/el.php')
-rw-r--r--core/l10n/el.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 54c13c89bfa..7fc58ca3527 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -42,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
"Choose" => "Επιλέξτε",
-"Error loading file picker template" => "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου",
"Yes" => "Ναι",
"No" => "Όχι",
"Ok" => "Οκ",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Άκυρο",
"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
"Error" => "Σφάλμα",
"The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",