diff --git a/locale/README b/locale/README
index 575ca92f8..9b9cda1b4 100644
--- a/locale/README
+++ b/locale/README
@@ -39,6 +39,10 @@ where <language code> is the two-letter locale code for the language
 you want, like "sv" for Swedish, "es" for Spanish and so on. A new
 folder with the language code will have appeared. 
 
+Note that the command django-admin may not be available in your path. 
+If so, the easiest way is to search for it (it sits in the django 
+source tree) and run it as "python <absolute-path>/django-admin.py".
+
 
 Doing a translation / improving an existing one
 -----------------------------------------------
diff --git a/locale/sv/LC_MESSAGES/django.mo b/locale/sv/LC_MESSAGES/django.mo
index 444dc2b38..eb7788f33 100644
Binary files a/locale/sv/LC_MESSAGES/django.mo and b/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po
index ab1016686..0ee6ffaf6 100644
--- a/locale/sv/LC_MESSAGES/django.po
+++ b/locale/sv/LC_MESSAGES/django.po
@@ -1,15 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Evennia Swedish translation
+# Copyright (C) 2010- Griatch
+# This file is distributed under the same license as the Evennia package.
 # Griatch <griatchATgmailDOTcom>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Evennia Beta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-14 08:52+0200\n"
-"PO-Revision-Date: 2012-06-14 08:55+0100\n"
+"POT-Creation-Date: 2014-04-13 09:18+0200\n"
+"PO-Revision-Date: 2014-04-13 09:22+0100\n"
 "Last-Translator: Griatch <griatch@gmail.com>\n"
 "Language-Team: Swedish <>\n"
 "Language: \n"
@@ -18,226 +17,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/commands/cmdhandler.py:201
+#: src/commands/cmdhandler.py:320
+msgid "There were multiple matches."
+msgstr "Det fanns många träffar."
+
+#: src/commands/cmdhandler.py:348
 #, python-format
 msgid "Command '%s' is not available."
 msgstr "Kommandot '%s' är inte tillgängligt."
 
-#: src/commands/cmdhandler.py:204
+#: src/commands/cmdhandler.py:353
 #, python-format
 msgid " Maybe you meant %s?"
 msgstr "Menade du kanske %s?"
 
-#: src/commands/cmdhandler.py:204
+#: src/commands/cmdhandler.py:353
 msgid "or"
 msgstr "eller"
 
-#: src/commands/cmdhandler.py:206
+#: src/commands/cmdhandler.py:355
 msgid " Type \"help\" for help."
 msgstr "Skriv \"help\" för hjälp."
 
-#: src/commands/cmdhandler.py:212
-msgid "There were multiple matches."
-msgstr "Det fanns många träffar."
-
-#: src/commands/cmdparser.py:144
+#: src/commands/cmdparser.py:153
 #, python-format
 msgid "Could not find '%s'."
 msgstr "Kunde inte hitta '%s'."
 
-#: src/commands/cmdparser.py:160
+#: src/commands/cmdparser.py:174
 msgid "location"
 msgstr "plats"
 
-#: src/commands/cmdparser.py:161
+#: src/commands/cmdparser.py:175
 msgid " (carried)"
 msgstr "(buren)"
 
-#: src/commands/cmdparser.py:240
+#: src/commands/cmdparser.py:255
 msgid " (channel)"
 msgstr "(kanal)"
 
-#: src/commands/cmdparser.py:244
-#, python-format
-msgid " (exit to %s)"
-msgstr "(utgång till %s)"
-
-#: src/commands/cmdsethandler.py:115
+#: src/commands/cmdsethandler.py:123
 #, python-format
 msgid "Error loading cmdset: Couldn't import module '%s'."
 msgstr "Fel medan cmdset laddades: Kunde inte importera modulen '%s'."
 
-#: src/commands/cmdsethandler.py:119
+#: src/commands/cmdsethandler.py:127
 #, python-format
 msgid "Error in loading cmdset: No cmdset class '%(classname)s' in %(modulepath)s."
 msgstr "Fel medan cmdset laddades: Ingen cmdset-klass med namn '%(classname)s' i %(modulepath)s."
 
