aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-24 14:19:53 -0800
committerfriendica <info@friendica.com>2014-02-24 14:19:53 -0800
commitb2372c0c8f0b6e46874973731e74cc10d767ca0f (patch)
tree1eeb13d86f2f03dc434d45e18dcf2cc14a0f78d4 /include
parent5bd71e4e4ddb28e85f3fc71d4cdf6763788da9d7 (diff)
parent9a097dc80ce42a5093f0bb3296e1fbc2139c8ed1 (diff)
downloadvolse-hubzilla-b2372c0c8f0b6e46874973731e74cc10d767ca0f.tar.gz
volse-hubzilla-b2372c0c8f0b6e46874973731e74cc10d767ca0f.tar.bz2
volse-hubzilla-b2372c0c8f0b6e46874973731e74cc10d767ca0f.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
-rw-r--r--include/js_strings.php24
1 files changed, 13 insertions, 11 deletions
diff --git a/include/js_strings.php b/include/js_strings.php
index afa8f075a..2d96ca9d2 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -2,18 +2,20 @@
function js_strings() {
return replace_macros(get_markup_template('js_strings.tpl'), array(
- '$delitem' => t('Delete this item?'),
- '$comment' => t('Comment'),
- '$showmore' => t('show more'),
- '$showfewer' => t('show fewer'),
- '$pwshort' => t("Password too short"),
- '$pwnomatch' => t("Passwords do not match"),
- '$everybody' => t('everybody'),
- '$passphrase' => t('Secret Passphrase'),
- '$passhint' => t('Passphrase hint'),
+ '$delitem' => t('Delete this item?'),
+ '$comment' => t('Comment'),
+ '$showmore' => t('show more'),
+ '$showfewer' => t('show fewer'),
+ '$divgrowmore' => t('+ Show More'),
+ '$divgrowless' => t('- Show Less'),
+ '$pwshort' => t("Password too short"),
+ '$pwnomatch' => t("Passwords do not match"),
+ '$everybody' => t('everybody'),
+ '$passphrase' => t('Secret Passphrase'),
+ '$passhint' => t('Passphrase hint'),
'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'),
- '$t02' => ((t('timeago.suffixAgo') != 'timeago.suffixAgo') ? t('timeago.suffixAgo') : 'null'),
+ '$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : 'null'),
'$t03' => t('ago'),
'$t04' => t('from now'),
'$t05' => t('less than a minute'),
@@ -32,4 +34,4 @@ function js_strings() {
));
-} \ No newline at end of file
+}