diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
commit | e6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch) | |
tree | aec719c0af896e1f47c0475f13ed2355dbf34f4f /apps/files/l10n/eu.php | |
parent | 8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff) | |
parent | 17d466b03b91ccc058fe1a88340df36c22a580c2 (diff) | |
download | nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'apps/files/l10n/eu.php')
-rw-r--r-- | apps/files/l10n/eu.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index b273c533557..f99c2116077 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -27,6 +27,7 @@ "Size" => "Tamaina", "Modified" => "Aldatuta", "seconds ago" => "segundu", +"1 minute ago" => "orain dela minutu 1", "today" => "gaur", "yesterday" => "atzo", "last month" => "joan den hilabetean", @@ -44,7 +45,6 @@ "New" => "Berria", "Text file" => "Testu fitxategia", "Folder" => "Karpeta", -"From url" => "URLtik", "Upload" => "Igo", "Cancel upload" => "Ezeztatu igoera", "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!", |