-#: src/commands/cmdsethandler.py:123
+#: src/commands/cmdsethandler.py:132
 #, python-format
 msgid "Compile/Run error when loading cmdset '%s'. Error was logged."
 msgstr "Kompilerings/Körningsfel när cmdset '%s' laddades. Felet skrevs i loggen."
 
-#: src/commands/cmdsethandler.py:199
+#: src/commands/cmdsethandler.py:208
 #, python-format
 msgid "custom %(mergetype)s on cmdset '%(merged_on)s'"
 msgstr "särskild %(mergetype)s på cmdset '%(merged_on)s'"
 
-#: src/commands/cmdsethandler.py:201
+#: src/commands/cmdsethandler.py:211
 #, python-format
 msgid " <Merged %(mergelist)s (%(mergetype)s, prio %(prio)i)>: %(current)s"
 msgstr "<Sammanslagen %(mergelist)s (%(mergetype)s, prio %(prio)i)>: %(current)s"
 
-#: src/commands/cmdsethandler.py:207
+#: src/commands/cmdsethandler.py:219
 #, python-format
 msgid " <%(key)s (%(mergetype)s, prio %(prio)i, %(permstring)s)>: %(keylist)s"
 msgstr " <%(key)s (%(mergetype)s, prio %(prio)i, %(permstring)s)>: %(keylist)s"
 
-#: src/commands/cmdsethandler.py:281
-#: src/commands/cmdsethandler.py:313
+#: src/commands/cmdsethandler.py:294
+#: src/commands/cmdsethandler.py:326
 msgid "Only CmdSets can be added to the cmdsethandler!"
 msgstr "Bara CmdSets can läggas till cmdsethandler!"
 
-#: src/comms/imc2.py:66
-msgid "Send an IMC2 is-alive packet"
-msgstr "Skicka ett IMC2-is-alive paket"
-
-#: src/comms/imc2.py:82
-msgid "Send an IMC2 keepalive-request packet"
-msgstr "Skicka ett IMC2 keepalive-request paket"
-
-#: src/comms/imc2.py:99
-msgid "Check IMC2 list for inactive games"
-msgstr "Genomsök IMC2-listan efter inaktiva spel"
-
-#: src/comms/imc2.py:120
-msgid "Re-sync IMC2 network channel list"
-msgstr "Återsynca nätverkslistan över IMC2 kanaler"
-
-#: src/comms/imc2.py:204
-msgid "IMC2 server rejected connection."
-msgstr "IMC2 server avvisade uppkopplingen."
-
-#: src/comms/imc2.py:213
-msgid "IMC2: Autosetup response found."
-msgstr "IMC2: Autosetup-svar hittat."
-
-#: src/comms/imc2.py:220
-#, python-format
-msgid "Successfully authenticated to the '%s' network."
-msgstr "Identifierade sig framgångsrikt till nätverket '%s'."
-
-#: src/comms/imc2.py:260
-#, python-format
-msgid "{c%(sender)s@%(origin)s{n {wpages (over IMC):{n %(msg)s"
-msgstr "{c%(sender)s@%(origin)s{n {wskickar (over IMC):{n %(msg)s"
-
-#: src/comms/imc2.py:371
-#, python-format
-msgid "Connection failed: %s"
-msgstr "Uppkopplingen misslyckades: %s"
-
-#: src/comms/imc2.py:376
-#, python-format
-msgid "Connection lost: %s"
-msgstr "Uppkopplingen förlorades: %s"
-
-#: src/comms/imc2.py:413
-#, python-format
-msgid "Cannot attach IMC2<->Evennia: Evennia Channel '%s' not found"
-msgstr "Kan inte sammankoppla IMC2<->Evennia: Evennia-kanalen '%s' gick inte att hitta."
-
-#: src/comms/irc.py:51
-#, python-format
-msgid "joined %s."
-msgstr "lyssnar till %s."
-
-#: src/comms/irc.py:66
-msgid "Unknown"
-msgstr "Okänd"
-
-#: src/comms/irc.py:97
-msgid "Connection closed."
-msgstr "Uppkopplingen stängdes."
-
-#: src/comms/irc.py:99
-#, python-format
-msgid "Lost connection %(key)s. Reason: '%(reason)s'. Reconnecting."
-msgstr "Förlorade uppkopplingen %(key)s. Anledning: '%(reason)s'. Försöker igen."
-
-#: src/comms/irc.py:102
-#, python-format
-msgid "Could not connect %(key)s Reason: '%(reason)s'"
-msgstr "Kunde inte koppla upp %(key)s Reason: '%(reason)s'"
-
-#: src/comms/irc.py:122
-#, python-format
-msgid "Cannot attach IRC<->Evennia: Evennia Channel '%s' not found"
-msgstr "Kan inte sammankoppla IRC<->Evennia: Evennia-kanalen '%s' gick inte att hitta"
-
-#: src/comms/imc2lib/imc2_listeners.py:20
-#, python-format
-msgid "Whois reply from %(origin)s: %(msg)s"
-msgstr "Whois-svar från %(origin)s: %(msg)s"
-
-#: src/locks/lockhandler.py:221
+#: src/locks/lockhandler.py:223
 #, python-format
 msgid "Lock: function '%s' is not available."
 msgstr "Lås: funktionen '%s' kunde inte hittas."
 
