10 năm trước cách đây · cc8fb25145
--- a/lang/en/C/LC_MESSAGES/omninet.mo
+++ b/lang/en/C/LC_MESSAGES/omninet.mo
--- a/lang/en/C/LC_MESSAGES/omninet.po
+++ b/lang/en/C/LC_MESSAGES/omninet.po
@@ -1,8 +1,8 @@
 
 msgid ""
 
 msgstr ""
 
 "Project-Id-Version: Omninet\n"
 
-"POT-Creation-Date: 2014-02-20 22:02-0700\n"
 
-"PO-Revision-Date: 2014-02-20 22:02-0700\n"
 
+"POT-Creation-Date: 2014-02-20 22:21-0700\n"
 
+"PO-Revision-Date: 2014-02-20 22:21-0700\n"
 
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 
 "Language-Team: Omnimaga <[email protected]>\n"
 
 "Language: en\n"
@@ -14,18 +14,117 @@ msgstr ""
 
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 "X-Poedit-SearchPath-0: ../../../..\n"
 
-#: ../../../../site/api/index.php:22
 
-msgid "Missing username and/or password"
 
+#: ../../../../lib/configuration.php:133 ../../../../lib/users.php:163
 
+msgid "Save"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:23
 
-msgid "Missing user type"
 
+#: ../../../../lib/irc.php:37
 
+msgid "Insufficient Parameters to login"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:32
 
-msgid "No token set"
 
+#: ../../../../lib/irc.php:40
 
+msgid "Account is not registered"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:43
 
+msgid "Invalid Username/Password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:46
 
+msgid "Account is frozen"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:49
 
+msgid "Could not log in"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:132
 
+msgid "Could not connect."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:133
 
+msgid "Could not set timeout."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:143 ../../../../lib/irc.php:160
 
+#: ../../../../lib/irc.php:177
 
+msgid "RehashServ is already running."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:145 ../../../../lib/irc.php:162
 
+#: ../../../../lib/irc.php:179
 
+msgid "IRC Server refused the connection."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:166
 
+msgid "Failed to authenticate with NickServ"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:183
 
+msgid "vhost not set."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:203
 
+msgid "There is an error in the config. See console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:205
 
+msgid "Rehashed. View console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+msgid "Managed Oper"
 
 msgstr ""
 
+#: ../../../../lib/opers.php:56
 
+msgid "Personal Oper"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:59 ../../../../lib/servers.php:111
 
+#: ../../../../lib/users.php:143
 
+msgid "Nick"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:65
 
+msgid "Omnimaga Profile"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:71 ../../../../site/index.php:336
 
+msgid "New Password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:63
 
+msgid "Invalid credentials"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
+#: ../../../../site/index.php:403
 
+msgid "User"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159
 
+msgid "does not exist"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:73
 
+msgid "Invalid persona email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:84 ../../../../site/api/index.php:258
 
+msgid "Invalid password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:102 ../../../../lib/security.php:171
 
+msgid "Failed to create Authy user"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:115
 
+msgid "Token didn't match "
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:122 ../../../../lib/security.php:204
 
 #: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
 #: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
 #: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
@@ -33,6 +132,71 @@ msgstr ""
 
 msgid "You have been logged out"
 
 msgstr ""
 
+#: ../../../../lib/security.php:137 ../../../../lib/security.php:140
 
+#: ../../../../lib/security.php:150
 
+msgid "Failed to disable 2-factor authentication"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:178
 
+msgid "No cell number set"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:181
 
+msgid "No country code set"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:191
 
+msgid "Could not register"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:194
 
+msgid "No secret key defined"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:197
 
+msgid "No token provided"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:104 ../../../../site/api/index.php:124
 
+msgid "Owner"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:137
 
+msgid "Real Name"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:149
 
+msgid "Email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:108 ../../../../site/index.php:182
 
+msgid "Opers"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:111
 
+msgid "Role"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:119
 
+msgid "Parent"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:123
 
+msgid "Children"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:22
 
+msgid "Missing username and/or password"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:23
 
+msgid "Missing user type"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:32
 
+msgid "No token set"
 
+msgstr ""
 
+
 
 #: ../../../../site/api/index.php:73
 
 msgid "Cannot fetch memos"
 
 msgstr ""
@@ -69,10 +233,6 @@ msgstr ""
 
 msgid "Admin"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:124
 
-msgid "Owner"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:125
 
 msgid "Set"
 
 msgstr ""
@@ -117,15 +277,6 @@ msgstr ""
 
 msgid "No message or user entered"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
-#: ../../../../site/index.php:403
 
-msgid "User"
 
-msgstr ""
 
-
 
-#: ../../../../site/api/index.php:159
 
-msgid "does not exist"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:161
 
 msgid "Memo Sent"
 
 msgstr ""
@@ -167,10 +318,6 @@ msgstr ""
 
 msgid "Make sure that everything is filled in. Try reloading if it is."
 
 msgstr ""
 
-#: ../../../../site/api/index.php:258
 
-msgid "Invalid password"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:263
 
 msgid "Could not update password with nickserv"
 
 msgstr ""
@@ -311,10 +458,6 @@ msgstr ""
 
 msgid "Servers"
 
 msgstr ""
 
-#: ../../../../site/index.php:182
 
-msgid "Opers"
 
-msgstr ""
 
-
 
 #: ../../../../site/index.php:183
 
 msgid "Configuration"
 
 msgstr ""
@@ -379,10 +522,6 @@ msgstr ""
 
 msgid "Password"
 
 msgstr ""
 
-#: ../../../../site/index.php:336
 
-msgid "New Password"
 
-msgstr ""
 
-
 
 #: ../../../../site/index.php:360
 
 msgid "Switch"
 
 msgstr ""
@@ -435,35 +574,35 @@ msgstr ""
 
 msgid "Could not remove persona address"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:327
 
+#: ../../../../site/js/index.js:338
 
 msgid "Server Ping"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:342 ../../../../site/js/index.js:425
 
+#: ../../../../site/js/index.js:353 ../../../../site/js/index.js:436
 
 msgid "Could not ping server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:350
 
+#: ../../../../site/js/index.js:361
 
 msgid "Fetching Memos"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:379 ../../../../site/js/index.js:462
 
-#: ../../../../site/js/index.js:496
 
+#: ../../../../site/js/index.js:390 ../../../../site/js/index.js:474
 
+#: ../../../../site/js/index.js:509
 
 msgid "Could not contact server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:406
 
+#: ../../../../site/js/index.js:417
 
 msgid "Deleting memo"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:432
 
+#: ../../../../site/js/index.js:443
 
 msgid "Fetching News"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:454
 
+#: ../../../../site/js/index.js:465
 
 msgid "New news item"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:472
 
+#: ../../../../site/js/index.js:484
 
 msgid "Fetching Channels"
 
 msgstr ""
--- a/lang/en_CA/C/LC_MESSAGES/omninet.mo
+++ b/lang/en_CA/C/LC_MESSAGES/omninet.mo
--- a/lang/en_CA/C/LC_MESSAGES/omninet.po
+++ b/lang/en_CA/C/LC_MESSAGES/omninet.po
@@ -1,8 +1,8 @@
 
 msgid ""
 
 msgstr ""
 
 "Project-Id-Version: Omninet Control panel\n"
 
-"POT-Creation-Date: 2014-02-20 22:01-0700\n"
 
-"PO-Revision-Date: 2014-02-20 22:01-0700\n"
 
+"POT-Creation-Date: 2014-02-20 22:21-0700\n"
 
+"PO-Revision-Date: 2014-02-20 22:21-0700\n"
 
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 
 "Language-Team: Omnimaga <[email protected]>\n"
 
 "Language: en_CA\n"
@@ -14,18 +14,117 @@ msgstr ""
 
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 "X-Poedit-SearchPath-0: ../../../..\n"
 
-#: ../../../../site/api/index.php:22
 
-msgid "Missing username and/or password"
 
+#: ../../../../lib/configuration.php:133 ../../../../lib/users.php:163
 
+msgid "Save"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:23
 
-msgid "Missing user type"
 
+#: ../../../../lib/irc.php:37
 
+msgid "Insufficient Parameters to login"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:32
 
-msgid "No token set"
 
+#: ../../../../lib/irc.php:40
 
+msgid "Account is not registered"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:43
 
+msgid "Invalid Username/Password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:46
 
+msgid "Account is frozen"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:49
 
+msgid "Could not log in"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:132
 
