diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-02-14 14:28:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-02-14 14:28:46 +0000 |
| commit | 711651f727e093cc7357a6bbff6bd992fd6dfd80 (patch) | |
| tree | 2dadc1c06acf1ab3d42d3ed5415568535db54416 /modules/gallery/views/form_uploadify.html.php | |
| parent | 0047af90bf4db08b22838e6ded22a7fa70cee98a (diff) | |
| parent | e5ed05004f005bdccdbf68e199ae2324ad97e895 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views/form_uploadify.html.php')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index c1f985c3..4426514a 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -89,7 +89,7 @@ .replace("__INFO__", errorObj.info) .replace("__TYPE__", errorObj.type); } - msg = " - <a target=\"_blank\" href=\"http://codex.gallery2.org/Gallery3:Troubleshooting:Uploading\">" + + msg = " - <a target=\"_blank\" href=\"http://codex.galleryproject.org/Gallery3:Troubleshooting:Uploading\">" + error_msg + "</a>"; $("#g-add-photos-status ul").append( @@ -131,7 +131,7 @@ <? if (identity::active_user()->admin && !$movies_allowed): ?> <p class="g-warning"> - <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?> + <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.galleryproject.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?> </p> <? endif ?> </div> |