This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via bdf7773d5f341f99c945d2d1361b52d893116b66 (commit)
via fd090770f0588f4e5a1742c925d3e35536bdd8bd (commit)
from 1a7a4eb617196405b2697dac3763dd67f5f48c29 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bdf7773d5f341f99c945d2d1361b52d893116b66
commit bdf7773d5f341f99c945d2d1361b52d893116b66
Merge: fd09077 1a7a4eb
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 5 17:28:21 2016 +0200
Merge branch 'master' of
git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=fd090770f0588f4e5a1742c925d3e35536bdd8bd
commit fd090770f0588f4e5a1742c925d3e35536bdd8bd
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 5 17:28:16 2016 +0200
Translate string
diff --git a/src/common/forum/ForumAdmin.class.php
b/src/common/forum/ForumAdmin.class.php
index f4e2e7a..c378222 100644
--- a/src/common/forum/ForumAdmin.class.php
+++ b/src/common/forum/ForumAdmin.class.php
@@ -308,7 +308,7 @@ class ForumAdmin extends FFError {
$title = array();
$title[] = _('Forum Name');
$title[] = _('Message');
- $title[] = "Action";
+ $title[] = _('Action');
$res = db_query_params('SELECT
msg_id,subject,pm.group_forum_id,gl.forum_name FROM forum_pending_messages pm,
forum_group_list gl WHERE pm.group_forum_id=$1 AND
pm.group_forum_id=gl.group_forum_id AND gl.group_forum_id=$2',
array ($forum_id,
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/ForumAdmin.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