+msgid "Could not connect."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:133
 
+msgid "Could not set timeout."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:143 ../../../../lib/irc.php:160
 
+#: ../../../../lib/irc.php:177
 
+msgid "RehashServ is already running."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:145 ../../../../lib/irc.php:162
 
+#: ../../../../lib/irc.php:179
 
+msgid "IRC Server refused the connection."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:166
 
+msgid "Failed to authenticate with NickServ"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:183
 
+msgid "vhost not set."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:203
 
+msgid "There is an error in the config. See console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:205
 
+msgid "Rehashed. View console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+msgid "Managed Oper"
 
 msgstr ""
 
+#: ../../../../lib/opers.php:56
 
+msgid "Personal Oper"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:59 ../../../../lib/servers.php:111
 
+#: ../../../../lib/users.php:143
 
+msgid "Nick"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:65
 
+msgid "Omnimaga Profile"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:71 ../../../../site/index.php:336
 
+msgid "New Password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:63
 
+msgid "Invalid credentials"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
+#: ../../../../site/index.php:403
 
+msgid "User"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159
 
+msgid "does not exist"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:73
 
+msgid "Invalid persona email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:84 ../../../../site/api/index.php:258
 
+msgid "Invalid password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:102 ../../../../lib/security.php:171
 
+msgid "Failed to create Authy user"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:115
 
+msgid "Token didn't match "
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:122 ../../../../lib/security.php:204
 
 #: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
 #: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
 #: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
@@ -33,6 +132,71 @@ msgstr ""
 
 msgid "You have been logged out"
 
 msgstr ""
 
+#: ../../../../lib/security.php:137 ../../../../lib/security.php:140
 
+#: ../../../../lib/security.php:150
 
+msgid "Failed to disable 2-factor authentication"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:178
 
+msgid "No cell number set"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:181
 
+msgid "No country code set"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:191
 
+msgid "Could not register"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:194
 
+msgid "No secret key defined"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:197
 
+msgid "No token provided"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:104 ../../../../site/api/index.php:124
 
+msgid "Owner"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:137
 
+msgid "Real Name"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:149
 
+msgid "Email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:108 ../../../../site/index.php:182
 
+msgid "Opers"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:111
 
+msgid "Role"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:119
 
+msgid "Parent"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:123
 
+msgid "Children"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:22
 
+msgid "Missing username and/or password"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:23
 
+msgid "Missing user type"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:32
 
+msgid "No token set"
 
+msgstr ""
 
+
 
 #: ../../../../site/api/index.php:73
 
 msgid "Cannot fetch memos"
 
 msgstr ""
@@ -69,10 +233,6 @@ msgstr ""
 
 msgid "Admin"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:124
 
-msgid "Owner"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:125
 
 msgid "Set"
 
 msgstr ""
@@ -117,15 +277,6 @@ msgstr ""
 
 msgid "No message or user entered"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
-#: ../../../../site/index.php:403
 
-msgid "User"
 
-msgstr ""
 
-
 
-#: ../../../../site/api/index.php:159
 
-msgid "does not exist"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:161
 
 msgid "Memo Sent"
 
 msgstr ""
@@ -167,10 +318,6 @@ msgstr ""
 
 msgid "Make sure that everything is filled in. Try reloading if it is."
 
 msgstr ""
 
-#: ../../../../site/api/index.php:258
 
-msgid "Invalid password"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:263
 
 msgid "Could not update password with nickserv"
 
 msgstr ""
@@ -311,10 +458,6 @@ msgstr ""
 
 msgid "Servers"
 
 msgstr ""
 
-#: ../../../../site/index.php:182
 
-msgid "Opers"
 
-msgstr ""
 
-
 
 #: ../../../../site/index.php:183
 
 msgid "Configuration"
 
 msgstr ""
@@ -379,10 +522,6 @@ msgstr ""
 
 msgid "Password"
 
 msgstr ""
 
-#: ../../../../site/index.php:336
 
-msgid "New Password"
 
-msgstr ""
 
-
 
 #: ../../../../site/index.php:360
 
 msgid "Switch"
 
 msgstr ""
@@ -435,35 +574,35 @@ msgstr ""
 
 msgid "Could not remove persona address"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:327
 
+#: ../../../../site/js/index.js:338
 
 msgid "Server Ping"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:342 ../../../../site/js/index.js:425
 
+#: ../../../../site/js/index.js:353 ../../../../site/js/index.js:436
 
 msgid "Could not ping server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:350
 
+#: ../../../../site/js/index.js:361
 
 msgid "Fetching Memos"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:379 ../../../../site/js/index.js:462
 
-#: ../../../../site/js/index.js:496
 
+#: ../../../../site/js/index.js:390 ../../../../site/js/index.js:474
 
+#: ../../../../site/js/index.js:509
 
 msgid "Could not contact server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:406
 
+#: ../../../../site/js/index.js:417
 
 msgid "Deleting memo"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:432
 
+#: ../../../../site/js/index.js:443
 
 msgid "Fetching News"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:454
 
+#: ../../../../site/js/index.js:465
 
 msgid "New news item"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:472
 
+#: ../../../../site/js/index.js:484
 
 msgid "Fetching Channels"
 
 msgstr ""
--- a/lang/en_US/C/LC_MESSAGES/omninet.mo
+++ b/lang/en_US/C/LC_MESSAGES/omninet.mo
--- a/lang/en_US/C/LC_MESSAGES/omninet.po
+++ b/lang/en_US/C/LC_MESSAGES/omninet.po
@@ -1,8 +1,8 @@
 
 msgid ""
 
 msgstr ""
 
 "Project-Id-Version: Omninet Control panel\n"
 
-"POT-Creation-Date: 2014-02-20 22:01-0700\n"
 
-"PO-Revision-Date: 2014-02-20 22:01-0700\n"
 
+"POT-Creation-Date: 2014-02-20 22:21-0700\n"
 
+"PO-Revision-Date: 2014-02-20 22:21-0700\n"
 
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 
 "Language-Team: Omnimaga <[email protected]>\n"
 
 "Language: en_US\n"
@@ -14,18 +14,117 @@ msgstr ""
 
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 "X-Poedit-SearchPath-0: ../../../..\n"
 
-#: ../../../../site/api/index.php:22
 
-msgid "Missing username and/or password"
 
+#: ../../../../lib/configuration.php:133 ../../../../lib/users.php:163
 
+msgid "Save"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:23
 
-msgid "Missing user type"
 
+#: ../../../../lib/irc.php:37
 
+msgid "Insufficient Parameters to login"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:32
 
-msgid "No token set"
 
+#: ../../../../lib/irc.php:40
 
+msgid "Account is not registered"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:43
 
+msgid "Invalid Username/Password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:46
 
+msgid "Account is frozen"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:49
 
+msgid "Could not log in"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:132
 
+msgid "Could not connect."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:133
 
+msgid "Could not set timeout."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:143 ../../../../lib/irc.php:160
 
+#: ../../../../lib/irc.php:177
 
+msgid "RehashServ is already running."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:145 ../../../../lib/irc.php:162
 
+#: ../../../../lib/irc.php:179
 
+msgid "IRC Server refused the connection."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:166
 
+msgid "Failed to authenticate with NickServ"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:183
 
+msgid "vhost not set."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:203
 
+msgid "There is an error in the config. See console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:205
 
+msgid "Rehashed. View console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+msgid "Managed Oper"
 
 msgstr ""
 
+#: ../../../../lib/opers.php:56
 
+msgid "Personal Oper"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:59 ../../../../lib/servers.php:111
 
+#: ../../../../lib/users.php:143
 
+msgid "Nick"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:65
 
+msgid "Omnimaga Profile"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:71 ../../../../site/index.php:336
 
+msgid "New Password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:63
 
+msgid "Invalid credentials"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
+#: ../../../../site/index.php:403
 
+msgid "User"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159
 
+msgid "does not exist"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:73
 
+msgid "Invalid persona email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:84 ../../../../site/api/index.php:258
 
+msgid "Invalid password"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:102 ../../../../lib/security.php:171
 
+msgid "Failed to create Authy user"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:115
 
+msgid "Token didn't match "
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:122 ../../../../lib/security.php:204
 
 #: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
 #: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
 #: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
@@ -33,6 +132,71 @@ msgstr ""
 
 msgid "You have been logged out"
 
 msgstr ""
 
+#: ../../../../lib/security.php:137 ../../../../lib/security.php:140
 
+#: ../../../../lib/security.php:150
 
