Merge remote branch 'origin/development' into text_themes

[KiwiIRC.git] / client / src / translations / no.po

diff --git a/client/src/translations/no.po b/client/src/translations/no.po
index b825038c2b0bd891aa6bf028d39fbb21bd329972..b6b51392e2d96712bd01f4b3d6b22332c78bd9bc 100644 (file)
--- a/client/src/translations/no.po
+++ b/client/src/translations/no.po
@@ -506,5 +506,21 @@ msgstr "Slett nettverk"
 
 #: 
 msgid "client_applets_settings_notification_count_all_activity"
-msgstr "Include join/part messages as activity"
+msgstr "Inluder personer som kommer inn og ut av kanalen som aktivitet"
+
+#: 
+msgid "client_views_userbox_ignore"
+msgstr "Ignorer"
+
+#: 
+msgid "client_applets_settings_timestamp_24_hour"
+msgstr "Use 24-hour timestamps"
+
+#: 
+msgid "client_views_panel_timestamp_am"
+msgstr "%s AM"
+
+#: 
+msgid "client_views_panel_timestamp_pm"
+msgstr "%s PM"