Merge https://github.com/friendica/red into pending_merge

2014-09-27 00:15:43 -07:00
parent fa019791fa 04e460c8f8
commit 51c0904a8a
9 changed files with 89 additions and 98 deletions
--- a/include/language.php
+++ b/include/language.php
@@ -146,7 +146,7 @@ function load_translation_table($lang, $install = false) {
 *
 * @param $s string that should get translated
 * @param $ctx optional context to appear in po file
- * @return translated string if exsists, otherwise s
+ * @return translated string if exists, otherwise return $s
 *
 */
 function t($s,$ctx = '') {