-#: src/locks/lockhandler.py:234
+#: src/locks/lockhandler.py:236
 #, python-format
 msgid "Lock: definition '%s' has syntax errors."
 msgstr "Lås: definitionen '%s' har syntaktiska fel."
 
-#: src/locks/lockhandler.py:238
+#: src/locks/lockhandler.py:240
 #, python-format
 msgid "Lock: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' "
 msgstr "Lås: låstypen '%(access_type)s' ändrade sig från '%(source)s' till '%(goal)s'"
 
-#: src/locks/lockhandler.py:272
+#: src/locks/lockhandler.py:284
 #, python-format
 msgid "Lock: '%s' contains no colon (:)."
 msgstr "Lås: '%s' innehåller inget kolon (:)."
 
-#: src/locks/lockhandler.py:276
+#: src/locks/lockhandler.py:288
 #, python-format
 msgid "Lock: '%s' has no access_type (left-side of colon is empty)."
 msgstr "Lås: '%s' saknar låstyp (ingenting till vänster om kolonet)."
 
-#: src/locks/lockhandler.py:279
+#: src/locks/lockhandler.py:291
 #, python-format
 msgid "Lock: '%s' has mismatched parentheses."
 msgstr "Lås: '%s' has ickematchande parenteser."
 
-#: src/locks/lockhandler.py:282
+#: src/locks/lockhandler.py:294
 #, python-format
 msgid "Lock: '%s' has no valid lock functions."
 msgstr "Lås: '%s' innehåller inga acceptabla låsfunktioner."
 
-#: src/objects/models.py:634
+#: src/objects/models.py:551
 #, python-format
 msgid "Couldn't perform move ('%s'). Contact an admin."
 msgstr "Kunde inte utföra föflyttningen ('%s'). Kontakta en admininstrator."
 
-#: src/objects/models.py:639
+#: src/objects/models.py:561
 msgid "The destination doesn't exist."
 msgstr "Destinationen existerar inte."
 
-#: src/objects/models.py:752
+#: src/objects/models.py:675
 #, python-format
 msgid "Could not find default home '(#%d)'."
 msgstr "Kunde inte hitta standard-hem '(#'%d)'."
 
-#: src/objects/models.py:767
+#: src/objects/models.py:690
 msgid "Something went wrong! You are dumped into nowhere. Contact an admin."
 msgstr "Nåtgot gick fel! Du har blivit flyttat till en icke-existerande plats. Kontakta en admininstrator."
 
-#: src/objects/models.py:820
+#: src/objects/models.py:762
 #, python-format
 msgid "Your character %s has been destroyed."
 msgstr "Din karaktär %s har blivit raderad."
 
-#: src/scripts/scripthandler.py:43
+#: src/players/models.py:38
+msgid "me"
+msgstr "jag"
+
+#: src/players/models.py:39
+msgid "self"
+msgstr "self"
+
+#: src/players/models.py:417
+msgid "Player being deleted."
+msgstr "Spelaren raderas."
+
+#: src/scripts/scripthandler.py:45
 #, python-format
 msgid ""
 "\n"
@@ -246,60 +170,88 @@ msgstr ""
 "\n"
 " '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repetitioner): %(desc)s"
 
