Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into Item14288
  • Loading branch information
MichaelDaum committed Jan 31, 2017
2 parents 5170d22 + a93ee2f commit 21b19fc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions core/locale/zh-tw.po
Expand Up @@ -7,10 +7,10 @@ msgstr ""
"Project-Id-Version: Foswiki $Id\n"
"Report-Msgid-Bugs-To: foswiki-svn@lists.sourceforge.net\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2016-12-29 15:23+0200\n"
"PO-Revision-Date: 2017-01-30 17:13+0200\n"
"Last-Translator: CH yang <dr3939@gmail.com>\n"
"Language-Team: Traditional Chinese <http://translate.foswiki.org/projects/"
"foswiki/distribution-master/zh_TW/>\n"
"Language-Team: Traditional Chinese "
"<http://translate.foswiki.org/projects/foswiki/distribution-master/zh_TW/>\n"
"Language: zh-tw\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1154,7 +1154,7 @@ msgstr "%2 子網中的 %1 的子頁"

#: core/templates/changeform.tmpl:6
msgid "Choose a new form for %1"
msgstr "為 %1 選個新表單"
msgstr "為 %1 選一個新表單"

#: core/lib/Foswiki/Form/Checkbox.pm:87
msgid "Clear all"
Expand Down Expand Up @@ -2462,7 +2462,7 @@ msgstr "關鍵字搜尋"

#: SlideShowPlugin/templates/view.slideshow.tmpl:21
msgid "Last"
msgstr ""
msgstr "最後"

#: HistoryPlugin/templates/oopshistory.tmpl:31
msgid "Last edited by"
Expand Down Expand Up @@ -2848,7 +2848,7 @@ msgstr "不確定是否正確,請確認!"

#: SmiliesPlugin/lib/Foswiki/Plugins/SmiliesPlugin.pm:140
msgid "Notation"
msgstr "通知"
msgstr "注釋"

#: core/templates/moveattachment.tmpl:50
msgid ""
Expand Down
3 changes: 2 additions & 1 deletion core/pub/System/JavascriptFiles/strikeone.uncompressed.js
Expand Up @@ -217,7 +217,8 @@ var StrikeOne = {
calculateNewKey: function(input) {
if (input && input.charAt(0) == '?') {
// Read the cookie to get the secret
var secret = StrikeOne.readCookie('FOSWIKISTRIKEONE');
var cookieName = foswiki.getPreference('COOKIENAMEPREFIX') + 'FOSWIKISTRIKEONE';
var secret = StrikeOne.readCookie(cookieName);
// combine the validation key with the secret in a way
// that can't easily be reverse-engineered, but can be
// duplicated on the server (which also knows the secret)
Expand Down

0 comments on commit 21b19fc

Please sign in to comment.