+msgid "Failed to disable 2-factor authentication"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:178
 
+msgid "No cell number set"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:181
 
+msgid "No country code set"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:191
 
+msgid "Could not register"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:194
 
+msgid "No secret key defined"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:197
 
+msgid "No token provided"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:104 ../../../../site/api/index.php:124
 
+msgid "Owner"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:137
 
+msgid "Real Name"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:149
 
+msgid "Email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:108 ../../../../site/index.php:182
 
+msgid "Opers"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:111
 
+msgid "Role"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:119
 
+msgid "Parent"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:123
 
+msgid "Children"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:22
 
+msgid "Missing username and/or password"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:23
 
+msgid "Missing user type"
 
+msgstr ""
 
+
 
+#: ../../../../site/api/index.php:32
 
+msgid "No token set"
 
+msgstr ""
 
+
 
 #: ../../../../site/api/index.php:73
 
 msgid "Cannot fetch memos"
 
 msgstr ""
@@ -69,10 +233,6 @@ msgstr ""
 
 msgid "Admin"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:124
 
-msgid "Owner"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:125
 
 msgid "Set"
 
 msgstr ""
@@ -117,15 +277,6 @@ msgstr ""
 
 msgid "No message or user entered"
 
 msgstr ""
 
-#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
-#: ../../../../site/index.php:403
 
-msgid "User"
 
-msgstr ""
 
-
 
-#: ../../../../site/api/index.php:159
 
-msgid "does not exist"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:161
 
 msgid "Memo Sent"
 
 msgstr ""
@@ -167,10 +318,6 @@ msgstr ""
 
 msgid "Make sure that everything is filled in. Try reloading if it is."
 
 msgstr ""
 
-#: ../../../../site/api/index.php:258
 
-msgid "Invalid password"
 
-msgstr ""
 
-
 
 #: ../../../../site/api/index.php:263
 
 msgid "Could not update password with nickserv"
 
 msgstr ""
@@ -311,10 +458,6 @@ msgstr ""
 
 msgid "Servers"
 
 msgstr ""
 
-#: ../../../../site/index.php:182
 
-msgid "Opers"
 
-msgstr ""
 
-
 
 #: ../../../../site/index.php:183
 
 msgid "Configuration"
 
 msgstr ""
@@ -379,10 +522,6 @@ msgstr ""
 
 msgid "Password"
 
 msgstr ""
 
-#: ../../../../site/index.php:336
 
-msgid "New Password"
 
-msgstr ""
 
-
 
 #: ../../../../site/index.php:360
 
 msgid "Switch"
 
 msgstr ""
@@ -435,35 +574,35 @@ msgstr ""
 
 msgid "Could not remove persona address"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:327
 
+#: ../../../../site/js/index.js:338
 
 msgid "Server Ping"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:342 ../../../../site/js/index.js:425
 
+#: ../../../../site/js/index.js:353 ../../../../site/js/index.js:436
 
 msgid "Could not ping server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:350
 
+#: ../../../../site/js/index.js:361
 
 msgid "Fetching Memos"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:379 ../../../../site/js/index.js:462
 
-#: ../../../../site/js/index.js:496
 
+#: ../../../../site/js/index.js:390 ../../../../site/js/index.js:474
 
+#: ../../../../site/js/index.js:509
 
 msgid "Could not contact server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:406
 
+#: ../../../../site/js/index.js:417
 
 msgid "Deleting memo"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:432
 
+#: ../../../../site/js/index.js:443
 
 msgid "Fetching News"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:454
 
+#: ../../../../site/js/index.js:465
 
 msgid "New news item"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:472
 
+#: ../../../../site/js/index.js:484
 
 msgid "Fetching Channels"
 
 msgstr ""
--- a/lang/fr/C/LC_MESSAGES/omninet.mo
+++ b/lang/fr/C/LC_MESSAGES/omninet.mo
--- a/lang/fr/C/LC_MESSAGES/omninet.po
+++ b/lang/fr/C/LC_MESSAGES/omninet.po
@@ -1,8 +1,8 @@
 
 msgid ""
 
 msgstr ""
 
 "Project-Id-Version: Omninet Control panel\n"
 
-"POT-Creation-Date: 2014-02-20 22:01-0700\n"
 
-"PO-Revision-Date: 2014-02-20 22:01-0700\n"
 
+"POT-Creation-Date: 2014-02-20 22:21-0700\n"
 
+"PO-Revision-Date: 2014-02-20 22:21-0700\n"
 
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 
 "Language-Team: Omnimaga <[email protected]>\n"
 
 "Language: fr\n"
@@ -14,6 +14,191 @@ msgstr ""
 
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 "X-Poedit-SearchPath-0: ../../../..\n"
 
+#: ../../../../lib/configuration.php:133 ../../../../lib/users.php:163
 
+msgid "Save"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:37
 
+msgid "Insufficient Parameters to login"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:40
 
+msgid "Account is not registered"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:43
 
+#, fuzzy
 
+msgid "Invalid Username/Password"
 
+msgstr "Mot de passe invalide"
 
+
 
+#: ../../../../lib/irc.php:46
 
+msgid "Account is frozen"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:49
 
+#, fuzzy
 
+msgid "Could not log in"
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:132
 
+#, fuzzy
 
+msgid "Could not connect."
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:133
 
+#, fuzzy
 
+msgid "Could not set timeout."
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:143 ../../../../lib/irc.php:160
 
+#: ../../../../lib/irc.php:177
 
+msgid "RehashServ is already running."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:145 ../../../../lib/irc.php:162
 
+#: ../../../../lib/irc.php:179
 
+msgid "IRC Server refused the connection."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:166
 
+msgid "Failed to authenticate with NickServ"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:183
 
+#, fuzzy
 
+msgid "vhost not set."
 
+msgstr "n'existe pas"
 
+
 
+#: ../../../../lib/irc.php:203
 
+msgid "There is an error in the config. See console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:205
 
+msgid "Rehashed. View console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+msgid "Managed Oper"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+#, fuzzy
 
+msgid "Personal Oper"
 
+msgstr "Persona"
 
+
 
+#: ../../../../lib/opers.php:59 ../../../../lib/servers.php:111
 
+#: ../../../../lib/users.php:143
 
+msgid "Nick"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:65
 
+#, fuzzy
 
+msgid "Omnimaga Profile"
 
+msgstr "Profil"
 
+
 
+#: ../../../../lib/opers.php:71 ../../../../site/index.php:336
 
+msgid "New Password"
 
+msgstr "Nouveau mot de passe"
 
+
 
+#: ../../../../lib/security.php:63
 
+#, fuzzy
 
+msgid "Invalid credentials"
 
+msgstr "Action invalide"
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
+#: ../../../../site/index.php:403
 
+msgid "User"
 
+msgstr "Utilisateur"
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159
 
+msgid "does not exist"
 
+msgstr "n'existe pas"
 
+
 
+#: ../../../../lib/security.php:73
 
+#, fuzzy
 
+msgid "Invalid persona email"
 
+msgstr "Impossible d'ajouter le courriel"
 
+
 
+#: ../../../../lib/security.php:84 ../../../../site/api/index.php:258
 
+msgid "Invalid password"
 
+msgstr "Mot de passe invalide"
 
+
 
+#: ../../../../lib/security.php:102 ../../../../lib/security.php:171
 
+#, fuzzy
 
+msgid "Failed to create Authy user"
 
+msgstr "Impossible de mettre à jour le réglage"
 
+
 
+#: ../../../../lib/security.php:115
 
+msgid "Token didn't match "
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:122 ../../../../lib/security.php:204
 
+#: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
+#: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
+#: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
 
+#: ../../../../site/api/index.php:245 ../../../../site/api/index.php:253
 
+msgid "You have been logged out"
 
+msgstr "Vous avez été déconnecté"
 
+
 
+#: ../../../../lib/security.php:137 ../../../../lib/security.php:140
 
+#: ../../../../lib/security.php:150
 
+msgid "Failed to disable 2-factor authentication"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:178
 
+#, fuzzy
 
+msgid "No cell number set"
 
+msgstr "Aucun vrai nom défini."
 
+
 
+#: ../../../../lib/security.php:181
 
+#, fuzzy
 
+msgid "No country code set"
 
+msgstr "Aucun jeton défini"
 
+
 
+#: ../../../../lib/security.php:191
 
+#, fuzzy
 
+msgid "Could not register"
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/security.php:194
 