-#: src/scripts/scripts.py:70
+#: src/scripts/scripts.py:158
 #, python-format
 msgid "Script %(key)s(#%(dbid)i) of type '%(cname)s': at_repeat() error '%(err)s'."
 msgstr "Script %(key)s(#%(dbid)i) av typ '%(cname)s': at_repeat() fel '%(err)s'."
 
-#: src/scripts/scripts.py:397
+#: src/scripts/scripts.py:512
 msgid "This is an empty placeholder script."
 msgstr "Detta är ett tomt platshållar-script."
 
-#: src/scripts/scripts.py:404
+#: src/scripts/scripts.py:520
+msgid "This is a generic storage container."
+msgstr "Detta är en generisk lagringskontainer."
+
+#: src/scripts/scripts.py:528
 msgid "Checks sessions so they are live."
 msgstr "Kollar sessioner så att de är aktiva."
 
-#: src/scripts/scripts.py:419
+#: src/scripts/scripts.py:547
 msgid "Validates all scripts regularly."
 msgstr "Validerar alla script regelbundet."
 
-#: src/scripts/scripts.py:433
+#: src/scripts/scripts.py:562
 msgid "Updates the channel handler"
 msgstr "Uppdaterar kanalhanteraren"
 
-#: src/scripts/scripts.py:447
-msgid "Clears the Attribute Cache"
-msgstr "Nollställer Attribut-cachen"
-
-#: src/server/amp.py:394
-msgid " ... Server restarted."
-msgstr "... Servern startades om."
-
-#: src/server/initial_setup.py:61
+#: src/server/initial_setup.py:75
 msgid "This is User #1."
 msgstr "Detta är användare #1."
 
-#: src/server/initial_setup.py:69
+#: src/server/initial_setup.py:85
 msgid "Limbo"
 msgstr "Limbo"
 
-#: src/server/serversession.py:108
+#: src/server/sessionhandler.py:221
 #, python-format
-msgid "Logged in: %(self)s"
-msgstr "Loggade in: %(self)s"
+msgid "Connection dropped: %s %s (%s)"
+msgstr "Uppkopplingen förlorades: %s %s (%s)"
 
-#: src/server/sessionhandler.py:189
+#: src/server/sessionhandler.py:258
+msgid " ... Server restarted."
+msgstr "... Servern startades om."
+
+#: src/server/sessionhandler.py:322
+#, python-format
+msgid "Logged in: %s %s (%s)"
+msgstr "Loggade in: %s %s (%s)"
+
+#: src/server/sessionhandler.py:346
+#, python-format
+msgid "Logged out: %s %s (%s)"
+msgstr "Loggade ut: %s %s (%s)"
+
+#: src/server/sessionhandler.py:366
 msgid "You have been disconnected."
 msgstr "Du har blivit frånkopplad."
 
-#: src/server/sessionhandler.py:202
+#: src/server/sessionhandler.py:379
 msgid "Logged in from elsewhere. Disconnecting."
 msgstr "Inloggad från någon annanstans ifrån. Kopplas ifrån."
 
-#: src/server/sessionhandler.py:222
+#: src/server/sessionhandler.py:397
 msgid "Idle timeout exceeded, disconnecting."
 msgstr "Timeout. Kopplar ur."
 
+#: src/server/portal/imc2.py:167
+#, python-format
+msgid "Whois reply from %(origin)s: %(msg)s"
+msgstr "Whois-svar från %(origin)s: %(msg)s"
+
+#: src/server/portal/imc2.py:175
+#, python-format
+msgid "{c%(sender)s@%(origin)s{n {wpages (over IMC):{n %(msg)s"
+msgstr "{c%(sender)s@%(origin)s{n {wskickar (over IMC):{n %(msg)s"
+
+#: src/server/portal/imc2.py:193
+msgid "IMC2 server rejected connection."
+msgstr "IMC2 server avvisade uppkopplingen."
+
+#: src/server/portal/imc2.py:201
+msgid "IMC2: Autosetup response found."
+msgstr "IMC2: Autosetup-svar hittat."
+
 #: src/web/templates/admin/base_site.html:4
 msgid "Evennia site admin"
 msgstr "Evennia site admin"
@@ -325,7 +277,7 @@ msgstr "%(name)s"
 #: src/web/templates/admin/index.html:41
 #: src/web/templates/admin/index.html:84
 #: src/web/templates/admin/index.html:128
