Browse Source

Added group syncing.

Nathaniel van Diepen 10 years ago
parent
commit
507cf3d5fc

+ 2 - 1
index.php

@@ -7,7 +7,8 @@
 		$_GET['key'] = isset($opts['key'])?$opts['key']:(isset($opts['k'])?$opts['k']:false);
 		$_GET['key'] = isset($opts['key'])?$opts['key']:(isset($opts['k'])?$opts['k']:false);
 		$_GET['server'] = isset($opts['server'])?$opts['server']:(isset($opts['s'])?$opts['s']:false);
 		$_GET['server'] = isset($opts['server'])?$opts['server']:(isset($opts['s'])?$opts['s']:false);
 		if(!$_GET['user'] || !$_GET['key'] || !$_GET['server']){
 		if(!$_GET['user'] || !$_GET['key'] || !$_GET['server']){
-			die('# Please provide a user, api key and a server name.');
+			header('Location: site/');
+			die();
 		}
 		}
 	}
 	}
 	$user = get_current_user_obj('netadmin') or $user = get_current_user_obj('servermanager') or $user = get_current_user_obj('globaladmin') or die('# Invalid user/key pair.');
 	$user = get_current_user_obj('netadmin') or $user = get_current_user_obj('servermanager') or $user = get_current_user_obj('globaladmin') or die('# Invalid user/key pair.');

+ 10 - 0
ircd.sql

@@ -442,6 +442,16 @@ INSERT INTO `user_role_types` (`id`, `name`, `description`, `flags`) VALUES
 (3, 'netadmin', 'Network Admin', 'on'),
 (3, 'netadmin', 'Network Admin', 'on'),
 (4, 'globaladmin', 'Global Admin', 'nao');
 (4, 'globaladmin', 'Global Admin', 'nao');
 
 