+msgid "No secret key defined"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:197
 
+#, fuzzy
 
+msgid "No token provided"
 
+msgstr "Aucun jeton défini"
 
+
 
+#: ../../../../lib/servers.php:104 ../../../../site/api/index.php:124
 
+msgid "Owner"
 
+msgstr "Propriétaire"
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:137
 
+msgid "Real Name"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:149
 
+msgid "Email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:108 ../../../../site/index.php:182
 
+msgid "Opers"
 
+msgstr "Opérateurs"
 
+
 
+#: ../../../../lib/servers.php:111
 
+msgid "Role"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:119
 
+msgid "Parent"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:123
 
+msgid "Children"
 
+msgstr ""
 
+
 
 #: ../../../../site/api/index.php:22
 
 msgid "Missing username and/or password"
 
 msgstr "Nom d'utilisateur et/ou mot de passe manquant"
@@ -26,13 +211,6 @@ msgstr "Type d'utilisateur manquant"
 
 msgid "No token set"
 
 msgstr "Aucun jeton défini"
 
-#: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
-#: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
-#: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
 
-#: ../../../../site/api/index.php:245 ../../../../site/api/index.php:253
 
-msgid "You have been logged out"
 
-msgstr "Vous avez été déconnecté"
 
-
 
 #: ../../../../site/api/index.php:73
 
 msgid "Cannot fetch memos"
 
 msgstr "Impossible de récupérer les mémos"
@@ -69,10 +247,6 @@ msgstr "Opérateur automatique"
 
 msgid "Admin"
 
 msgstr "Administrateur"
 
-#: ../../../../site/api/index.php:124
 
-msgid "Owner"
 
-msgstr "Propriétaire"
 
-
 
 #: ../../../../site/api/index.php:125
 
 msgid "Set"
 
 msgstr "Définir"
@@ -117,15 +291,6 @@ msgstr "Impossible de récupérer les canaux"
 
 msgid "No message or user entered"
 
 msgstr "Aucun message ou utilisateur entré"
 
-#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
-#: ../../../../site/index.php:403
 
-msgid "User"
 
-msgstr "Utilisateur"
 
-
 
-#: ../../../../site/api/index.php:159
 
-msgid "does not exist"
 
-msgstr "n'existe pas"
 
-
 
 #: ../../../../site/api/index.php:161
 
 msgid "Memo Sent"
 
 msgstr "Mémo envoyé"
@@ -169,10 +334,6 @@ msgstr ""
 
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
 
 "le cas."
 
-#: ../../../../site/api/index.php:258
 
-msgid "Invalid password"
 
-msgstr "Mot de passe invalide"
 
-
 
 #: ../../../../site/api/index.php:263
 
 msgid "Could not update password with nickserv"
 
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
@@ -315,10 +476,6 @@ msgstr "Canaux"
 
 msgid "Servers"
 
 msgstr "Serveurs"
 
-#: ../../../../site/index.php:182
 
-msgid "Opers"
 
-msgstr "Opérateurs"
 
-
 
 #: ../../../../site/index.php:183
 
 msgid "Configuration"
 
 msgstr "Configuration"
@@ -383,10 +540,6 @@ msgstr "Se déconnecter"
 
 msgid "Password"
 
 msgstr "Mot de passe"
 
-#: ../../../../site/index.php:336
 
-msgid "New Password"
 
-msgstr "Nouveau mot de passe"
 
-
 
 #: ../../../../site/index.php:360
 
 msgid "Switch"
 
 msgstr "Changer"
@@ -441,39 +594,39 @@ msgstr ""
 
 msgid "Could not remove persona address"
 
 msgstr "Ne peut enlever le courriel"
 
-#: ../../../../site/js/index.js:327
 
+#: ../../../../site/js/index.js:338
 
 #, fuzzy
 
 msgid "Server Ping"
 
 msgstr "Serveurs"
 
-#: ../../../../site/js/index.js:342 ../../../../site/js/index.js:425
 
+#: ../../../../site/js/index.js:353 ../../../../site/js/index.js:436
 
 #, fuzzy
 
 msgid "Could not ping server"
 
 msgstr "Ne peut vérifier avec NickServ"
 
-#: ../../../../site/js/index.js:350
 
+#: ../../../../site/js/index.js:361
 
 msgid "Fetching Memos"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:379 ../../../../site/js/index.js:462
 
-#: ../../../../site/js/index.js:496
 
+#: ../../../../site/js/index.js:390 ../../../../site/js/index.js:474
 
+#: ../../../../site/js/index.js:509
 
 msgid "Could not contact server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:406
 
+#: ../../../../site/js/index.js:417
 
 #, fuzzy
 
 msgid "Deleting memo"
 
 msgstr "Supprimer"
 
-#: ../../../../site/js/index.js:432
 
+#: ../../../../site/js/index.js:443
 
 msgid "Fetching News"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:454
 
+#: ../../../../site/js/index.js:465
 
 msgid "New news item"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:472
 
+#: ../../../../site/js/index.js:484
 
 #, fuzzy
 
 msgid "Fetching Channels"
 
 msgstr "Nouveau canal"
--- a/lang/fr_CA/C/LC_MESSAGES/omninet.mo
+++ b/lang/fr_CA/C/LC_MESSAGES/omninet.mo
--- a/lang/fr_CA/C/LC_MESSAGES/omninet.po
+++ b/lang/fr_CA/C/LC_MESSAGES/omninet.po
@@ -1,8 +1,8 @@
 
 msgid ""
 
 msgstr ""
 
 "Project-Id-Version: Omninet Control panel\n"
 
-"POT-Creation-Date: 2014-02-20 22:00-0700\n"
 
-"PO-Revision-Date: 2014-02-20 22:00-0700\n"
 
+"POT-Creation-Date: 2014-02-20 22:22-0700\n"
 
+"PO-Revision-Date: 2014-02-20 22:22-0700\n"
 
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 
 "Language-Team: Omnimaga <[email protected]>\n"
 
 "Language: fr_CA\n"
@@ -14,6 +14,191 @@ msgstr ""
 
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 "X-Poedit-SearchPath-0: ../../../..\n"
 
+#: ../../../../lib/configuration.php:133 ../../../../lib/users.php:163
 
+msgid "Save"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:37
 
+msgid "Insufficient Parameters to login"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:40
 
+msgid "Account is not registered"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:43
 
+#, fuzzy
 
+msgid "Invalid Username/Password"
 
+msgstr "Mot de passe invalide"
 
+
 
+#: ../../../../lib/irc.php:46
 
+msgid "Account is frozen"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:49
 
+#, fuzzy
 
+msgid "Could not log in"
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:132
 
+#, fuzzy
 
+msgid "Could not connect."
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:133
 
+#, fuzzy
 
+msgid "Could not set timeout."
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:143 ../../../../lib/irc.php:160
 
+#: ../../../../lib/irc.php:177
 
+msgid "RehashServ is already running."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:145 ../../../../lib/irc.php:162
 
+#: ../../../../lib/irc.php:179
 
+msgid "IRC Server refused the connection."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:166
 
+msgid "Failed to authenticate with NickServ"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:183
 
+#, fuzzy
 
+msgid "vhost not set."
 
+msgstr "n'existe pas"
 
+
 
+#: ../../../../lib/irc.php:203
 
+msgid "There is an error in the config. See console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:205
 
+msgid "Rehashed. View console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+msgid "Managed Oper"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+#, fuzzy
 
+msgid "Personal Oper"
 
+msgstr "Persona"
 
+
 
+#: ../../../../lib/opers.php:59 ../../../../lib/servers.php:111
 
+#: ../../../../lib/users.php:143
 
+msgid "Nick"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:65
 
+#, fuzzy
 
+msgid "Omnimaga Profile"
 
+msgstr "Profil"
 
+
 
+#: ../../../../lib/opers.php:71 ../../../../site/index.php:336
 
+msgid "New Password"
 
+msgstr "Nouveau mot de passe"
 
+
 
+#: ../../../../lib/security.php:63
 
+#, fuzzy
 
+msgid "Invalid credentials"
 
+msgstr "Action invalide"
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
+#: ../../../../site/index.php:403
 
+msgid "User"
 
+msgstr "Utilisateur"
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159
 
+msgid "does not exist"
 
+msgstr "n'existe pas"
 
+
 
+#: ../../../../lib/security.php:73
 
+#, fuzzy
 
+msgid "Invalid persona email"
 
+msgstr "Impossible d'ajouter le courriel"
 
