[evolvis-commits] r8957: Changed string admin_index\t groups_with to admin_index\t groups_with_status↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:56:25 CET 2011


Author: mirabilos
Date: 2011-02-24 16:56:25 +0100 (Thu, 24 Feb 2011)
New Revision: 8957

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab
Log:
Changed string admin_index\t groups_with to admin_index\t groups_with_status


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab	2011-02-24 15:56:24 UTC (rev 8956)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab	2011-02-24 15:56:25 UTC (rev 8957)
@@ -258,7 +258,7 @@
 admin_index	front_page_news	Front-page news
 admin_index	get	get
 admin_index	group_maintaince	Group Maintenance
-admin_index	groups_with	Groups with
+admin_index	groups_with_status	Groups with status
 admin_index	mail_engine	Mail Engine for $1 Subscribers
 admin_index	new_project_approval	(New Project Approval)
 admin_index	news	News
@@ -1520,7 +1520,12 @@
 project_admin_userpermedit	admin	Admin
 project_admin_userpermedit	admin_only	Admin Only
 project_admin_userpermedit	admin_tech	Admin & Tech
+<<<<<<< Base.tab
+project_admin_userpermedit	not_available	Not available
+project_admin_userpermedit	file_release_role	Role in File releases
+=======
 project_admin_userpermedit	no_permissions	No permissions
+>>>>>>> 1.100
 project_admin_userpermedit	developer_not_found	Developer Not Found In This Group
 project_admin_userpermedit	docman	Documentation Manager
 project_admin_userpermedit	editing_permissions	You are editing permissions for user $1 ($2)



More information about the evolvis-commits mailing list