aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-06 17:31:22 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-06 17:31:22 -0700
commitec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41 (patch)
tree23b11b256e942ce408d305b509bc1c0ddaaed4ce /view/tpl
parent7cbc5048743bc5976e48cd3f81801550c0b7f52f (diff)
parentf5e439236c91134efab7bc04c2c98c23a81dc03d (diff)
downloadvolse-hubzilla-ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41.tar.gz
volse-hubzilla-ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41.tar.bz2
volse-hubzilla-ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: util/messages.po
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/settings_display.tpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 6532b4ec1..02f679852 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -11,7 +11,7 @@
<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
<h3>
<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
- Theme Settings
+ {{$d_tset}}
</a>
</h3>
</div>
@@ -34,7 +34,7 @@
<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
<h3>
<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
- Custom Theme Settings
+ {{$d_ctset}}
</a>
</h3>
</div>
@@ -50,7 +50,7 @@
<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
<h3>
<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
- Content Settings
+ {{$d_cset}}
</a>
</h3>
</div>