+
 
+#: ../../../../lib/security.php:84 ../../../../site/api/index.php:258
 
+msgid "Invalid password"
 
+msgstr "Mot de passe invalide"
 
+
 
+#: ../../../../lib/security.php:102 ../../../../lib/security.php:171
 
+#, fuzzy
 
+msgid "Failed to create Authy user"
 
+msgstr "Impossible de mettre à jour le réglage"
 
+
 
+#: ../../../../lib/security.php:115
 
+msgid "Token didn't match "
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:122 ../../../../lib/security.php:204
 
+#: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
+#: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
+#: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
 
+#: ../../../../site/api/index.php:245 ../../../../site/api/index.php:253
 
+msgid "You have been logged out"
 
+msgstr "Vous avez été déconnecté"
 
+
 
+#: ../../../../lib/security.php:137 ../../../../lib/security.php:140
 
+#: ../../../../lib/security.php:150
 
+msgid "Failed to disable 2-factor authentication"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:178
 
+#, fuzzy
 
+msgid "No cell number set"
 
+msgstr "Aucun vrai nom défini."
 
+
 
+#: ../../../../lib/security.php:181
 
+#, fuzzy
 
+msgid "No country code set"
 
+msgstr "Aucun jeton défini"
 
+
 
+#: ../../../../lib/security.php:191
 
+#, fuzzy
 
+msgid "Could not register"
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/security.php:194
 
+msgid "No secret key defined"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:197
 
+#, fuzzy
 
+msgid "No token provided"
 
+msgstr "Aucun jeton défini"
 
+
 
+#: ../../../../lib/servers.php:104 ../../../../site/api/index.php:124
 
+msgid "Owner"
 
+msgstr "Propriétaire"
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:137
 
+msgid "Real Name"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:149
 
+msgid "Email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:108 ../../../../site/index.php:182
 
+msgid "Opers"
 
+msgstr "Opérateurs"
 
+
 
+#: ../../../../lib/servers.php:111
 
+msgid "Role"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:119
 
+msgid "Parent"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:123
 
+msgid "Children"
 
+msgstr ""
 
+
 
 #: ../../../../site/api/index.php:22
 
 msgid "Missing username and/or password"
 
 msgstr "Nom d'utilisateur et/ou mot de passe manquant"
@@ -26,13 +211,6 @@ msgstr "Type d'utilisateur manquant"
 
 msgid "No token set"
 
 msgstr "Aucun jeton défini"
 
-#: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
-#: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
-#: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
 
-#: ../../../../site/api/index.php:245 ../../../../site/api/index.php:253
 
-msgid "You have been logged out"
 
-msgstr "Vous avez été déconnecté"
 
-
 
 #: ../../../../site/api/index.php:73
 
 msgid "Cannot fetch memos"
 
 msgstr "Impossible de récupérer les mémos"
@@ -69,10 +247,6 @@ msgstr "Opérateur automatique"
 
 msgid "Admin"
 
 msgstr "Administrateur"
 
-#: ../../../../site/api/index.php:124
 
-msgid "Owner"
 
-msgstr "Propriétaire"
 
-
 
 #: ../../../../site/api/index.php:125
 
 msgid "Set"
 
 msgstr "Définir"
@@ -117,15 +291,6 @@ msgstr "Impossible de récupérer les canaux"
 
 msgid "No message or user entered"
 
 msgstr "Aucun message ou utilisateur entré"
 
-#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
-#: ../../../../site/index.php:403
 
-msgid "User"
 
-msgstr "Utilisateur"
 
-
 
-#: ../../../../site/api/index.php:159
 
-msgid "does not exist"
 
-msgstr "n'existe pas"
 
-
 
 #: ../../../../site/api/index.php:161
 
 msgid "Memo Sent"
 
 msgstr "Mémo envoyé"
@@ -169,10 +334,6 @@ msgstr ""
 
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
 
 "le cas."
 
-#: ../../../../site/api/index.php:258
 
-msgid "Invalid password"
 
-msgstr "Mot de passe invalide"
 
-
 
 #: ../../../../site/api/index.php:263
 
 msgid "Could not update password with nickserv"
 
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
@@ -315,10 +476,6 @@ msgstr "Canaux"
 
 msgid "Servers"
 
 msgstr "Serveurs"
 
-#: ../../../../site/index.php:182
 
-msgid "Opers"
 
-msgstr "Opérateurs"
 
-
 
 #: ../../../../site/index.php:183
 
 msgid "Configuration"
 
 msgstr "Configuration"
@@ -383,10 +540,6 @@ msgstr "Se déconnecter"
 
 msgid "Password"
 
 msgstr "Mot de passe"
 
-#: ../../../../site/index.php:336
 
-msgid "New Password"
 
-msgstr "Nouveau mot de passe"
 
-
 
 #: ../../../../site/index.php:360
 
 msgid "Switch"
 
 msgstr "Changer"
@@ -441,39 +594,39 @@ msgstr ""
 
 msgid "Could not remove persona address"
 
 msgstr "Ne peut enlever le courriel"
 
-#: ../../../../site/js/index.js:327
 
+#: ../../../../site/js/index.js:338
 
 #, fuzzy
 
 msgid "Server Ping"
 
 msgstr "Serveurs"
 
-#: ../../../../site/js/index.js:342 ../../../../site/js/index.js:425
 
+#: ../../../../site/js/index.js:353 ../../../../site/js/index.js:436
 
 #, fuzzy
 
 msgid "Could not ping server"
 
 msgstr "Ne peut vérifier avec NickServ"
 
-#: ../../../../site/js/index.js:350
 
+#: ../../../../site/js/index.js:361
 
 msgid "Fetching Memos"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:379 ../../../../site/js/index.js:462
 
-#: ../../../../site/js/index.js:496
 
+#: ../../../../site/js/index.js:390 ../../../../site/js/index.js:474
 
+#: ../../../../site/js/index.js:509
 
 msgid "Could not contact server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:406
 
+#: ../../../../site/js/index.js:417
 
 #, fuzzy
 
 msgid "Deleting memo"
 
 msgstr "Supprimer"
 
-#: ../../../../site/js/index.js:432
 
+#: ../../../../site/js/index.js:443
 
 msgid "Fetching News"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:454
 
+#: ../../../../site/js/index.js:465
 
 msgid "New news item"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:472
 
+#: ../../../../site/js/index.js:484
 
 #, fuzzy
 
 msgid "Fetching Channels"
 
 msgstr "Nouveau canal"
--- a/lang/fr_FR/C/LC_MESSAGES/omninet.mo
+++ b/lang/fr_FR/C/LC_MESSAGES/omninet.mo
--- a/lang/fr_FR/C/LC_MESSAGES/omninet.po
+++ b/lang/fr_FR/C/LC_MESSAGES/omninet.po
@@ -1,8 +1,8 @@
 
 msgid ""
 
 msgstr ""
 
 "Project-Id-Version: Omninet Control panel\n"
 
-"POT-Creation-Date: 2014-02-20 22:00-0700\n"
 
-"PO-Revision-Date: 2014-02-20 22:00-0700\n"
 
+"POT-Creation-Date: 2014-02-20 22:22-0700\n"
 
+"PO-Revision-Date: 2014-02-20 22:22-0700\n"
 
 "Last-Translator: Nathaniel van Diepen <[email protected]>\n"
 
 "Language-Team: Omnimaga <[email protected]>\n"
 
 "Language: fr\n"
@@ -14,6 +14,191 @@ msgstr ""
 
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 "X-Poedit-SearchPath-0: ../../../..\n"
 
+#: ../../../../lib/configuration.php:133 ../../../../lib/users.php:163
 
+msgid "Save"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:37
 
+msgid "Insufficient Parameters to login"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:40
 
+msgid "Account is not registered"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:43
 
+#, fuzzy
 
+msgid "Invalid Username/Password"
 
+msgstr "Mot de passe invalide"
 
+
 
+#: ../../../../lib/irc.php:46
 
+msgid "Account is frozen"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:49
 
+#, fuzzy
 
+msgid "Could not log in"
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:132
 
+#, fuzzy
 
+msgid "Could not connect."
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:133
 
+#, fuzzy
 
+msgid "Could not set timeout."
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/irc.php:143 ../../../../lib/irc.php:160
 
+#: ../../../../lib/irc.php:177
 
+msgid "RehashServ is already running."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:145 ../../../../lib/irc.php:162
 
+#: ../../../../lib/irc.php:179
 
