diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-01-27 22:07:04 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-01-27 22:07:04 -0500 |
commit | 914bc9f9c5ce29584e00553104ac991e6e178e7b (patch) | |
tree | b473316af79d2c58c5ecd84765fcaa9725269fed /actions/showstream.php | |
parent | e9995b0f6ab0788162e22c996e5ee0af416dd519 (diff) | |
parent | 9589985e29455e41ef915ff15b679fe2a01644a0 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
Diffstat (limited to 'actions/showstream.php')
-rw-r--r-- | actions/showstream.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index b9782a3f1..cb9ade191 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction if ($this->page == 1) { return $base; } else { - return sprintf(_("%1$s, page %2$d"), + return sprintf(_('%1$s, page %2$d'), $base, $this->page); } |