diff --git a/src/ClientCommand.cpp b/src/ClientCommand.cpp
index 9f102e99..70d05264 100644
--- a/src/ClientCommand.cpp
+++ b/src/ClientCommand.cpp
@@ -48,26 +48,26 @@ void CClient::UserCommand(CString& sLine) {
     } else if (sCommand.Equals("LISTNICKS")) {
         if (!m_pNetwork) {
             PutStatus(
-                "You must be connected with a network to use this command");
+                t("You must be connected with a network to use this command"));
             return;
         }
 
         CString sChan = sLine.Token(1);
 
         if (sChan.empty()) {
-            PutStatus("Usage: ListNicks <#chan>");
+            PutStatus(t("Usage: ListNicks <#chan>"));
             return;
         }
 
         CChan* pChan = m_pNetwork->FindChan(sChan);
 
         if (!pChan) {
-            PutStatus("You are not on [" + sChan + "]");
+            PutStatus(f("You are not on [{1}]")(sChan));
             return;
         }
 
         if (!pChan->IsOn()) {
-            PutStatus("You are not on [" + sChan + "] [trying]");
+            PutStatus(f("You are not on [{1}] (trying)")(sChan));
             return;
         }
 
@@ -76,7 +76,7 @@ void CClient::UserCommand(CString& sLine) {
         const CString& sPerms = (pIRCSock) ? pIRCSock->GetPerms() : "";
 
         if (msNicks.empty()) {
-            PutStatus("No nicks on [" + sChan + "]");
+            PutStatus(f("No nicks on [{1}]")(sChan));
             return;
         }
 
diff --git a/src/po/znc.pot b/src/po/znc.pot
new file mode 100644
index 00000000..3776b7a5
--- /dev/null
+++ b/src/po/znc.pot
@@ -0,0 +1,23 @@
+#: ClientCommand.cpp:51
+msgid "You must be connected with a network to use this command"
+msgstr ""
+
+#: ClientCommand.cpp:58
+msgid "Usage: ListNicks <#chan>"
+msgstr ""
+
+#: ClientCommand.cpp:65
+msgid "You are not on [{1}]"
+msgstr ""
+
+#: ClientCommand.cpp:70
+msgid "You are not on [{1}] (trying)"
+msgstr ""
+
+#: ClientCommand.cpp:79
+msgid "No nicks on [{1}]"
+msgstr ""
+
+#: webskins/_default_/tmpl/LoginBar.tmpl:3
+msgid "Logout"
+msgstr ""
diff --git a/webskins/_default_/tmpl/LoginBar.tmpl b/webskins/_default_/tmpl/LoginBar.tmpl
index 6d15f2d5..d837a3b1 100644
--- a/webskins/_default_/tmpl/LoginBar.tmpl
+++ b/webskins/_default_/tmpl/LoginBar.tmpl
@@ -1,5 +1,6 @@
+<? I18N znc ?>
 				<? IF LoggedIn ?>
-				<span class="logoutbox"><a href="<? VAR URIPrefix TOP ?>/logout">Logout</a></span>
+				<span class="logoutbox"><a href="<? VAR URIPrefix TOP ?>/logout"><? FORMAT "Logout" ?></a></span>
 				<? ELSE IF !ModName && PageName == "login" ?>
 				<span class="logoutbox">&nbsp;</span>
 				<? ELSE ?>