+msgid "IRC Server refused the connection."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:166
 
+msgid "Failed to authenticate with NickServ"
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:183
 
+#, fuzzy
 
+msgid "vhost not set."
 
+msgstr "n'existe pas"
 
+
 
+#: ../../../../lib/irc.php:203
 
+msgid "There is an error in the config. See console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/irc.php:205
 
+msgid "Rehashed. View console for output."
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+msgid "Managed Oper"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:56
 
+#, fuzzy
 
+msgid "Personal Oper"
 
+msgstr "Persona"
 
+
 
+#: ../../../../lib/opers.php:59 ../../../../lib/servers.php:111
 
+#: ../../../../lib/users.php:143
 
+msgid "Nick"
 
+msgstr ""
 
+
 
+#: ../../../../lib/opers.php:65
 
+#, fuzzy
 
+msgid "Omnimaga Profile"
 
+msgstr "Profil"
 
+
 
+#: ../../../../lib/opers.php:71 ../../../../site/index.php:336
 
+msgid "New Password"
 
+msgstr "Nouveau mot de passe"
 
+
 
+#: ../../../../lib/security.php:63
 
+#, fuzzy
 
+msgid "Invalid credentials"
 
+msgstr "Action invalide"
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
+#: ../../../../site/index.php:403
 
+msgid "User"
 
+msgstr "Utilisateur"
 
+
 
+#: ../../../../lib/security.php:67 ../../../../lib/security.php:81
 
+#: ../../../../site/api/index.php:159
 
+msgid "does not exist"
 
+msgstr "n'existe pas"
 
+
 
+#: ../../../../lib/security.php:73
 
+#, fuzzy
 
+msgid "Invalid persona email"
 
+msgstr "Impossible d'ajouter le courriel"
 
+
 
+#: ../../../../lib/security.php:84 ../../../../site/api/index.php:258
 
+msgid "Invalid password"
 
+msgstr "Mot de passe invalide"
 
+
 
+#: ../../../../lib/security.php:102 ../../../../lib/security.php:171
 
+#, fuzzy
 
+msgid "Failed to create Authy user"
 
+msgstr "Impossible de mettre à jour le réglage"
 
+
 
+#: ../../../../lib/security.php:115
 
+msgid "Token didn't match "
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:122 ../../../../lib/security.php:204
 
+#: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
+#: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
+#: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
 
+#: ../../../../site/api/index.php:245 ../../../../site/api/index.php:253
 
+msgid "You have been logged out"
 
+msgstr "Vous avez été déconnecté"
 
+
 
+#: ../../../../lib/security.php:137 ../../../../lib/security.php:140
 
+#: ../../../../lib/security.php:150
 
+msgid "Failed to disable 2-factor authentication"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:178
 
+#, fuzzy
 
+msgid "No cell number set"
 
+msgstr "Aucun vrai nom défini."
 
+
 
+#: ../../../../lib/security.php:181
 
+#, fuzzy
 
+msgid "No country code set"
 
+msgstr "Aucun jeton défini"
 
+
 
+#: ../../../../lib/security.php:191
 
+#, fuzzy
 
+msgid "Could not register"
 
+msgstr "Ne peut vérifier avec NickServ"
 
+
 
+#: ../../../../lib/security.php:194
 
+msgid "No secret key defined"
 
+msgstr ""
 
+
 
+#: ../../../../lib/security.php:197
 
+#, fuzzy
 
+msgid "No token provided"
 
+msgstr "Aucun jeton défini"
 
+
 
+#: ../../../../lib/servers.php:104 ../../../../site/api/index.php:124
 
+msgid "Owner"
 
+msgstr "Propriétaire"
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:137
 
+msgid "Real Name"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:105 ../../../../lib/users.php:149
 
+msgid "Email"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:108 ../../../../site/index.php:182
 
+msgid "Opers"
 
+msgstr "Opérateurs"
 
+
 
+#: ../../../../lib/servers.php:111
 
+msgid "Role"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:119
 
+msgid "Parent"
 
+msgstr ""
 
+
 
+#: ../../../../lib/servers.php:123
 
+msgid "Children"
 
+msgstr ""
 
+
 
 #: ../../../../site/api/index.php:22
 
 msgid "Missing username and/or password"
 
 msgstr "Nom d'utilisateur et/ou mot de passe manquant"
@@ -26,13 +211,6 @@ msgstr "Type d'utilisateur manquant"
 
 msgid "No token set"
 
 msgstr "Aucun jeton défini"
 
-#: ../../../../site/api/index.php:44 ../../../../site/api/index.php:77
 
-#: ../../../../site/api/index.php:105 ../../../../site/api/index.php:154
 
-#: ../../../../site/api/index.php:168 ../../../../site/api/index.php:230
 
-#: ../../../../site/api/index.php:245 ../../../../site/api/index.php:253
 
-msgid "You have been logged out"
 
-msgstr "Vous avez été déconnecté"
 
-
 
 #: ../../../../site/api/index.php:73
 
 msgid "Cannot fetch memos"
 
 msgstr "Impossible de récupérer les mémos"
@@ -69,10 +247,6 @@ msgstr "Opérateur automatique"
 
 msgid "Admin"
 
 msgstr "Administrateur"
 
-#: ../../../../site/api/index.php:124
 
-msgid "Owner"
 
-msgstr "Propriétaire"
 
-
 
 #: ../../../../site/api/index.php:125
 
 msgid "Set"
 
 msgstr "Définir"
@@ -117,15 +291,6 @@ msgstr "Impossible de récupérer les canaux"
 
 msgid "No message or user entered"
 
 msgstr "Aucun message ou utilisateur entré"
 
-#: ../../../../site/api/index.php:159 ../../../../site/index.php:349
 
-#: ../../../../site/index.php:403
 
-msgid "User"
 
-msgstr "Utilisateur"
 
-
 
-#: ../../../../site/api/index.php:159
 
-msgid "does not exist"
 
-msgstr "n'existe pas"
 
-
 
 #: ../../../../site/api/index.php:161
 
 msgid "Memo Sent"
 
 msgstr "Mémo envoyé"
@@ -169,10 +334,6 @@ msgstr ""
 
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
 
 "le cas."
 
-#: ../../../../site/api/index.php:258
 
-msgid "Invalid password"
 
-msgstr "Mot de passe invalide"
 
-
 
 #: ../../../../site/api/index.php:263
 
 msgid "Could not update password with nickserv"
 
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
@@ -315,10 +476,6 @@ msgstr "Canaux"
 
 msgid "Servers"
 
 msgstr "Serveurs"
 
-#: ../../../../site/index.php:182
 
-msgid "Opers"
 
-msgstr "Opérateurs"
 
-
 
 #: ../../../../site/index.php:183
 
 msgid "Configuration"
 
 msgstr "Configuration"
@@ -383,10 +540,6 @@ msgstr "Se déconnecter"
 
 msgid "Password"
 
 msgstr "Mot de passe"
 
-#: ../../../../site/index.php:336
 
-msgid "New Password"
 
-msgstr "Nouveau mot de passe"
 
-
 
 #: ../../../../site/index.php:360
 
 msgid "Switch"
 
 msgstr "Changer"
@@ -441,39 +594,39 @@ msgstr ""
 
 msgid "Could not remove persona address"
 
 msgstr "Ne peut enlever le courriel"
 
-#: ../../../../site/js/index.js:327
 
+#: ../../../../site/js/index.js:338
 
 #, fuzzy
 
 msgid "Server Ping"
 
 msgstr "Serveurs"
 
-#: ../../../../site/js/index.js:342 ../../../../site/js/index.js:425
 
+#: ../../../../site/js/index.js:353 ../../../../site/js/index.js:436
 
 #, fuzzy
 
 msgid "Could not ping server"
 
 msgstr "Ne peut vérifier avec NickServ"
 
-#: ../../../../site/js/index.js:350
 
+#: ../../../../site/js/index.js:361
 
 msgid "Fetching Memos"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:379 ../../../../site/js/index.js:462
 
-#: ../../../../site/js/index.js:496
 
+#: ../../../../site/js/index.js:390 ../../../../site/js/index.js:474
 
+#: ../../../../site/js/index.js:509
 
 msgid "Could not contact server"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:406
 
+#: ../../../../site/js/index.js:417
 
 #, fuzzy
 
 msgid "Deleting memo"
 
 msgstr "Supprimer"
 
-#: ../../../../site/js/index.js:432
 
