summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-28 02:35:51 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-28 02:35:51 +0100
commitbca5ce724e4fcecfe89da8839878c4da6f102e35 (patch)
treeedc07053bd4d5c8941f59464fedcd43970559f9b /lib
parent3e59a8715390d659b433797c8a0ed080518e5e7d (diff)
parentb6554447090cc5a725508f5c4080ce375de29ee7 (diff)
downloadnextcloud-server-bca5ce724e4fcecfe89da8839878c4da6f102e35.tar.gz
nextcloud-server-bca5ce724e4fcecfe89da8839878c4da6f102e35.zip
Merge branch 'master' into filesystem
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/fa.php1
-rw-r--r--lib/l10n/lb.php6
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index ce7c7c6e970..8cbdcb03b3b 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -10,6 +10,7 @@
"seconds ago" => "ثانیه‌ها پیش",
"1 minute ago" => "1 دقیقه پیش",
"%d minutes ago" => "%d دقیقه پیش",
+"1 hour ago" => "1 ساعت پیش",
"today" => "امروز",
"yesterday" => "دیروز",
"last month" => "ماه قبل",
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index a5a9adca187..06e8b2ca094 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -4,5 +4,9 @@
"Settings" => "Astellungen",
"Authentication error" => "Authentifikatioun's Fehler",
"Files" => "Dateien",
-"Text" => "SMS"
+"Text" => "SMS",
+"1 hour ago" => "vrun 1 Stonn",
+"last month" => "Läschte Mount",
+"last year" => "Läscht Joer",
+"years ago" => "Joren hier"
);