+
+DROP TABLE IF EXISTS `smf_groups`;
+CREATE TABLE IF NOT EXISTS `smf_groups` (
+  `irc_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `id_group` smallint(5) NOT NULL,
+  PRIMARY KEY (`irc_name`),
+  UNIQUE KEY `irc_name` (`irc_name`,`id_group`),
+  KEY `id_group` (`id_group`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
 -- --------------------------------------------------------
 -- --------------------------------------------------------
 
 
 --
 --

BIN
lang/en/LC_MESSAGES/omninet.mo


+ 100 - 84
lang/en/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet\n"
 "Project-Id-Version: Omninet\n"
-"POT-Creation-Date: 2014-02-23 18:35-0700\n"
-"PO-Revision-Date: 2014-02-23 18:35-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: en\n"
 "Language: en\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr ""
 msgstr ""
 
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr ""
 msgstr ""
 
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr ""
 msgstr ""
 
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr ""
 msgstr ""
 
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgid "Email"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr ""
 msgstr ""
 
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr ""
 msgstr ""
 
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr ""
 msgstr ""
 
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr ""
 msgstr ""
 
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 msgstr ""
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr ""
 msgstr ""
 
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgid "Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr ""
 msgstr ""
 
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr ""
 msgstr ""

BIN
lang/en_CA/LC_MESSAGES/omninet.mo


+ 100 - 84
lang/en_CA/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 18:36-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: en_CA\n"
 "Language: en_CA\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr ""
 msgstr ""
 
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr ""
 msgstr ""
 
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr ""
 msgstr ""
 
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr ""
 msgstr ""
 
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgid "Email"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr ""
 msgstr ""
 
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr ""
 msgstr ""
 
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr ""
 msgstr ""
 
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr ""
 msgstr ""
 
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 msgstr ""
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr ""
 msgstr ""
 
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgid "Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr ""
 msgstr ""
 
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr ""
 msgstr ""

BIN
lang/en_GB/LC_MESSAGES/omninet.mo


+ 100 - 84
lang/en_GB/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet\n"
 "Project-Id-Version: Omninet\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 18:36-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: en_GB\n"
 "Language: en_GB\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr ""
 msgstr ""
 
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr ""
 msgstr ""
 
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr ""
 msgstr ""
 
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr ""
 msgstr ""
 
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgid "Email"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr ""
 msgstr ""
 
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr ""
 msgstr ""
 
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr ""
 msgstr ""
 
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr ""
 msgstr ""
 
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 msgstr ""
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr ""
 msgstr ""
 
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgid "Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr ""
 msgstr ""
 
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr ""
 msgstr ""

BIN
lang/en_US/LC_MESSAGES/omninet.mo


+ 100 - 84
lang/en_US/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 18:36-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: en_US\n"
 "Language: en_US\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr ""
 msgstr ""
 
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr ""
 msgstr ""
 
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr ""
 msgstr ""
 
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 msgstr ""
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr ""
 msgstr ""
 
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgid "Email"
 msgstr ""
 msgstr ""
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr ""
 msgstr ""
 
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr ""
 msgstr ""
 
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr ""
 msgstr ""
 
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr ""
 msgstr ""
 
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 msgstr ""
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr ""
 msgstr ""
 
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgid "Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr ""
 msgstr ""
 
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr ""
 msgstr ""
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr ""
 msgstr ""

BIN
lang/fr/LC_MESSAGES/omninet.mo


+ 104 - 86
lang/fr/LC_MESSAGES/omninet.po

@@ -1,9 +1,9 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 20:45-0500\n"
-"Last-Translator: Julien Savard <[email protected]>\n"
+"POT-Creation-Date: 2014-03-08 21:38-0700\n"
+"PO-Revision-Date: 2014-03-08 21:38-0700\n"
+"Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: fr\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr "RehashServ est déjà en cours d'exécution"
 msgstr "RehashServ est déjà en cours d'exécution"
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr "Le serveur IRC a refusé la connexion."
 msgstr "Le serveur IRC a refusé la connexion."
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr "L'authentication avec NickServ a échoué"
 msgstr "L'authentication avec NickServ a échoué"
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr "vhost non défini."
 msgstr "vhost non défini."
 
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr "RunServ est déjà en cours d'exécution"
 msgstr "RunServ est déjà en cours d'exécution"
 
 
@@ -163,7 +163,7 @@ msgstr "Pseudonyme"
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr "Profil Omnimaga"
 msgstr "Profil Omnimaga"
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 msgstr "Nouveau mot de passe"
 
 
@@ -172,8 +172,8 @@ msgid "Invalid credentials"
 msgstr "Informations de connexion invalides."
 msgstr "Informations de connexion invalides."
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr "Utilisateur"
 msgstr "Utilisateur"
 
 
@@ -241,7 +241,7 @@ msgstr "Vrai nom"
 msgid "Email"
 msgid "Email"
 msgstr "Courriel"
 msgstr "Courriel"
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr "Opérateurs"
 msgstr "Opérateurs"
 
 
@@ -342,8 +342,7 @@ msgstr "Impossible d'enlever le courriel"
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr "Vérification en deux étapes désactivée."
 msgstr "Vérification en deux étapes désactivée."
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
@@ -353,11 +352,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr "Déconnecté"
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr "Déconnecté pour utiliser"
 msgstr "Déconnecté pour utiliser"
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr "avec la clé"
 msgstr "avec la clé"
 
 
@@ -367,7 +372,7 @@ msgstr ""
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "de passe"
 "de passe"
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr "Impossible de vérifier avec NickServ"
 msgstr "Impossible de vérifier avec NickServ"
 
 
@@ -375,60 +380,64 @@ msgstr "Impossible de vérifier avec NickServ"
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
-msgstr "Déconnecté"
+#: ../../../site/api/index.php:376
+#, fuzzy
+msgid "Unable to sync groups"
+msgstr "Impossible de mettre à jour l'utilisateur"
+
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr "Aucun utilisateur défini."
 msgstr "Aucun utilisateur défini."
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr "Aucun courriel défini."
 msgstr "Aucun courriel défini."
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr "Aucun vrai nom défini."
 msgstr "Aucun vrai nom défini."
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr "Aucun pseudonyme défini."
 msgstr "Aucun pseudonyme défini."
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr "Utilisateur avec ID"
 msgstr "Utilisateur avec ID"
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr "Aucun profil défini."
 msgstr "Aucun profil défini."
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr "Opérateur avec ID"
 msgstr "Opérateur avec ID"
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr "Impossible de mettre à jour l'opérateur"
 msgstr "Impossible de mettre à jour l'opérateur"
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr "La mise à jour du réglage a échoué"
 msgstr "La mise à jour du réglage a échoué"
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr "avec la valeur"
 msgstr "avec la valeur"
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr "Action invalide"
 msgstr "Action invalide"
 
 
@@ -463,7 +472,7 @@ msgid "Reply"
 msgstr "Répondre"
 msgstr "Répondre"
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr "Supprimer"
 msgstr "Supprimer"
 
 
@@ -475,131 +484,135 @@ msgstr "Nouveau canal"
 msgid "Access"
 msgid "Access"
 msgstr "Accès"
 msgstr "Accès"
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr "Indicateurs"
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr "Modifier"
 msgstr "Modifier"
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr "Ajouter accès"
 msgstr "Ajouter accès"
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr "Nouvelles"
 msgstr "Nouvelles"
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr "Mémos"
 msgstr "Mémos"
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr "Canaux"
 msgstr "Canaux"
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr "Serveurs"
 msgstr "Serveurs"
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr "Configuration"
 msgstr "Configuration"
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr "Profil"
 msgstr "Profil"
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr "Envoyer"
 msgstr "Envoyer"
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr "À"
 msgstr "À"
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr "Message"
 msgstr "Message"
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr "S'enregistrer"
 msgstr "S'enregistrer"
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr "Nom du canal"
 msgstr "Nom du canal"
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr "Indicateurs"
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr "Pays"
 msgstr "Pays"
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr "Numéro de cellulaire"
 msgstr "Numéro de cellulaire"
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr "Jeton"
 msgstr "Jeton"
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr "Désactiver la vérification en deux étapes"
 msgstr "Désactiver la vérification en deux étapes"
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr "Lier le Persona"
 msgstr "Lier le Persona"
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr "Enlever"
 msgstr "Enlever"
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr "Changer de rôle"
 msgstr "Changer de rôle"
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr "Mettre à jour"
 msgstr "Mettre à jour"
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 msgstr "Changer le mot de passe"
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr "Synchroniser le mot de passe"
 msgstr "Synchroniser le mot de passe"
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr "Se déconnecter"
 msgstr "Se déconnecter"
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr "Mot de passe"
 msgstr "Mot de passe"
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr "Changer"
 msgstr "Changer"
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr "Type"
 msgstr "Type"
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr "Se connecter"
 msgstr "Se connecter"
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr "Validation en deux étapes"
 msgstr "Validation en deux étapes"
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr "Persona"
 msgstr "Persona"
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 msgstr "Nom d'utilisateur"
 
 
@@ -619,64 +632,69 @@ msgstr "Impossible de mettre à jour les serveurs"
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr "Impossible de synchroniser votre mot de passe"
 msgstr "Impossible de synchroniser votre mot de passe"
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+#, fuzzy
+msgid "Could not synchronize your groups"
+msgstr "Impossible de synchroniser votre mot de passe"
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr "La connexion a échoué"
 msgstr "La connexion a échoué"
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr "Impossible d'enlever l'adresse Persona"
 msgstr "Impossible d'enlever l'adresse Persona"
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr "Ping du serveur"
 msgstr "Ping du serveur"
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr "Impossible de pinger le serveur"
 msgstr "Impossible de pinger le serveur"
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr "Récupérer les mémos"
 msgstr "Récupérer les mémos"
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr "Impossible de contacter le serveur"
 msgstr "Impossible de contacter le serveur"
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr "Suppression du mémo"
 msgstr "Suppression du mémo"
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr "Récupérer les nouvelles"
 msgstr "Récupérer les nouvelles"
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr "Nouvel item de nouvelle"
 msgstr "Nouvel item de nouvelle"
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr "Récupérer les canaux"
 msgstr "Récupérer les canaux"
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr "Suppression du canal"
 msgstr "Suppression du canal"
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr "Enregistrement du canal"
 msgstr "Enregistrement du canal"
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr "Changement de langue détecté"
 msgstr "Changement de langue détecté"

BIN
lang/fr_CA/LC_MESSAGES/omninet.mo


+ 104 - 86
lang/fr_CA/LC_MESSAGES/omninet.po

@@ -1,9 +1,9 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 20:43-0500\n"
-"Last-Translator: Julien Savard <[email protected]>\n"
+"POT-Creation-Date: 2014-03-08 21:38-0700\n"
+"PO-Revision-Date: 2014-03-08 21:38-0700\n"
+"Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: fr_CA\n"
 "Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr "RehashServ est déjà en cours d'exécution"
 msgstr "RehashServ est déjà en cours d'exécution"
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr "Le serveur IRC a refusé la connexion."
 msgstr "Le serveur IRC a refusé la connexion."
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr "L'authentication avec NickServ a échoué"
 msgstr "L'authentication avec NickServ a échoué"
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr "vhost non défini."
 msgstr "vhost non défini."
 
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr "RunServ est déjà en cours d'exécution"
 msgstr "RunServ est déjà en cours d'exécution"
 
 
@@ -163,7 +163,7 @@ msgstr "Pseudonyme"
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr "Profil Omnimaga"
 msgstr "Profil Omnimaga"
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 msgstr "Nouveau mot de passe"
 
 
@@ -172,8 +172,8 @@ msgid "Invalid credentials"
 msgstr "Informations de connexion invalides."
 msgstr "Informations de connexion invalides."
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr "Utilisateur"
 msgstr "Utilisateur"
 
 
@@ -241,7 +241,7 @@ msgstr "Vrai nom"
 msgid "Email"
 msgid "Email"
 msgstr "Courriel"
 msgstr "Courriel"
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr "Opérateurs"
 msgstr "Opérateurs"
 
 
@@ -342,8 +342,7 @@ msgstr "Impossible d'enlever le courriel"
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr "Vérification en deux étapes désactivée."
 msgstr "Vérification en deux étapes désactivée."
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
@@ -353,11 +352,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr "Déconnecté"
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr "Déconnecté pour utiliser"
 msgstr "Déconnecté pour utiliser"
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr "avec la clé"
 msgstr "avec la clé"
 
 
@@ -367,7 +372,7 @@ msgstr ""
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "de passe"
 "de passe"
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr "Impossible de vérifier avec NickServ"
 msgstr "Impossible de vérifier avec NickServ"
 
 
@@ -375,60 +380,64 @@ msgstr "Impossible de vérifier avec NickServ"
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
-msgstr "Déconnecté"
+#: ../../../site/api/index.php:376
+#, fuzzy
+msgid "Unable to sync groups"
+msgstr "Impossible de mettre à jour l'utilisateur"
+
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr "Aucun utilisateur défini."
 msgstr "Aucun utilisateur défini."
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr "Aucun courriel défini."
 msgstr "Aucun courriel défini."
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr "Aucun vrai nom défini."
 msgstr "Aucun vrai nom défini."
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr "Aucun pseudonyme défini."
 msgstr "Aucun pseudonyme défini."
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr "Utilisateur avec ID"
 msgstr "Utilisateur avec ID"
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr "Aucun profil défini."
 msgstr "Aucun profil défini."
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr "Opérateur avec ID"
 msgstr "Opérateur avec ID"
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr "Impossible de mettre à jour l'opérateur"
 msgstr "Impossible de mettre à jour l'opérateur"
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr "La mise à jour du réglage a échoué"
 msgstr "La mise à jour du réglage a échoué"
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr "avec la valeur"
 msgstr "avec la valeur"
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr "Action invalide"
 msgstr "Action invalide"
 
 
@@ -463,7 +472,7 @@ msgid "Reply"
 msgstr "Répondre"
 msgstr "Répondre"
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr "Supprimer"
 msgstr "Supprimer"
 
 
@@ -475,131 +484,135 @@ msgstr "Nouveau canal"
 msgid "Access"
 msgid "Access"
 msgstr "Accès"
 msgstr "Accès"
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr "Indicateurs"
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr "Modifier"
 msgstr "Modifier"
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr "Ajouter accès"
 msgstr "Ajouter accès"
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr "Nouvelles"
 msgstr "Nouvelles"
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr "Mémos"
 msgstr "Mémos"
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr "Canaux"
 msgstr "Canaux"
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr "Serveurs"
 msgstr "Serveurs"
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr "Configuration"
 msgstr "Configuration"
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr "Profil"
 msgstr "Profil"
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr "Envoyer"
 msgstr "Envoyer"
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr "À"
 msgstr "À"
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr "Message"
 msgstr "Message"
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr "S'enregistrer"
 msgstr "S'enregistrer"
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr "Nom du canal"
 msgstr "Nom du canal"
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr "Indicateurs"
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr "Pays"
 msgstr "Pays"
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr "Numéro de cellulaire"
 msgstr "Numéro de cellulaire"
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr "Jeton"
 msgstr "Jeton"
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr "Désactiver la vérification en deux étapes"
 msgstr "Désactiver la vérification en deux étapes"
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr "Lier le Persona"
 msgstr "Lier le Persona"
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr "Enlever"
 msgstr "Enlever"
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr "Changer de rôle"
 msgstr "Changer de rôle"
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr "Mettre à jour"
 msgstr "Mettre à jour"
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 msgstr "Changer le mot de passe"
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr "Synchroniser le mot de passe"
 msgstr "Synchroniser le mot de passe"
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr "Se déconnecter"
 msgstr "Se déconnecter"
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr "Mot de passe"
 msgstr "Mot de passe"
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr "Changer"
 msgstr "Changer"
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr "Type"
 msgstr "Type"
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr "Se connecter"
 msgstr "Se connecter"
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr "Validation en deux étapes"
 msgstr "Validation en deux étapes"
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr "Persona"
 msgstr "Persona"
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 msgstr "Nom d'utilisateur"
 
 
@@ -619,64 +632,69 @@ msgstr "Impossible de mettre à jour les serveurs"
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr "Impossible de synchroniser votre mot de passe"
 msgstr "Impossible de synchroniser votre mot de passe"
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+#, fuzzy
+msgid "Could not synchronize your groups"
+msgstr "Impossible de synchroniser votre mot de passe"
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr "La connexion a échoué"
 msgstr "La connexion a échoué"
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr "Impossible d'enlever l'adresse Persona"
 msgstr "Impossible d'enlever l'adresse Persona"
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr "Ping du serveur"
 msgstr "Ping du serveur"
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr "Impossible de pinger le serveur"
 msgstr "Impossible de pinger le serveur"
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr "Récupérer les mémos"
 msgstr "Récupérer les mémos"
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr "Impossible de contacter le serveur"
 msgstr "Impossible de contacter le serveur"
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr "Suppression du mémo"
 msgstr "Suppression du mémo"
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr "Récupérer les nouvelles"
 msgstr "Récupérer les nouvelles"
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr "Nouvel item de nouvelle"
 msgstr "Nouvel item de nouvelle"
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr "Récupérer les canaux"
 msgstr "Récupérer les canaux"
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr "Suppression du canal"
 msgstr "Suppression du canal"
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr "Enregistrement du canal"
 msgstr "Enregistrement du canal"
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr "Changement de langue détecté"
 msgstr "Changement de langue détecté"

BIN
lang/fr_FR/LC_MESSAGES/omninet.mo


+ 104 - 86
lang/fr_FR/LC_MESSAGES/omninet.po

@@ -1,9 +1,9 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 20:44-0500\n"
-"Last-Translator: Julien Savard <[email protected]>\n"
+"POT-Creation-Date: 2014-03-08 21:38-0700\n"
+"PO-Revision-Date: 2014-03-08 21:38-0700\n"
+"Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language-Team: Omnimaga <[email protected]>\n"
 "Language: fr_FR\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr "RehashServ est déjà en cours d'exécution"
 msgstr "RehashServ est déjà en cours d'exécution"
 
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgid "IRC Server refused the connection."
 msgstr "Le serveur IRC a refusé la connexion."
 msgstr "Le serveur IRC a refusé la connexion."
 
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgid "Failed to authenticate with NickServ"
 msgstr "L'authentication avec NickServ a échoué"
 msgstr "L'authentication avec NickServ a échoué"
 
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgid "vhost not set."
 msgstr "vhost non défini."
 msgstr "vhost non défini."
 
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgid "Rehashed. View console for output."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgid "RunServ is already running."
 msgstr "RunServ est déjà en cours d'exécution"
 msgstr "RunServ est déjà en cours d'exécution"
 
 
@@ -163,7 +163,7 @@ msgstr "Pseudonyme"
 msgid "Omnimaga Profile"
 msgid "Omnimaga Profile"
 msgstr "Profil Omnimaga"
 msgstr "Profil Omnimaga"
 
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 msgstr "Nouveau mot de passe"
 
 
@@ -172,8 +172,8 @@ msgid "Invalid credentials"
 msgstr "Informations de connexion invalides."
 msgstr "Informations de connexion invalides."
 
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgid "User"
 msgstr "Utilisateur"
 msgstr "Utilisateur"
 
 
@@ -241,7 +241,7 @@ msgstr "Vrai nom"
 msgid "Email"
 msgid "Email"
 msgstr "Courriel"
 msgstr "Courriel"
 
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgid "Opers"
 msgstr "Opérateurs"
 msgstr "Opérateurs"
 
 
@@ -342,8 +342,7 @@ msgstr "Impossible d'enlever le courriel"
 msgid "2-factor disabled."
 msgid "2-factor disabled."
 msgstr "Vérification en deux étapes désactivée."
 msgstr "Vérification en deux étapes désactivée."
 
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 msgstr ""
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
@@ -353,11 +352,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgid "Could not update password with nickserv"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr "Déconnecté"
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgid "Not Logged in to use"
 msgstr "Déconnecté pour utiliser"
 msgstr "Déconnecté pour utiliser"
 
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgid "with key"
 msgstr "avec la clé"
 msgstr "avec la clé"
 
 
@@ -367,7 +372,7 @@ msgstr ""
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "de passe"
 "de passe"
 
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgid "Could not verify with nickserv"
 msgstr "Impossible de vérifier avec NickServ"
 msgstr "Impossible de vérifier avec NickServ"
 
 
@@ -375,60 +380,64 @@ msgstr "Impossible de vérifier avec NickServ"
 msgid "Nickserv password synchronized with main account"
 msgid "Nickserv password synchronized with main account"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
-msgstr "Déconnecté"
+#: ../../../site/api/index.php:376
+#, fuzzy
+msgid "Unable to sync groups"
+msgstr "Impossible de mettre à jour l'utilisateur"
+
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
 
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgid "No user set."
 msgstr "Aucun utilisateur défini."
 msgstr "Aucun utilisateur défini."
 
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgid "No email set."
 msgstr "Aucun courriel défini."
 msgstr "Aucun courriel défini."
 
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgid "No real name set."
 msgstr "Aucun vrai nom défini."
 msgstr "Aucun vrai nom défini."
 
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgid "No nick set."
 msgstr "Aucun pseudonyme défini."
 msgstr "Aucun pseudonyme défini."
 
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgid "User with id"
 msgstr "Utilisateur avec ID"
 msgstr "Utilisateur avec ID"
 
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgid "does not exist. You should reload the page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgid "Unable to update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgid "No profile set."
 msgstr "Aucun profil défini."
 msgstr "Aucun profil défini."
 
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgid "Oper with id"
 msgstr "Opérateur avec ID"
 msgstr "Opérateur avec ID"
 
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgid "Unable to update oper"
 msgstr "Impossible de mettre à jour l'opérateur"
 msgstr "Impossible de mettre à jour l'opérateur"
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgid "Failed to update setting"
 msgstr "La mise à jour du réglage a échoué"
 msgstr "La mise à jour du réglage a échoué"
 
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgid "with value"
 msgstr "avec la valeur"
 msgstr "avec la valeur"
 
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgid "Invalid Action"
 msgstr "Action invalide"
 msgstr "Action invalide"
 
 
@@ -463,7 +472,7 @@ msgid "Reply"
 msgstr "Répondre"
 msgstr "Répondre"
 
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgid "Delete"
 msgstr "Supprimer"
 msgstr "Supprimer"
 
 
@@ -475,131 +484,135 @@ msgstr "Nouveau canal"
 msgid "Access"
 msgid "Access"
 msgstr "Accès"
 msgstr "Accès"
 
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr "Indicateurs"
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgid "Modify"
 msgstr "Modifier"
 msgstr "Modifier"
 
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgid "Add Access"
 msgstr "Ajouter accès"
 msgstr "Ajouter accès"
 
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgid "News"
 msgstr "Nouvelles"
 msgstr "Nouvelles"
 
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgid "Memos"
 msgstr "Mémos"
 msgstr "Mémos"
 
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgid "Channels"
 msgstr "Canaux"
 msgstr "Canaux"
 
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgid "Servers"
 msgstr "Serveurs"
 msgstr "Serveurs"
 
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgid "Configuration"
 msgstr "Configuration"
 msgstr "Configuration"
 
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgid "Profile"
 msgstr "Profil"
 msgstr "Profil"
 
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgid "Send"
 msgstr "Envoyer"
 msgstr "Envoyer"
 
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgid "To"
 msgstr "À"
 msgstr "À"
 
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgid "Message"
 msgstr "Message"
 msgstr "Message"
 
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgid "Register"
 msgstr "S'enregistrer"
 msgstr "S'enregistrer"
 
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgid "Channel Name"
 msgstr "Nom du canal"
 msgstr "Nom du canal"
 
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr "Indicateurs"
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgid "Country"
 msgstr "Pays"
 msgstr "Pays"
 
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgid "Cell #"
 msgstr "Numéro de cellulaire"
 msgstr "Numéro de cellulaire"
 
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgid "Token"
 msgstr "Jeton"
 msgstr "Jeton"
 
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgid "Disable 2-factor"
 msgstr "Désactiver la vérification en deux étapes"
 msgstr "Désactiver la vérification en deux étapes"
 
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgid "Link Persona"
 msgstr "Lier le Persona"
 msgstr "Lier le Persona"
 
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgid "Remove"
 msgstr "Enlever"
 msgstr "Enlever"
 
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgid "Switch Role"
 msgstr "Changer de rôle"
 msgstr "Changer de rôle"
 
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgid "Rehash"
 msgstr "Mettre à jour"
 msgstr "Mettre à jour"
 
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 msgstr "Changer le mot de passe"
 
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgid "Sync Password"
 msgstr "Synchroniser le mot de passe"
 msgstr "Synchroniser le mot de passe"
 
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgid "Logout"
 msgstr "Se déconnecter"
 msgstr "Se déconnecter"
 
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgid "Password"
 msgstr "Mot de passe"
 msgstr "Mot de passe"
 
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgid "Switch"
 msgstr "Changer"
 msgstr "Changer"
 
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgid "Type"
 msgstr "Type"
 msgstr "Type"
 
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgid "Login"
 msgstr "Se connecter"
 msgstr "Se connecter"
 
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgid "2-Factor Verification"
 msgstr "Validation en deux étapes"
 msgstr "Validation en deux étapes"
 
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgid "Persona"
 msgstr "Persona"
 msgstr "Persona"
 
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 msgstr "Nom d'utilisateur"
 
 
@@ -619,64 +632,69 @@ msgstr "Impossible de mettre à jour les serveurs"
 msgid "Could not synchronize your password"
 msgid "Could not synchronize your password"
 msgstr "Impossible de synchroniser votre mot de passe"
 msgstr "Impossible de synchroniser votre mot de passe"
 
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+#, fuzzy
+msgid "Could not synchronize your groups"
+msgstr "Impossible de synchroniser votre mot de passe"
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgid "This is an admin only feature. Continue?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgid "Login failure"
 msgstr "La connexion a échoué"
 msgstr "La connexion a échoué"
 
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgid "Could not remove persona address"
 msgstr "Impossible d'enlever l'adresse Persona"
 msgstr "Impossible d'enlever l'adresse Persona"
 
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgid "Server Ping"
 msgstr "Ping du serveur"
 msgstr "Ping du serveur"
 
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgid "Could not ping server"
 msgstr "Impossible de pinger le serveur"
 msgstr "Impossible de pinger le serveur"
 
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgid "Fetching Memos"
 msgstr "Récupérer les mémos"
 msgstr "Récupérer les mémos"
 
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgid "Could not contact server"
 msgstr "Impossible de contacter le serveur"
 msgstr "Impossible de contacter le serveur"
 
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgid "Deleting memo"
 msgstr "Suppression du mémo"
 msgstr "Suppression du mémo"
 
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgid "Fetching News"
 msgstr "Récupérer les nouvelles"
 msgstr "Récupérer les nouvelles"
 
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgid "New news item"
 msgstr "Nouvel item de nouvelle"
 msgstr "Nouvel item de nouvelle"
 
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgid "Fetching Channels"
 msgstr "Récupérer les canaux"
 msgstr "Récupérer les canaux"
 
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgid "Are you sure you want to delete channel"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgid "Deleting channel"
 msgstr "Suppression du canal"
 msgstr "Suppression du canal"
 
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgid "Registering channel"
 msgstr "Enregistrement du canal"
 msgstr "Enregistrement du canal"
 
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgid "Language change detected"
 msgstr "Changement de langue détecté"
 msgstr "Changement de langue détecté"

+ 9 - 3
lib/irc.php

@@ -201,7 +201,7 @@
 		}
 		}
 		return '{"code":0,"message":"'.__('Rehashed. View console for output.').'","log":'.json_encode($msg).'}';
 		return '{"code":0,"message":"'.__('Rehashed. View console for output.').'","log":'.json_encode($msg).'}';
 	}
 	}
-	function irccommands($commands,$runas="RehashServ"){
+	function irccommands($commands,$runas="RehashServ",$nick='RunServ',$isreg=true){
 		global $msg;
 		global $msg;
 		global $irc;
 		global $irc;
 		global $ircret;
 		global $ircret;
@@ -221,7 +221,7 @@
 			if(!ircputs("NICK RehashServ\r\n")){return $ircret;}
 			if(!ircputs("NICK RehashServ\r\n")){return $ircret;}
 			if(!ircputs("USER RehashServ omni.irc.omnimaga.org RehashServ :RehashServ\r\n")){return $ircret;}
 			if(!ircputs("USER RehashServ omni.irc.omnimaga.org RehashServ :RehashServ\r\n")){return $ircret;}
 		}else{
 		}else{
-			if(!ircputs("NICK RunServ\r\n")){return $ircret;}
+			if(!ircputs("NICK {$nick}\r\n")){return $ircret;}
 			if(!ircputs("USER {$runas} omni.irc.omnimaga.org {$runas} :{$runas}\r\n")){return $ircret;}
 			if(!ircputs("USER {$runas} omni.irc.omnimaga.org {$runas} :{$runas}\r\n")){return $ircret;}
 		}
 		}
 		while(!feof($irc)){
 		while(!feof($irc)){
@@ -243,7 +243,7 @@
 		if($runas == 'RehashServ'){
 		if($runas == 'RehashServ'){
 			if(!ircputs("OPER RehashServ ".get_conf('rehash-pass','string')."\r\n")){return $ircret;}
 			if(!ircputs("OPER RehashServ ".get_conf('rehash-pass','string')."\r\n")){return $ircret;}
 			if(!ircputs("IDENTIFY RehashServ ".get_conf('rehash-pass','string')."\r\n")){return $ircret;}
 			if(!ircputs("IDENTIFY RehashServ ".get_conf('rehash-pass','string')."\r\n")){return $ircret;}
-		}else{
+		}else if($isreg){
 			if(!ircputs("IDENTIFY {$runas} ".$_SESSION['password']."\r\n")){return $ircret;}
 			if(!ircputs("IDENTIFY {$runas} ".$_SESSION['password']."\r\n")){return $ircret;}
 		}
 		}
 		while(!feof($irc)){
 		while(!feof($irc)){
@@ -264,6 +264,9 @@
 							}
 							}
 						}
 						}
 					}
 					}
+					if(!$isreg){
+						break;
+					}
 				}elseif(strrpos($line,'ERROR :Closing Link:') !== false){
 				}elseif(strrpos($line,'ERROR :Closing Link:') !== false){
 					return ircclose(3,__("IRC Server refused the connection."),'array');
 					return ircclose(3,__("IRC Server refused the connection."),'array');
 				}elseif(strrpos($line,":You are now identified for") !== false){
 				}elseif(strrpos($line,":You are now identified for") !== false){
@@ -294,6 +297,7 @@
 		}
 		}
 		foreach($commands as $k => $command){
 		foreach($commands as $k => $command){
 			if(!ircputs($command."\r\n")){return $ircret;}
 			if(!ircputs($command."\r\n")){return $ircret;}
+			time_nanosleep(0, 250000000);
 		}
 		}
 		try{
 		try{
 			error_reporting(0);
 			error_reporting(0);
@@ -306,6 +310,8 @@
 				$msg .= $line;
 				$msg .= $line;
 			}
 			}
 		}
 		}
+		$msg .= 'QUIT :Done';
+		fputs($irc,'QUIT :Done');
 		fclose($irc);
 		fclose($irc);
 		return array(
 		return array(
 			'code'=>0,
 			'code'=>0,

+ 40 - 2
site/api/index.php

@@ -334,7 +334,7 @@
 			die('{"code":0}');
 			die('{"code":0}');
 		break;
 		break;
 		case 'sync-pass':
 		case 'sync-pass':
-			$u && isset($_SESSION['password'])or die('{"code":2,"message":"'.__('Make sure that everything is filled in. Try reloading if it is.').'"}');
+			$u && isset($_SESSION['password'])or die('{"code":2,"message":"'.__('Not logged in').'"}');
 			$u['api_key'] == $_COOKIE['key'] or die('{"code":3,"message":"'.__('Not Logged in to use').' '.$u['nick'].' '.__('with key').' '.$u['api_key'].' != '.$_COOKIE['key'].'."}');
 			$u['api_key'] == $_COOKIE['key'] or die('{"code":3,"message":"'.__('Not Logged in to use').' '.$u['nick'].' '.__('with key').' '.$u['api_key'].' != '.$_COOKIE['key'].'."}');
 			$_COOKIE['type'] == 'user' or die('{"code":3,"message":"'.__('Must be logged in with type user to sync pass').'"}');
 			$_COOKIE['type'] == 'user' or die('{"code":3,"message":"'.__('Must be logged in with type user to sync pass').'"}');
 			$res = atheme_login(get_conf('xmlrpc-server'),get_conf('xmlrpc-port'),get_conf('xmlrpc-path'),$u['nick'],$_SESSION['password']);
 			$res = atheme_login(get_conf('xmlrpc-server'),get_conf('xmlrpc-port'),get_conf('xmlrpc-path'),$u['nick'],$_SESSION['password']);
@@ -344,8 +344,46 @@
 			query("UPDATE users u SET u.password='%s' WHERE u.id=%d",array(mkpasswd($_SESSION['password']),$u['id']));
 			query("UPDATE users u SET u.password='%s' WHERE u.id=%d",array(mkpasswd($_SESSION['password']),$u['id']));
 			die('{"code":0,"message":"'.__('Nickserv password synchronized with main account').'"}');
 			die('{"code":0,"message":"'.__('Nickserv password synchronized with main account').'"}');
 		break;
 		break;
+		case 'sync-groups':
+			$u && isset($_SESSION['password'])or die('{"code":2,"message":"'.__('Make sure that everything is filled in. Try reloading if it is.').'"}');
+			$u['api_key'] == $_COOKIE['key'] or die('{"code":3,"message":"'.__('Not Logged in to use').' '.$u['nick'].' '.__('with key').' '.$u['api_key'].' != '.$_COOKIE['key'].'."}');
+			$res = atheme_login(get_conf('xmlrpc-server'),get_conf('xmlrpc-port'),get_conf('xmlrpc-path'),$u['nick'],$_SESSION['password']);
+			if($res[0] === false){
+				die('{"code":2,"message":"'.__('Could not verify with nickserv').': '.$res[1].'"}');
+			}
+			require_once(get_conf('smf-path').'/SSI.php');
+			$res = $smcFunc['db_query']('',"SELECT id_group,additional_groups
+				FROM {db_prefix}members
+				WHERE id_member = {int:id_member}
+			",array(
+				'id_member'=>$user_info['id']
+			));
+			$log = '';
+			while($row = $smcFunc['db_fetch_assoc']($res)){
+				$groups = explode(',',$row['additional_groups']);
+				if(!is_null($row['id_group'])){
+					array_push($groups,$row['id_group']);
+				}
+				foreach($groups as $k => $group){
+					$res2 = query("SELECT irc_name FROM smf_groups WHERE id_group = %d",array($group));
+					if($res2 && $res2->num_rows > 0){
+						$res2 = $res2->fetch_assoc();
+						$ret3 = irccommands(array(
+							'grs fflags !'.$res2['irc_name'].' '.$_COOKIE['user'].' +cvi'
+						));
+						$log .= $ret3['log'];
+						if($ret3['code'] !== 0){
+							die('{"code":'.$ret3['code'].',"message":"'.__('Unable to sync groups').'","log":'.json_encode($log).'}');
+						}
+					}else{
+						$log .= "No group match for {$group}\n";
+					}
+				}
+			}
+			die('{"code":0,"message":"'.__('Groups synced with SMF').'","log":'.json_encode($log).'}');
+		break;
 		case 'role':
 		case 'role':
-			$u && isset($_GET['type']) or die('{"code":2,"message":"'.__('Make sure that everything is filled in. Try reloading if it is.').'"}');
+			$u && isset($_GET['type']) or die('{"code":2,"message":"'.__('Not logged in').'"}');
 			setcookie('type',$_GET['type'],null,'/');
 			setcookie('type',$_GET['type'],null,'/');
 			die('{"code":0}');
 			die('{"code":0}');
 		break;
 		break;

+ 1 - 0
site/index.php

@@ -424,6 +424,7 @@
 				<li><a id="newpass-button"><?php echo __('Change Password'); ?></a></li>
 				<li><a id="newpass-button"><?php echo __('Change Password'); ?></a></li>
 				<?php if(has_flag($user,'u')){ ?>
 				<?php if(has_flag($user,'u')){ ?>
 					<li><a id="sync-pass"><?php echo __('Sync Password'); ?></a></li>
 					<li><a id="sync-pass"><?php echo __('Sync Password'); ?></a></li>
+					<li><a id="sync-groups"><?php echo __('Sync Groups'); ?></a></li>
 				<?php } ?>
 				<?php } ?>
 				<li><a id="logout"><?php echo __('Logout'); ?></a></li>
 				<li><a id="logout"><?php echo __('Logout'); ?></a></li>
 			</ul>
 			</ul>

+ 20 - 0
site/js/index.js

@@ -211,6 +211,26 @@ $(function(){
 			btn.attr('disabled','disabled');
 			btn.attr('disabled','disabled');
 			return false;
 			return false;
 		});
 		});
+		$('#sync-groups').click(function(){
+			var btn = $(this);
+			$.ajax(__HOSTNAME__+'site/api/?action=sync-groups',{
+				success: function(d){
+					if(d.log){
+						console.log(d.log);
+					}
+					alert(d.message);
+					btn.removeAttr('disabled');
+				},
+				error: function(xhr,msg,e){
+					console.error(e);
+					alert(_("Could not synchronize your groups")+": "+msg);
+					btn.removeAttr('disabled');
+				},
+				dataType: 'json'
+			});
+			btn.attr('disabled','disabled');
+			return false;
+		});
 		$('#persona-register').hover(function(){
 		$('#persona-register').hover(function(){
 			$(this).addClass('ui-state-hover');
 			$(this).addClass('ui-state-hover');
 		},function(){
 		},function(){