+#: ../../../../site/js/index.js:443
 
 msgid "Fetching News"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:454
 
+#: ../../../../site/js/index.js:465
 
 msgid "New news item"
 
 msgstr ""
 
-#: ../../../../site/js/index.js:472
 
+#: ../../../../site/js/index.js:484
 
 #, fuzzy
 
 msgid "Fetching Channels"
 
 msgstr "Nouveau canal"
--- a/lib/configuration.php
+++ b/lib/configuration.php
@@ -130,6 +130,6 @@
 
 			}
 
 			array_push($items,$item);
 
 		}
 
-		return get_form_html('configuration',$items,'Save');
 
+		return get_form_html('configuration',$items,_('Save'));
 
 	}
 
 ?>
--- a/lib/irc.php
+++ b/lib/irc.php
@@ -34,19 +34,19 @@
 
 		}else{
 
 			switch($response->faultCode()){
 
 				case 1:
 
-					$m = 'Insufficient Parameters to login';
 
+					$m = _('Insufficient Parameters to login');
 
 				break;
 
 				case 3:
 
-					$m = "Account is not registered";
 
+					$m = _("Account is not registered");
 
 				break;
 
 				case 5:
 
-					$m = "Invalid Username/Password";
 
+					$m = _("Invalid Username/Password");
 
 				break;
 
 				case 6:
 
-					$m = "Account is frozen";
 
+					$m = _("Account is frozen");
 
 				break;
 
 				default:
 
-					$m = "Could not log in";
 
+					$m = _("Could not log in");
 
 			}
 
 			return Array(false,$m);
 
 		}
@@ -129,8 +129,8 @@
 
 			$u = $user;
 
 		}
 
 		$msg = '';
 
-		if(!$irc = fsockopen(get_conf('irc-server'),get_conf('irc-port'))){return ircclose(1,"Could not connect.");}
 
-		stream_set_timeout($irc,1) or ircclose(2,"Could not set timeout.");
 
+		if(!$irc = fsockopen(get_conf('irc-server'),get_conf('irc-port'))){return ircclose(1,_("Could not connect."));}
 
+		stream_set_timeout($irc,1) or ircclose(2,_("Could not set timeout."));
 
 		while(!feof($irc)&&!$msg = fgets($irc,128)){}
 
 		if(!ircputs("NICK RehashServ\r\n")){return $ircret;}
 
 		if(!ircputs("USER RehashServ omni.irc.omnimaga.org RehashServ :RehashServ\r\n")){return $ircret;}
@@ -140,9 +140,9 @@
 
 				$msg .= $line;
 
 				$data = explode(' ',$line);
 
 				if(isval($data,1,'433')){
 
-					return ircclose(4,"RehashServ is already running.");
 
+					return ircclose(4,_("RehashServ is already running."));
 
 				}elseif(strrpos($line,'ERROR :Closing Link:') !== false){
 
-					return ircclose(3,"IRC Server refused the connection.");
 
+					return ircclose(3,_("IRC Server refused the connection."));
 
 				}elseif($data[0] == 'PING'){
 
 					if(!ircputs("PONG {$data[1]}")){return $ircret;}
 
 				}elseif(isval($data,1,'001')){
@@ -157,13 +157,13 @@
 
 				$msg .= $line;
 
 				$data = explode(' ',$line);
 
 				if(isval($data,1,'433')){
 
-					return ircclose(4,"RehashServ is already running.");
 
+					return ircclose(4,_("RehashServ is already running."));
 
 				}elseif(strrpos($line,'ERROR :Closing Link:') !== false){
 
-					return ircclose(3,"IRC Server refused the connection.");
 
+					return ircclose(3,_("IRC Server refused the connection."));
 
 				}elseif(strrpos($line,":You are now identified for") !== false){
 
 					break;
 
 				}elseif(strrpos($line,'Password incorrect.') !== false){
 
-					return ircclose(5,"Failed to authenticate with NickServ");
 
+					return ircclose(5,_("Failed to authenticate with NickServ"));
 
 				}
 
 			}
 
 		}
@@ -174,13 +174,13 @@
 
 				$msg .= $line;
 
 				$data = explode(' ',$line);
 
 				if(isval($data,1,'433')){
 
-					return ircclose(4,"RehashServ is already running.");
 
+					return ircclose(4,_("RehashServ is already running."));
 
 				}elseif(strrpos($line,'ERROR :Closing Link:') !== false){
 
-					return ircclose(3,"IRC Server refused the connection.");
 
+					return ircclose(3,_("IRC Server refused the connection."));
 
 				}elseif(strrpos($line,':Your vhost of') !== false && strrpos($line,'is now activated') !== false){
 
 					break;
 
 				}elseif(strrpos($line,"Please contact an Operator to get a vhost assigned to this nick") !== false){
 
-					return ircclose(6,"vhost not set.");
 
+					return ircclose(6,_("vhost not set."));
 
 				}
 
 			}
 
 		}
@@ -200,8 +200,8 @@
 
 		}
 
 		fclose($irc);
 
 		if(strrpos($msg,':*** Notice -- Configuration loaded without any problems ..') === false){
 
-			return '{"code":6,"message":"There is an error in the config. See console for output.","log":'.json_encode($msg).'}';
 
+			return '{"code":6,"message":"'._('There is an error in the config. See console for output.').'","log":'.json_encode($msg).'}';
 
 		}
 
-		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).'}';
 
 	}
 
 ?>
--- a/lib/opers.php
+++ b/lib/opers.php
@@ -53,22 +53,22 @@
 
 		}
 
 		$ret = "";
 
 		foreach($opers as $k => $oper){
 
-			$ret .= "<h3>".($u['id'] != $oper['user_id']?"Managed Oper:":"Personal Oper:")."</h3>".get_form_html('oper-form-'.$oper['id'],Array(
 
+			$ret .= "<h3>".($u['id'] != $oper['user_id']?_("Managed Oper").":":_("Personal Oper").":")."</h3>".get_form_html('oper-form-'.$oper['id'],Array(
 
 				Array(
 
 					'name'=>'nick',
 
-					'label'=>'Nick',
 
+					'label'=>_('Nick'),
 
 					'type'=>'text',
 
 					'value'=>$oper['nick']
 
 				),
 
 				Array(
 
 					'name'=>'swhois',
 
-					'label'=>'Omnimaga Profile',
 
+					'label'=>_('Omnimaga Profile'),
 
 					'type'=>'text',
 
 					'value'=>$oper['swhois']
 
 				),
 
 				Array(
 
 					'name'=>'password',
 
-					'label'=>'New Password',
 
+					'label'=>_('New Password'),
 
 					'type'=>'password',
 
 					'value'=>''
 
 				),
--- a/lib/security.php
+++ b/lib/security.php
@@ -60,17 +60,17 @@
 
 				setcookie('type','user',null,'/');
 
 				return true;
 
 			}else{
 
-				return "Invalid credentials";
 
+				return _("Invalid credentials");
 
 			}
 
 		}elseif($type=='persona'){
 
 			if(!$user = get_user_obj($nick,$effective_role)){
 
-				return "User {$nick} does not exist";
 
+				return _("User")." {$nick} "._("does not exist");
 
 			}
 
 			if(!isset($_COOKIE['personaUser'])){
 
 				return false;
 
 			}
 
 			if(!in_array($_COOKIE['personaUser'],get_emails($user['id']))){
 
-				return "Invalid persona email";
 
+				return _("Invalid persona email");
 
 			}
 
 			setcookie('user',$nick,null,'/');
 
 			setcookie('key',$user['api_key'],null,'/');
@@ -78,10 +78,10 @@
 
 			return true;
 
 		}else{
 
 			if(!$user = get_user_obj($nick,$type)){
 
-				return "User {$nick} does not exist";
 
+				return _("User")." {$nick} "._("does not exist");
 
 			}
 
 			if($user['password'] != mkpasswd($pass,$user['salt'])){
 
-				return "Invalid password";
 
+				return _("Invalid password");
 
 			}
 
 			setcookie('user',$nick,null,'/');
 
 			setcookie('key',$user['api_key'],null,'/');
@@ -99,7 +99,7 @@
 
 						setcookie('token',$u['secret_key'],null,'/');
 
 						$r = true;
 
 					}else{
 
-						$r = 'Failed to create Authy user: ';
 
+						$r = _('Failed to create Authy user').': ';
 
 						foreach($verification->errors() as $field => $message){
 
 							$message = json_decode($message);
 
 							$r .= $message['message'];
@@ -112,14 +112,14 @@
 
 						$_SESSION['secret_key'] = $u['secret_key'];
 
 						$r = true;
 
 					}else{
 
-						$r = "Token didn't match ".$u['secret_key'];
 
+						$r = _("Token didn't match ").$u['secret_key'];
 
 					}
 
 				break;
 
 				default:
 
 					$r = true;
 
 			}
 
 		}else{
 
-			$r = "You have been logged out";
 
+			$r = _("You have been logged out");
 
 		}
 
 		return $r;
 
 	}
@@ -134,10 +134,10 @@
 
 					if($deletion->ok()){
 
 						setcookie('secret_key','',time() - 3600,'/');
 
 						if(!query("UPDATE users u SET u.secret_key=NULL WHERE u.id=%d",Array($u['id']))){
 
-							$r = 'Failed to disable 2-factor authentication';
 
+							$r = _('Failed to disable 2-factor authentication');
 
 						}
 
 					}else{
 
-						$r = 'Failed to disable 2-factor authentication: ';
 
+						$r = _('Failed to disable 2-factor authentication').': ';
 
 						foreach($deletion->errors() as $field => $message){
 
 							$message = json_decode($message);
 
 							$r .= $message->message;
@@ -147,7 +147,7 @@
 
 				case 'google-authenticator':
 
 					setcookie('secret_key','',time() - 3600,'/');
 
 					if(!query("UPDATE users u SET u.secret_key=NULL WHERE u.id=%d",Array($u['id']))){
 
-						$r = 'Failed to disable 2-factor authentication';
 
+						$r = _('Failed to disable 2-factor authentication');
 
 					}
 
 				break;
 
 				default:
@@ -168,17 +168,17 @@
 
 								query("UPDATE users u SET u.secret_key='%s' WHERE u.id=%d",Array($user->id(),$u['id']));
 
 								$r = true;
 
 							}else{
 
-								$r = 'Failed to create Authy user: ';
 
+								$r = _('Failed to create Authy user').': ';
 
 								foreach($user->errors() as $field => $message){
 
 									$message = json_decode($message);
 
 									$r .= $message['message'];
 
 								}
 
 							}
 
 						}else{
 
-							$r = "No cell number set";
 
+							$r = _("No cell number set");
 
 						}
 
 					}else{
 
-						$r = "No country code set";
 
+						$r = _("No country code set");
 
 					}
 
 				break;
 
 				case 'google-authenticator':