-#: src/web/templates/admin/players/change_form.html:23
+#: src/web/templates/admin/players/change_form.html:22
 msgid "Add"
 msgstr "Lägg till"
 
@@ -363,33 +315,33 @@ msgstr "Först, ange ett användarnamn och lösenord. Då kommer du att kunna mo
 msgid "Enter a username and password."
 msgstr "Ange ett användarnamn och lösenord."
 
-#: src/web/templates/admin/players/change_form.html:20
-#: src/web/templates/admin/players/change_list.html:42
+#: src/web/templates/admin/players/change_form.html:19
+#: src/web/templates/admin/players/change_list.html:41
 msgid "Home"
 msgstr "Hem"
 
-#: src/web/templates/admin/players/change_form.html:31
+#: src/web/templates/admin/players/change_form.html:30
 msgid "History"
 msgstr "Historia"
 
-#: src/web/templates/admin/players/change_form.html:32
+#: src/web/templates/admin/players/change_form.html:31
 #: src/web/templates/admin/players/stacked.html:9
 msgid "View on site"
 msgstr "Inspektera på sida"
 
-#: src/web/templates/admin/players/change_form.html:43
-#: src/web/templates/admin/players/change_list.html:73
+#: src/web/templates/admin/players/change_form.html:42
+#: src/web/templates/admin/players/change_list.html:72
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Vänligen korrigera felet nedan."
 msgstr[1] "Vänligen korrigera felet nedan.\t\t\t\t"
 
-#: src/web/templates/admin/players/change_list.html:64
+#: src/web/templates/admin/players/change_list.html:63
 #, python-format
 msgid "Add %(name)s"
 msgstr "Lägg till %(name)s"
 
-#: src/web/templates/admin/players/change_list.html:84
+#: src/web/templates/admin/players/change_list.html:83
 msgid "Filter"
 msgstr "Filtrera"
 
@@ -402,3 +354,52 @@ msgstr "Lägg till ännu ett %(verbose_name)s"
 msgid "Remove"
 msgstr "Ta bort"
 
+#~ msgid " (exit to %s)"
+#~ msgstr "(utgång till %s)"
+
+#~ msgid "Send an IMC2 is-alive packet"
+#~ msgstr "Skicka ett IMC2-is-alive paket"
+
+#~ msgid "Send an IMC2 keepalive-request packet"
+#~ msgstr "Skicka ett IMC2 keepalive-request paket"
+
+#~ msgid "Check IMC2 list for inactive games"
+#~ msgstr "Genomsök IMC2-listan efter inaktiva spel"
+
+#~ msgid "Re-sync IMC2 network channel list"
+#~ msgstr "Återsynca nätverkslistan över IMC2 kanaler"
+
+#~ msgid "Successfully authenticated to the '%s' network."
+#~ msgstr "Identifierade sig framgångsrikt till nätverket '%s'."
+
+#~ msgid "Connection lost: %s"
+#~ msgstr "Uppkopplingen förlorades: %s"
+
+#~ msgid "Cannot attach IMC2<->Evennia: Evennia Channel '%s' not found"
+#~ msgstr ""
+#~ "Kan inte sammankoppla IMC2<->Evennia: Evennia-kanalen '%s' gick inte att "
+#~ "hitta."
+
+#~ msgid "joined %s."
+#~ msgstr "lyssnar till %s."
+
+#~ msgid "Unknown"
+#~ msgstr "Okänd"
+
+#~ msgid "Connection closed."
+#~ msgstr "Uppkopplingen stängdes."
+
+#~ msgid "Lost connection %(key)s. Reason: '%(reason)s'. Reconnecting."
+#~ msgstr ""
+#~ "Förlorade uppkopplingen %(key)s. Anledning: '%(reason)s'. Försöker igen."
+
+#~ msgid "Could not connect %(key)s Reason: '%(reason)s'"
+#~ msgstr "Kunde inte koppla upp %(key)s Reason: '%(reason)s'"
+
+#~ msgid "Cannot attach IRC<->Evennia: Evennia Channel '%s' not found"
+#~ msgstr ""
+#~ "Kan inte sammankoppla IRC<->Evennia: Evennia-kanalen '%s' gick inte att "
+#~ "hitta"
+
+#~ msgid "Clears the Attribute Cache"
+#~ msgstr "Nollställer Attribut-cachen"