aboutsummaryrefslogtreecommitdiffstats
path: root/util/strings.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-01-20 08:17:41 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-01-20 08:17:41 +0100
commita8b9b219158e8565af615b852c587787ad58a0a3 (patch)
tree2476b3b0aa892b2711943a500e1869d15b29d607 /util/strings.php
parentb43ec25955de2a2e18cd1d65023341abdcd5b519 (diff)
parent2ffe0d0b1d9589b6b37d8ade0114caef31339001 (diff)
downloadvolse-hubzilla-a8b9b219158e8565af615b852c587787ad58a0a3.tar.gz
volse-hubzilla-a8b9b219158e8565af615b852c587787ad58a0a3.tar.bz2
volse-hubzilla-a8b9b219158e8565af615b852c587787ad58a0a3.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'util/strings.php')
-rw-r--r--util/strings.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/strings.php b/util/strings.php
index 3d75e6757..8b58a6b7a 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -249,9 +249,12 @@ $a->strings['Delete conversation'] = 'Delete conversation';
$a->strings['Message not available.'] = 'Message not available.';
$a->strings['Delete message'] = 'Delete message';
$a->strings['Send Reply'] = 'Send Reply';
+$a->strings['Normal View'] = 'Normal View';
+$a->strings['New Item View'] = 'New Item View';
$a->strings['No such group'] = 'No such group';
$a->strings['Group is empty'] = 'Group is empty';
$a->strings['Group: '] = 'Group: ';
+$a->strings['View in context'] = 'View in context';
$a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
$a->strings['Discard'] = 'Discard';
$a->strings['Ignore'] = 'Ignore';
@@ -347,7 +350,6 @@ $a->strings['Register'] = 'Register';
$a->strings['Please login.'] = 'Please login.';
$a->strings['Registration revoked for '] = 'Registration revoked for ';
$a->strings['Account approved.'] = 'Account approved.';
-$a->strings['View in context'] = 'View in context';
$a->strings['Passwords do not match. Password unchanged.'] = 'Passwords do not match. Password unchanged.';
$a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Empty passwords are not allowed. Password unchanged.';
$a->strings['Password changed.'] = 'Password changed.';