@@ -188,20 +188,20 @@
 
 								query("UPDATE users u SET u.secret_key='%s' WHERE u.id=%d",Array($_SESSION['secret_key'],$u['id']));
 
 								$r = true;
 
 							}else{
 
-								$r = 'Could not register';
 
+								$r = _('Could not register');
 
 							}
 
 						}else{
 
-							$r = 'No secret key defined';
 
+							$r = _('No secret key defined');
 
 						}
 
 					}else{
 
-						$r = 'No token provided';
 
+						$r = _('No token provided');
 
 					}
 
 				break;
 
 				default:
 
 					$r = true;
 
 			}
 
 		}else{
 
-			$r = "You have been logged out";
 
+			$r = _("You have been logged out");
 
 		}
 
 		return $r;
 
 	}
--- a/lib/servers.php
+++ b/lib/servers.php
@@ -101,14 +101,14 @@
 
 		foreach($servers as $k => $server){
 
 			$r .= "<h3>{$server['name']} ({$server['host']}) - {$server['description']}</h3><div>";
 
 			$suser = get_user_from_id_obj($server['user_id']);
 
-			$r .= "<h4>Owner:</h4>{$suser['nick']}<ul>";
 
-			$r .= "<li>Real Name: {$suser['real_name']}</li><li>Email: {$suser['email']}</li></ul>";
 
+			$r .= "<h4>"._('Owner').":</h4>{$suser['nick']}<ul>";
 
+			$r .= "<li>"._('Real Name').": {$suser['real_name']}</li><li>"._('Email').": {$suser['email']}</li></ul>";
 
 			$id = 0;
 
 			if(count($server['opers']) > 0){
 
-				$r .= "<h4>Opers:</h4><table class='tree'>";
 
+				$r .= "<h4>"._('Opers').":</h4><table class='tree'>";
 
 				$id++;
 
 				$pid = $id;
 
-				$r .= "<tr style='font-weight:bold;' class='treegrid-".($id)."'><td>Nick</td><td>Role</td></tr>";
 
+				$r .= "<tr style='font-weight:bold;' class='treegrid-".($id)."'><td>"._('Nick')."</td><td>"._('Role')."</td></tr>";
 
 				foreach($server['opers'] as $kk => $oper){
 
 					$id++;
 
 					$r .= "<tr class='treegrid-{$id} treegrid-parent-{$pid}'><td>{$oper['nick']}</td><td>{$oper['role']}</td></tr>";
@@ -116,11 +116,11 @@
 
 				$r .= "</table>";
 
 			}
 
 			if(isset($server['parent'])){
 
-				$r .= "<h4>Parent</h4>";
 
+				$r .= "<h4>"._('Parent')."</h4>";
 
 				$r .= get_servers_list_html(Array($server['parent']),$depth+1);
 
 			}
 
 			if(count($server['children']) > 0){
 
-				$r .= "<h4>Children</h4>";
 
+				$r .= "<h4>"._('Children')."</h4>";
 
 				$r .= get_servers_list_html($server['children'],$depth+1);
 
 			}
 
 			$r .="</div>";
--- a/lib/users.php
+++ b/lib/users.php
@@ -134,19 +134,19 @@
 
 		return get_form_html('user-form-'.$user['id'],Array(
 
 			Array(
 
 				'name'=>'real_name',
 
-				'label'=>'Real Name',
 
+				'label'=>_('Real Name'),
 
 				'type'=>'text',
 
 				'value'=>$user['real_name']
 
 			),
 
 			Array(
 
 				'name'=>'nick',
 
-				'label'=>'Nick',
 
+				'label'=>_('Nick'),
 
 				'type'=>'text',
 
 				'value'=>$user['nick']
 
 			),
 
 			Array(
 
 				'name'=>'email',
 
-				'label'=>'Email',
 
+				'label'=>_('Email'),
 
 				'type'=>'text',
 
 				'value'=>$user['email']
 
 			),
@@ -160,7 +160,7 @@
 
 				'type'=>'hidden',
 
 				'value'=>'user'
 
 			)
 
-		),'Save');
 
+		),_('Save'));
 
 	}
 
 	function has_flag($user,$flag){
 
 		return strpos($user['flags'],$flag)!==false;
--- a/site/js/index.js
+++ b/site/js/index.js
@@ -264,6 +264,17 @@ $(function(){
 
 				History.pushState({},document.title,url.attr('path')+'?'+$.param(params)+url.attr('anchor'));
 
 			}
 
 		}).trigger('statechange').resize(function(){
 
+			$('body').find('*').contents().filter(function(){
 
+				return this.nodeType === 3;
 
+			}).each(function(){
 
+				console.log(_($(this).text()));
 
+				this.nodeValue = _($(this).text());
 
+			});
 
+			$('body').find('input[type=submit],input[type=button]').each(function(){
 
+				if(this.tagName == 'INPUT' && this.type == 'submit'){
 
+					this.value = _(this.value);
 
+				}
 
+			});
 
 			dialogs.each(function(){
 
 				var d = $(this);
 
 				if(d.dialog('isOpen')){
@@ -456,6 +467,7 @@ $(function(){
 
 						news = d.news;
 
 					}
 
 					$('#news').html(templates.news(d)).find('button').button();
 
+					$('body').resize();
 
 				},
 
 				error: function(xhr,msg,e){
 
 					console.error(e);
@@ -490,6 +502,7 @@ $(function(){
 
 						}
 
 					}
 
 					$('#channels').html(templates.channels(d)).find('button').button();
 
+					$('body').resize();
 
 				},
 
 				error: function(xhr,msg,e){
 
 					console.error(e);
@@ -502,12 +515,6 @@ $(function(){
 
 				setTimeout(window.ServerPing,1000*60); // Every minute
 
 			}
 
 		};
 
-		$('body').find('*').contents().filter(function(){
 
-			return this.nodeType === 3;
 
-		}).each(function(){
 
-			console.log(_($(this).text()));
 
-			this.nodeValue = _($(this).text());
 
-		});
 
 		$('body').resize();
 
 	});
 
 });