diff options
author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
---|---|---|
committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /view/tpl/js_strings.tpl | |
parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'view/tpl/js_strings.tpl')
-rwxr-xr-x | view/tpl/js_strings.tpl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 9eb552767..cac5be65b 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -2,18 +2,21 @@ var aStr = { - 'delitem' : "{{$delitem}}", - 'comment' : "{{$comment}}", - 'showmore' : "{{$showmore}}", - 'showfewer' : "{{$showfewer}}", - 'pwshort' : "{{$pwshort}}", - 'pwnomatch' : "{{$pwnomatch}}", - 'everybody' : "{{$everybody}}", - 'passphrase' : "{{$passphrase}}", - 'passhint' : "{{$passhint}}", + 'delitem' : "{{$delitem}}", + 'comment' : "{{$comment}}", + 'showmore' : "{{$showmore}}", + 'showfewer' : "{{$showfewer}}", + 'divgrowmore' : "{{$divgrowmore}}", + 'divgrowless' : "{{$divgrowless}}", + 'pwshort' : "{{$pwshort}}", + 'pwnomatch' : "{{$pwnomatch}}", + 'everybody' : "{{$everybody}}", + 'passphrase' : "{{$passphrase}}", + 'passhint' : "{{$passhint}}", + 'permschange' : "{{$permschange}}", - 't01' : {{$t01}}, - 't02' : {{$t02}}, + 't01' : "{{$t01}}", + 't02' : "{{$t02}}", 't03' : "{{$t03}}", 't04' : "{{$t04}}", 't05' : "{{$t05}}", |