aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-08-12 13:59:16 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-08-12 13:59:16 +0200
commit4773742881131f7493fbb2b971971e922df003ec (patch)
tree5807239d991b43f6275bb21f88449162c042aec0
parent81e045628d3ece7cbb6874725c2db49c71f65fe7 (diff)
parentdead984f5456c3de5e5837680a61272289ce4a15 (diff)
downloadforums-4773742881131f7493fbb2b971971e922df003ec.tar
forums-4773742881131f7493fbb2b971971e922df003ec.tar.gz
forums-4773742881131f7493fbb2b971971e922df003ec.tar.bz2
forums-4773742881131f7493fbb2b971971e922df003ec.tar.xz
forums-4773742881131f7493fbb2b971971e922df003ec.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_viewfolder.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index d93a62282e..47e4d1c63a 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -25,7 +25,7 @@
<fieldset class="submit-buttons">
<input type="hidden" name="export_option" value="CSV" />
<input class="button1" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;
- <input class="button2" type="reset" value="Reset" name="reset" />&nbsp;
+ <input class="button2" type="reset" value="{L_RESET}" name="reset" />&nbsp;
{S_FORM_TOKEN}
</fieldset>
</form>