diff --git a/ankiqt/locale/ankiqt_cs_CZ.po b/ankiqt/locale/ankiqt_cs_CZ.po
index c7c5f9038..720f9f13d 100644
--- a/ankiqt/locale/ankiqt_cs_CZ.po
+++ b/ankiqt/locale/ankiqt_cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2008-01-01 HO:MI+ZONE\n"
 "Last-Translator: Michal Čadil <mcadil@gmail.comm>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,17 +31,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, python-format
 msgid " (Alt+%d)"
 msgstr ""
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr " <b>Při vkládání/úpravě</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Při vkládání/úpravě</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr ""
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -103,7 +103,7 @@ msgstr[1] "%(name)s [%(facts)d údaje, %(cards)d kartičky]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, fuzzy, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(facts)d údaje, %(cards)d kartičky) - %(title)s"
@@ -120,40 +120,40 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d exportováno"
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%(del)d smazáno."
 msgstr[1] "%(del)d smazáno."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "před %s"
@@ -299,7 +299,7 @@ msgstr "&Grafy"
 msgid "&Help"
 msgstr "&Nápověda"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 #, fuzzy
 msgid "&Import"
 msgstr "Import"
@@ -417,12 +417,12 @@ msgstr ""
 msgid "&Unsuspend Cards"
 msgstr "&Zmrazit položku"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(nová karta)"
 
@@ -448,7 +448,7 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 msgstr ""
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "Poslední"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr ""
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr ""
@@ -510,12 +510,12 @@ msgstr "<b>Formát odpovědi</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Těžké</b>"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Název</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Název</b>"
@@ -606,7 +606,7 @@ msgstr "<b>Vlastnosti</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Vlastnosti</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Název</b>"
@@ -655,7 +655,7 @@ msgstr "<b>Soubor pro import</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Vložit štítky</b>:"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "<b>Štítky</b>"
@@ -680,7 +680,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr ""
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -732,7 +732,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Obtížnost kartičky</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -744,7 +744,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Kumulativní pohled na kartičky k opakování</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Tato kartička</h1>"
 
@@ -792,11 +792,11 @@ msgstr "<h1>Intervaly kartičky</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Obtížnost kartičky</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Poslední kartička</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -805,7 +805,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modely kartičky</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -834,7 +834,7 @@ msgstr "<h1>Pole</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Pole</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -848,7 +848,7 @@ msgstr "<h1>Pole</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Kartičky k zopakování</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 #, fuzzy
 msgid "<h1>Study Options</h1>"
 msgstr "<b>Popis</b>"
@@ -868,7 +868,7 @@ msgstr "<h1>Synchronizace</h1>Synchronizace umožňuje přístup k balíku přes
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Popis balíku</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -887,12 +887,12 @@ msgstr ""
 " nejsou uloženy. Chcete je uložit, smazat\n"
 " nebo zrušit operaci?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 #, fuzzy
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Pole</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr ""
 
@@ -950,7 +950,7 @@ msgstr "<h1>Modely kartičky</h1>"
 msgid "Add Model"
 msgstr "<h1>Modely kartičky</h1>"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 #, fuzzy
 msgid "Add Tags"
 msgstr "Přidejte štítek..."
@@ -1005,7 +1005,7 @@ msgstr "&Přidat"
 msgid "Again"
 msgstr ""
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "Pole"
@@ -1019,16 +1019,16 @@ msgstr "Opakování"
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr ""
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr ""
 
@@ -1047,20 +1047,20 @@ msgstr ""
 "Během upgradu nastala chyba:\n"
 "%s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1071,8 +1071,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr ""
 
@@ -1080,7 +1080,7 @@ msgstr ""
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 "Nelze uložit konfigurační soubor:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Odpověď"
 
@@ -1117,6 +1117,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr ""
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr ""
@@ -1159,7 +1168,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1171,14 +1180,21 @@ msgstr[1] "Anki - upravit balík (Zobrazeno(%(cur)d kartiček ze %(tot)d)"
 msgid "Browser Font"
 msgstr "Písmo odpovědi"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 #, fuzzy
 msgid "C&ram..."
@@ -1188,15 +1204,15 @@ msgstr "&O programu..."
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 #, fuzzy
 msgid "Cancel"
 msgstr "Změna"
@@ -1238,20 +1254,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "Kartička:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Změna"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "<h1>Obtížnost kartičky</h1>"
@@ -1261,7 +1277,7 @@ msgstr "<h1>Obtížnost kartičky</h1>"
 msgid "Change &Model..."
 msgstr "<h1>Obtížnost kartičky</h1>"
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 #, fuzzy
 msgid "Change Model"
 msgstr "<h1>Obtížnost kartičky</h1>"
@@ -1275,7 +1291,7 @@ msgstr ""
 msgid "Check complete."
 msgstr "Synchronizovat při otevření"
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1287,7 +1303,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1358,7 +1374,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Probíhá synchronizace..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr ""
 
@@ -1387,16 +1403,16 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 #, fuzzy
 msgid "Cram"
 msgstr "&O programu..."
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1410,12 +1426,12 @@ msgstr "Datum vytvoření"
 msgid "Create '%s' on server"
 msgstr "Vytvořit '%s' na serveru"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 #, fuzzy
 msgid "Created"
 msgstr "Datum vytvoření"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr ""
@@ -1563,7 +1579,7 @@ msgstr "Přizpůsobit synchronizaci, plánování, priority a modely"
 msgid "Czech"
 msgstr ""
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1580,35 +1596,35 @@ msgstr "Grafy balíku"
 msgid "Deck Properties"
 msgstr "&Vlastnosti balíku..."
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Soubory balíku (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr ""
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 #, fuzzy
 msgid "Delete"
 msgstr "&Smazat"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Smazat štítek u kartičky..."
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 #, fuzzy
 msgid "Delete Cards"
 msgstr "&Smazat"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 #, fuzzy
 msgid "Delete Refs"
 msgstr "Smazat štítek u kartičky..."
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 #, fuzzy
 msgid "Delete Tags"
 msgstr "Smazat štítek u kartičky..."
@@ -1625,11 +1641,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr ""
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Dialog"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Deak&tivovat"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Zrušit pole"
 
@@ -1684,7 +1704,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "&O programu..."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1699,7 +1719,7 @@ msgstr "&O programu..."
 msgid "Downloads"
 msgstr "&O programu..."
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr ""
@@ -1713,7 +1733,7 @@ msgstr "&Ukončit"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Zbývající čas: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr ""
 
@@ -1744,7 +1764,7 @@ msgstr "Upravit současný model"
 msgid "Ena&ble"
 msgstr "&Aktivovat"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1752,12 +1772,12 @@ msgstr ""
 msgid "English"
 msgstr "Anglicky"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 #, fuzzy
 msgid "Enter tags to add:"
 msgstr "Vložte štítek pro všechny kartičky:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 #, fuzzy
 msgid "Enter tags to delete:"
 msgstr "Vložte štítek k odstranění ze všech kartiček"
@@ -1805,7 +1825,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1829,7 +1849,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Datum vytvoření"
@@ -1839,7 +1859,7 @@ msgstr "Datum vytvoření"
 msgid "Facts"
 msgstr "výrazy"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1868,12 +1888,12 @@ msgstr "Pole %(num)d: %(name)s [%(cards)s neprázdné]"
 msgid "Field %d"
 msgstr "Pole %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, fuzzy, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Pole <b>%d</b> v souboru je:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Přidružení pole"
 
@@ -1890,7 +1910,7 @@ msgstr "Poslední"
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1914,17 +1934,17 @@ msgstr "&O programu..."
 msgid "Fonts & Colours"
 msgstr "Písmo a barvy"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Modely"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Modely"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1941,12 +1961,12 @@ msgstr ""
 msgid "General && Fields"
 msgstr "&Pole"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "&Smazat"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "&Smazat"
@@ -2006,8 +2026,8 @@ msgstr ""
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr ""
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Import"
 
@@ -2015,26 +2035,26 @@ msgstr "Import"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Importovat soubor"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Importovat nastavení"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, fuzzy, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Import kompletní. %(num)d kartiček importováno ze souboru %(file)d.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 #, fuzzy
 msgid "Importing failed.\n"
 msgstr "Importovat soubor"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 #, fuzzy
 msgid "Importing..."
 msgstr "&Import..."
@@ -2052,12 +2072,12 @@ msgstr "Vložit informaci o plánování"
 msgid "Include tags"
 msgstr ""
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 #, fuzzy
 msgid "Interval"
 msgstr "Rozhraní"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -2065,14 +2085,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2104,6 +2124,10 @@ msgstr ""
 msgid "Korean"
 msgstr ""
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+msgid "Lapses"
+msgstr ""
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2119,15 +2143,15 @@ msgstr "Vzorec latexu"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Matematické prostředí latexu"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 msgid "Leech"
 msgstr ""
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr ""
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 #, fuzzy
 msgid "Loading graphs (may take time)..."
 msgstr "Nahrávají se grafy (může chvíli trvat)..."
@@ -2137,21 +2161,26 @@ msgstr "Nahrávají se grafy (může chvíli trvat)..."
 msgid "Loading..."
 msgstr "Ukládá se..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Log importu:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Napojit na %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 #, fuzzy
 msgid "Map to Tags"
 msgstr "Napojit na %s"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Kartička:"
@@ -2183,7 +2212,7 @@ msgstr "Vlastnosti modelu"
 msgid "Models && Priorities"
 msgstr "Vlastnosti modelu"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 #, fuzzy
 msgid "Modified"
 msgstr "Datum změny"
@@ -2192,7 +2221,7 @@ msgstr "Datum změny"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Modely"
@@ -2221,6 +2250,10 @@ msgstr ""
 msgid "Move selected field up"
 msgstr ""
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 #, fuzzy
 msgid "Name"
@@ -2235,12 +2268,12 @@ msgstr "Vytvořit '%s' na serveru"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "Opakování"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "Opakování"
@@ -2253,7 +2286,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2265,15 +2298,15 @@ msgstr ""
 msgid "No changes found."
 msgstr ""
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Žádná aktivní nebo poslední kartička."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr ""
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2281,7 +2314,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr ""
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 #, fuzzy
 msgid "Nothing"
 msgstr "Importovat nastavení"
@@ -2290,12 +2323,12 @@ msgstr "Importovat nastavení"
 msgid "Nothing selected."
 msgstr ""
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Otevřít..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Otevřít &nedávný"
@@ -2305,7 +2338,7 @@ msgstr "Otevřít &nedávný"
 msgid "Open Recent..."
 msgstr "Otevřít &nedávný"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Otevřít balík"
 
@@ -2314,7 +2347,7 @@ msgstr "Otevřít balík"
 msgid "Open the bug tracker"
 msgstr "Otevřít databázi chyb"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Otevřít balík"
@@ -2323,7 +2356,7 @@ msgstr "Otevřít balík"
 msgid "Optimize Database"
 msgstr ""
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Ukládá se..."
@@ -2345,7 +2378,7 @@ msgstr ""
 msgid "Password"
 msgstr "Heslo"
 
-#: ui/main.py:910
+#: ui/main.py:889
 #, fuzzy
 msgid "Password:"
 msgstr "Heslo"
@@ -2380,6 +2413,10 @@ msgstr ""
 "Nesmíte smazat poslední model.\n"
 "Prosím vytvořte nejdřív nový model."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Prosím zvolte pole třídění"
+
 #: ui/sync.py:70
 #, fuzzy
 msgid "Please double-check your username/password."
@@ -2390,7 +2427,7 @@ msgstr "Prosím dvakrát zkontrolujte heslo"
 msgid "Please enable a different template first."
 msgstr "Prosím zodpovězte ještě několik kartiček."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2400,11 +2437,11 @@ msgid ""
 "to enable recording."
 msgstr ""
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Prosím nainstalujte python-mathplotlib pro přístup ke grafům."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2465,7 +2502,7 @@ msgstr "Náhled"
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2482,7 +2519,7 @@ msgstr "Probíhá synchronizace..."
 msgid "Put space between question and answer"
 msgstr "Skrýt otázku při zobrazení odpovědi"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Otázka"
 
@@ -2506,7 +2543,7 @@ msgstr "Velikost odpovědi"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 #, fuzzy
 msgid "Randomizing..."
 msgstr "Ukládá se..."
@@ -2530,12 +2567,12 @@ msgstr "Přidat audio"
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr ""
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr ""
 
@@ -2565,16 +2602,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "Opakova&t poslední audio"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "Probíhá synchronizace..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr ""
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 #, fuzzy
 msgid "Reschedule"
 msgstr "Plánování"
@@ -2603,7 +2640,7 @@ msgstr "Opakování"
 msgid "Review Time"
 msgstr "Opakování"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "Opakování"
@@ -2627,7 +2664,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "Uložit &jako..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 #, fuzzy
 msgid "Save Deck As"
 msgstr "Otevřít balík"
@@ -2686,7 +2723,7 @@ msgstr "Smazat štítek u kartičky..."
 msgid "Select None"
 msgstr "Smazat štítek u kartičky..."
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "&Statistika balíku"
@@ -2713,7 +2750,7 @@ msgstr ""
 msgid "Shift+Alt+m"
 msgstr ""
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 #, fuzzy
 msgid "Show Answer"
 msgstr "Zobrazit odpověď"
@@ -2783,13 +2820,13 @@ msgstr ""
 msgid "Show/Hide"
 msgstr "Zobrazit odpověď"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
 msgstr ""
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr ""
 
@@ -2798,7 +2835,7 @@ msgstr ""
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 #, fuzzy
 msgid "Soon"
 msgstr "Importovat nastavení"
@@ -2809,7 +2846,7 @@ msgstr ""
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Zvuky (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2820,7 +2857,7 @@ msgstr ""
 msgid "Spanish"
 msgstr "Španělština"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr ""
 
@@ -2833,7 +2870,7 @@ msgstr ""
 msgid "Startup"
 msgstr "Stav"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Stav"
 
@@ -2842,14 +2879,14 @@ msgstr "Stav"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Ukončit opakování této kartičky, dokud nebude znovu aktivována v editoru."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 #, fuzzy
 msgid "Suspend"
 msgstr "&Zmrazit položku"
@@ -2858,7 +2895,7 @@ msgstr "&Zmrazit položku"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "&Zmrazit položku"
@@ -2867,7 +2904,7 @@ msgstr "&Zmrazit položku"
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2899,7 +2936,7 @@ msgstr "Synchronizovat tento balík s jménem:"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synchronizovat tento balík s jménem:"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 #, fuzzy
 msgid "Syncing Media..."
 msgstr "Synchronizuji výrazy..."
@@ -2909,12 +2946,12 @@ msgstr "Synchronizuji výrazy..."
 msgid "Syncing failed: %(a)s"
 msgstr "Synchronizace selhala."
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 #, fuzzy
 msgid "Tag Cards"
 msgstr "Kartičky"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr ""
 
@@ -2922,11 +2959,11 @@ msgstr ""
 msgid "Tags"
 msgstr "Štítky"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr ""
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 #, fuzzy
 msgid "Targets must be unique."
 msgstr "'%s' musí být jedinečná"
@@ -2958,26 +2995,26 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 #, fuzzy
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Počet vložených kartičk za daný den"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 #, fuzzy
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Počet vložených kartičk za daný den"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 #, fuzzy
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Počet vložených kartičk za daný den"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 #, fuzzy
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Počet vložených kartičk za daný den"
@@ -2986,7 +3023,7 @@ msgstr "Počet vložených kartičk za daný den"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Protokol pro synchronizaci se změnil. Aktualizujte Anki."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 #, fuzzy
 msgid "The total number of new cards in the deck"
 msgstr "Počet vložených kartičk za daný den"
@@ -3072,7 +3109,7 @@ msgid ""
 "You will need to remove the source first."
 msgstr ""
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -3083,7 +3120,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3114,7 +3151,7 @@ msgstr ""
 "\n"
 "Opravdu chcete smazat tyto kartičky?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3123,7 +3160,7 @@ msgstr ""
 msgid "Title"
 msgstr "Poslední"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3135,7 +3172,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr ""
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr ""
 
@@ -3168,7 +3205,7 @@ msgid ""
 "\n"
 msgstr "Nelze se spojit se serverem"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3181,11 +3218,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Nelze načíst soubor"
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3196,7 +3233,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 #, fuzzy
 msgid "Unable to recover. Deck load failed."
 msgstr "Nelze načíst soubor"
@@ -3210,7 +3247,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "Podtržené písmo"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, fuzzy, python-format
 msgid "Undo %s"
 msgstr "v %s"
@@ -3220,19 +3257,19 @@ msgstr "v %s"
 msgid "Unknown error: %s"
 msgstr "Neznámá chyba: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "&Zmrazit položku"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3258,7 +3295,7 @@ msgstr "Použít vlastní velikost"
 msgid "Username"
 msgstr "Přihlašovací jméno"
 
-#: ui/main.py:906
+#: ui/main.py:885
 #, fuzzy
 msgid "Username:"
 msgstr "Přihlašovací jméno"
@@ -3302,15 +3339,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 #, fuzzy
 msgid ""
 "Your version of Matplotlib is broken.\n"
@@ -3332,7 +3369,7 @@ msgstr "kartičky"
 msgid "days"
 msgstr ""
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr ""
 
@@ -3340,7 +3377,7 @@ msgstr ""
 msgid "facts"
 msgstr "výrazy"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "v %s"
@@ -3349,16 +3386,16 @@ msgstr "v %s"
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr ""
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr ""
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 #, fuzzy
 msgid "mapped to <b>Tags</b>"
 msgstr "<b>Štítky</b>"
@@ -4079,9 +4116,6 @@ msgstr ""
 #~ msgid "Description && Synchronisation"
 #~ msgstr "Popis && synchronizace"
 
-#~ msgid "Dialog"
-#~ msgstr "Dialog"
-
 #, fuzzy
 #~ msgid "Disp&lay Properties..."
 #~ msgstr "Vlastnosti &zobrazení"
@@ -4288,9 +4322,6 @@ msgstr ""
 #~ msgid "Please add a new card first."
 #~ msgstr "Prosím zodpovězte ještě několik kartiček."
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Prosím zvolte pole třídění"
-
 #~ msgid "Please double-check your username."
 #~ msgstr "Prosím dvakrát zkontrolujte přihlašovací jméno"
 
diff --git a/ankiqt/locale/ankiqt_de_DE.po b/ankiqt/locale/ankiqt_de_DE.po
index 1206206fa..81ab49498 100644
--- a/ankiqt/locale/ankiqt_de_DE.po
+++ b/ankiqt/locale/ankiqt_de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt_de_DE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-06-20 20:41+0100\n"
 "Last-Translator: Michael Jürges <michael.juerges@googlemail.com>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -39,17 +39,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "  Stop"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, python-format
 msgid " (Alt+%d)"
 msgstr " (Alt+%d)"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr " (und Proxy Einstellungen)"
 
@@ -76,11 +76,11 @@ msgstr " <b>Beim Bearbeiten (überschreibt obige):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Beim Wiederholen und Bearbeiten:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Bitte vergewissere dich, dass sie richtig eingestellt ist und starte Anki dann neu."
 
@@ -89,7 +89,7 @@ msgstr "Bitte vergewissere dich, dass sie richtig eingestellt ist und starte Ank
 msgid " applied %d modified cards."
 msgstr "auf %d geänderte Karten angewandt."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -109,7 +109,7 @@ msgstr[1] "%(name)s [%(facts)d Fakten]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d von %(totalSum)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d von %(cards)d überfällig) - %(title)s"
@@ -126,40 +126,40 @@ msgstr[1] "vor %6d Tagen"
 msgid "%d exported."
 msgstr "%d exportiert."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, fuzzy, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] "Bei %d fehlt ein Verweis."
 msgstr[1] "Bei %d fehlen Verweise."
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] "Bei %d fehlt ein Verweis."
 msgstr[1] "Bei %d fehlen Verweise."
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d markiert"
 msgstr[1] "%d markiert"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] "%d unbenutzte Datei entfernt."
 msgstr[1] "%d unbenutzte Dateien entfernt."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "vor %s"
@@ -287,7 +287,7 @@ msgstr "&Diagramme..."
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importieren"
 
@@ -390,12 +390,12 @@ msgstr "&Rückgängig"
 msgid "&Unsuspend Cards"
 msgstr "A&ussetzung aufheben"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(neue Karte)"
 
@@ -421,7 +421,7 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 msgstr ""
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr "<Filter>"
 
@@ -438,7 +438,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Hi
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Hilfe</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr ""
@@ -477,11 +477,11 @@ msgstr "<b>Antwort</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Karten</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 msgid "<b>Deck</b>"
 msgstr "<b>Stapel</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Heute<br>fällig</b>"
 
@@ -559,7 +559,7 @@ msgstr "<b>Maximale Anzahl neuer Karten pro Tag:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Neuer Tag beginnt um</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Heute<br>neu</b>"
 
@@ -600,7 +600,7 @@ msgstr "<b>Abstands-Multiplikator</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Ausgesetzt</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 msgid "<b>Tags to append</b>:"
 msgstr "Hinzuzufügende Tags:"
 
@@ -631,7 +631,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Sehr hohe Priorität</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 #, fuzzy
 msgid ""
 "<br>\n"
@@ -690,7 +690,7 @@ msgstr "<h1>Sicherungen</h1>Kartenstapel werden gesichert, wenn sie geöffnet we
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Kartenvorlage</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -704,7 +704,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Kumulierte Fälligkeit</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Aktuelle Karte</h1>"
 
@@ -744,11 +744,11 @@ msgstr "<h1>Intervalle</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Sprache</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Vorherige Karte</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Mehr Lernen</h1>Klicke zum Aufhören auf die Uhr in der Toolbar."
 
@@ -756,7 +756,7 @@ msgstr "<h1>Mehr Lernen</h1>Klicke zum Aufhören auf die Uhr in der Toolbar."
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modelle</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Online Account</h1>Gib unterhalb bitte deine Daten ein,<br>um deinen kostenlosen <a href=\"http://anki.ichi2.net/\">Online-Account</a> zu nutzen.<br><br>Du kannst deine Daten später hier ändern: <br>Einstellungen->Optionen->Sync<br>"
 
@@ -780,7 +780,7 @@ msgstr "<h1>Wiederholungen</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Wiederholungszeit</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Frühzeitig Wiederholen</h1>Klicke zum Aufhören auf die Uhr in der Toolbar."
 
@@ -792,7 +792,7 @@ msgstr "<h1>Wiederholen</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Zielfeld auswählen</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Einstellungen für das Lernen</h1>"
 
@@ -808,7 +808,7 @@ msgstr "<h1>Synchronisierung</h1><a href=\"http://anki.ichi2.net/\">Kostenlosen
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Synchronisierung</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -829,11 +829,11 @@ msgstr ""
 "<h1>Änderungen speichern</h1>\n"
 "Es gibt noch nicht gespeicherte Änderungen. Möchtest Du sie speichern, die Änderungen verwerfen, oder abbrechen?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Sehr gut!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignoriert>"
 
@@ -886,7 +886,7 @@ msgstr "Material hinzufügen"
 msgid "Add Model"
 msgstr "Modell hinzufügen"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Tags hinzufügen"
 
@@ -936,7 +936,7 @@ msgstr "Erweitert"
 msgid "Again"
 msgstr "Nochmals"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Alle Felder"
 
@@ -948,16 +948,16 @@ msgstr "Alle Wiederholungen"
 msgid "Allow the answer to be blank"
 msgstr "Antwort darf leer sein"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Bereits am pauken, bitte den Stapel zuerst schließen."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr "Alt+m"
 
@@ -974,7 +974,7 @@ msgstr "Öffne beim Starten von Anki immer das zuletzt geöffnete Deck"
 msgid "An error occured while opening %s"
 msgstr "Beim Öffnen von %s ist ein Fehler aufgetreten"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
@@ -982,7 +982,7 @@ msgstr ""
 "Bei einem Plugin ist ein Fehler aufgetreten. Bitte informiere den Autor.<br>\n"
 "des Plugins. Bitte erfasse keinen Fehlerreport in Anki.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -991,7 +991,7 @@ msgstr ""
 "Ein Fehler ist aufgetreten: möchtest Du den Stapel überprüfen?\n"
 "Dieser Vorgang wird einige Zeit in Anspruch nehmen."
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1009,8 +1009,8 @@ msgstr ""
 "Wenn das Problem damit nicht behoben ist, dann sende bitte einen Fehlerbericht<br>\n"
 "mit folgender Beschreibung:<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1018,7 +1018,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1027,7 +1027,7 @@ msgstr ""
 "Anki konnte Deine Einstellungen nicht speichern:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Antwort"
 
@@ -1055,6 +1055,15 @@ msgstr "Hänge den Tag 'marked' an dieses Faktum an, so dass du es später im Br
 msgid "Applying reply..."
 msgstr "Serverseitige Änderungen anwenden..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "Durchschnittszeit pro Antwort:"
@@ -1098,7 +1107,7 @@ msgstr "Zeige alle Karten an"
 msgid "Browse and edit all items"
 msgstr "Zeige und editiere alle Karten"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1109,14 +1118,21 @@ msgstr[1] "Editor (%(cur)d von %(tot)d Karten angezeigt; %(sel)s markiert)"
 msgid "Browser Font"
 msgstr "Editor Schriftart"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Erzeuge Index..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr "Begraben"
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "Pauken..."
@@ -1125,15 +1141,15 @@ msgstr "Pauken..."
 msgid "Cache LaTeX"
 msgstr "Packe LaTeX"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Kann nur ein Modell gleichzeitig ändern."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Kann nur mit einem Modell gleichzeitig arbeiten."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1172,19 +1188,19 @@ msgstr "Karten warten"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr "Karten/Tag:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr "Karten/Sitzung:"
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Ändern"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "Ändere %s zu:"
@@ -1193,7 +1209,7 @@ msgstr "Ändere %s zu:"
 msgid "Change &Model..."
 msgstr "&Modell ändern..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Modell ändern"
 
@@ -1205,7 +1221,7 @@ msgstr "Medien-Datenbank prüfen..."
 msgid "Check complete."
 msgstr "Abgleich abgeschlossen."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 #, fuzzy
 msgid "Check due counts again (F5)"
 msgstr "Überpüfe die Fälligzeitszeiten erneut (Ctrl+Shift+r)"
@@ -1218,7 +1234,7 @@ msgstr "Datenbankintegrität prüfen"
 msgid "Check the files in the media directory"
 msgstr "Überprüfe die Dateien im 'media' Verzeichnis"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr "Überprüfe Stapel %(x)d von %(y)d..."
@@ -1288,7 +1304,7 @@ msgstr "Lerneinstellungen anpassen"
 msgid "Connecting..."
 msgstr "Verbindung zum Server aufbauen..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "&Wiederholungen fortsetzen"
 
@@ -1317,15 +1333,15 @@ msgstr "Heute richtig beantwortet: "
 msgid "Correct under a month: "
 msgstr "Unter einem Monat lang richtig beantwortet: "
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "Konnte die Datei nicht abspielen. Installiere bitte den mplayer."
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Pauken..."
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "Ausgewählte Karten in einem neuen Deck pauken?"
 
@@ -1338,11 +1354,11 @@ msgstr "Erzeuge"
 msgid "Create '%s' on server"
 msgstr "Erstelle '%s' auf dem Server"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Erzeugt"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1487,7 +1503,7 @@ msgstr "Synchronisierung, Zeitabstände, Prioritäten und Modelle anpassen."
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1504,32 +1520,32 @@ msgstr "Stapeldiagramme"
 msgid "Deck Properties"
 msgstr "Stapeleinstellungen"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Stapeldateien (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Stapel ist bereits geöffnet"
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Entfernen"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, python-format
 msgid "Delete %s?"
 msgstr "%s löschen?"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Karten löschen"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Referenzen löschen"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Tags löschen..."
 
@@ -1545,11 +1561,15 @@ msgstr "Lösche die gerade ausgewählte Karte"
 msgid "Determining differences..."
 msgstr "Ermittle Unterschiede..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "&Sperren"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Feld verwerfen"
 
@@ -1603,7 +1623,7 @@ msgstr "Lade ein Plugin herunter, um Ankis Verhalten zu ändern oder neue Funkti
 msgid "Downloaded %dKB"
 msgstr "%dKB heruntergeladen"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr "%dKB vom Server heruntergeladen..."
@@ -1616,7 +1636,7 @@ msgstr "Am runterladen..."
 msgid "Downloads"
 msgstr "Downloads"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Fälligkeit"
@@ -1630,7 +1650,7 @@ msgstr "&Beenden"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Noch <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Faktor"
 
@@ -1658,7 +1678,7 @@ msgstr "Momentan angezeigte Karte editieren"
 msgid "Ena&ble"
 msgstr "&Aktivieren"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1666,11 +1686,11 @@ msgstr ""
 msgid "English"
 msgstr "Englisch"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Karten mit diesem Tag versehen:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Dieses Tag von den Karten entfernen:"
 
@@ -1714,7 +1734,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1738,7 +1758,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr "Faktum angelegt"
 
@@ -1746,7 +1766,7 @@ msgstr "Faktum angelegt"
 msgid "Facts"
 msgstr "Fakten"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Fehler beim Laden von Medien: Bitte Befehl \"Medien-Datenbank prüfen\" ausführen."
 
@@ -1774,12 +1794,12 @@ msgstr "Feld %(num)d: %(name)s [%(cards)s Mal benutzt]"
 msgid "Field %d"
 msgstr "Feld %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Feld <b>%d</b> der Datei ist:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Feldzuordnung"
 
@@ -1795,7 +1815,7 @@ msgstr "Fil&ter"
 msgid "Find and Re&place..."
 msgstr "Suchen und &Ersetzen"
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Suchen und Ersetzen"
 
@@ -1815,16 +1835,16 @@ msgstr "Font..."
 msgid "Fonts & Colours"
 msgstr "Schriften und Farben"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 msgid "Forget"
 msgstr "Vergessen"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, python-format
 msgid "Forget %s?"
 msgstr "%s vergessen?"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr "'Vergessen' entfernt den Stapel aus der Liste, ohne ihn zu löschen."
 
@@ -1840,11 +1860,11 @@ msgstr "Datenbank komplett prüfen..."
 msgid "General && Fields"
 msgstr "Allgemein und Felder"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Karten generieren"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Generiere Karten..."
 
@@ -1900,8 +1920,8 @@ msgstr "Dieses Update ignorieren"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Bilder (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importieren"
 
@@ -1909,24 +1929,24 @@ msgstr "Importieren"
 msgid "Import cards from text files, Anki files and more"
 msgstr "Importiere Karten aus Textdateien, Ankidateien und anderen Dateiformaten"
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 msgid "Import failed.\n"
 msgstr "Import fehlgeschlagen.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Einstellungen importieren"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Import abgeschlossen. %(num)d Fakten aus %(file)s importiert.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Import ist fehlgeschlagen.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Importiere..."
 
@@ -1943,11 +1963,11 @@ msgstr "Zeitabstände ebenfalls exportieren"
 msgid "Include tags"
 msgstr "Tags exportieren"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervall"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Ungültiger regulärer Ausdruck."
 
@@ -1955,14 +1975,14 @@ msgstr "Ungültiger regulärer Ausdruck."
 msgid "Invert"
 msgstr "Invertieren"
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] "Es ist %(sec)d Sekunde %(type)s.\n"
 msgstr[1] "Es ist %(sec)d Sekunden %(type)s.\n"
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -1997,6 +2017,11 @@ msgstr "Behalten"
 msgid "Korean"
 msgstr "Koreanisch"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Faktoren"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l, dann l)"
@@ -2009,16 +2034,16 @@ msgstr "Latex-Formel (Ctrl+l, dann e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Latex-Mathematik-Umgebung (Ctrl+l, dann m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Tschechisch"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Lade Stapel..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Lade Diagramme (kann eine Weile dauern)..."
 
@@ -2026,20 +2051,25 @@ msgstr "Lade Diagramme (kann eine Weile dauern)..."
 msgid "Loading..."
 msgstr "Lade..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Import-Log:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "%s zuordnen"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Tags zuordnen"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr "Markiert"
 
@@ -2070,7 +2100,7 @@ msgstr "Modelleinstellungen"
 msgid "Models && Priorities"
 msgstr "Modelle && Prioritäten"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Geändert"
 
@@ -2078,7 +2108,7 @@ msgstr "Geändert"
 msgid "Mongolian"
 msgstr "Mongolisch"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr "Mehr"
 
@@ -2106,6 +2136,10 @@ msgstr "Ausgewähltes Feld nach unten schieben"
 msgid "Move selected field up"
 msgstr "Ausgewähltes Feld nach oben schieben"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Name"
@@ -2118,11 +2152,11 @@ msgstr "Name auf dem Server:"
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr "Heute neu:"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr "Neu insgesamt:"
 
@@ -2134,7 +2168,7 @@ msgstr "Nächste Farbe (F7, dann F8)"
 msgid "Next field must be blank."
 msgstr "Nächstes Feld muss leer sein."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Keine Karte hat eines der eingegeben Tags."
 
@@ -2146,15 +2180,15 @@ msgstr "Keine Karten zur Wiederholung vorhanden."
 msgid "No changes found."
 msgstr "Keine Änderungen gefunden."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Keine aktuelle oder vorherige Karte."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr "Keine Faktum Tags"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2162,7 +2196,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "Keine"
 
@@ -2170,11 +2204,11 @@ msgstr "Keine"
 msgid "Nothing selected."
 msgstr "Nichts ausgewählt."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 msgid "Open"
 msgstr "Öffnen"
 
-#: ui/main.py:784
+#: ui/main.py:763
 msgid "Open Recent Deck"
 msgstr "Zuletzt geöffneter Stapel"
 
@@ -2182,7 +2216,7 @@ msgstr "Zuletzt geöffneter Stapel"
 msgid "Open Recent..."
 msgstr "Zuletzt geöffnet..."
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Lade Stapel"
 
@@ -2190,7 +2224,7 @@ msgstr "Lade Stapel"
 msgid "Open the bug tracker"
 msgstr "Öffne den Bugtracker."
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, python-format
 msgid "Open this deck%s"
 msgstr "Öffne diesen Stapel%s"
@@ -2199,7 +2233,7 @@ msgstr "Öffne diesen Stapel%s"
 msgid "Optimize Database"
 msgstr "Datenbank optimieren"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 msgid "Ordering..."
 msgstr "Sortiere..."
 
@@ -2220,7 +2254,7 @@ msgstr "Gepackte Stapeldatei (*.zip)"
 msgid "Password"
 msgstr "Passwort"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -2249,6 +2283,11 @@ msgstr "Bitte füge zuerst ein neues Kartenmodell hinzu."
 msgid "Please add another model first."
 msgstr "Bitte füge zuerst ein anderes Modell hinzu."
 
+#: forms/sort.py:46
+#, fuzzy
+msgid "Please choose a field to sort by."
+msgstr "Bitte füge zuerst ein neues Feld hinzu."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Bitte überprüfe Deinen Benutzernamen und Dein Passwort."
@@ -2257,7 +2296,7 @@ msgstr "Bitte überprüfe Deinen Benutzernamen und Dein Passwort."
 msgid "Please enable a different template first."
 msgstr "Bitte aktiviere zuerst ein anderes Kartenmodell."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Bitte einen gültigen Bereich eingeben."
 
@@ -2269,11 +2308,11 @@ msgstr ""
 "Bitte installiere <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "um Aufnahmen zu ermöglichen."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Bitte installiere python-matplotlib zur Anzeige der Diagramme."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Bitte starte Anki neu, bevor die Datenbank geprüft wird."
 
@@ -2329,7 +2368,7 @@ msgstr "Vorschau"
 msgid "Previous colour (F7 then F6)"
 msgstr "Vorherige Farbe (F7, dann F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2346,7 +2385,7 @@ msgstr "Verarbeite..."
 msgid "Put space between question and answer"
 msgstr "Abstand zwischen Frage und Antwort anzeigen"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Frage"
 
@@ -2370,7 +2409,7 @@ msgstr "Frage Größe"
 msgid "Quick Database Check"
 msgstr "Schnelle Datenbanküberprüfung"
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Mische..."
 
@@ -2391,12 +2430,12 @@ msgstr "Audio aufnehmen (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Aufnahme läuft...<br>Zeit: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Wiederholen: %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Neu zeichnen"
 
@@ -2424,15 +2463,15 @@ msgstr "Entferne ungenutzte Felder um die Datenbankdatei kleiner zu machen"
 msgid "Repeat &Audio"
 msgstr "&Wiederhole Audioausgabe"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Ersetze..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Wiederholungen"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Neu planen"
 
@@ -2456,7 +2495,7 @@ msgstr "Wiederholen"
 msgid "Review Time"
 msgstr "Wiederholungszeit"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr "Fällige Wiederholungen:"
 
@@ -2477,7 +2516,7 @@ msgstr "Nehme Stille auf...<br>Zeit: %0.1f"
 msgid "Save &As..."
 msgstr "Speichern &unter..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Speichere Stapel unter"
 
@@ -2529,7 +2568,7 @@ msgstr "Alles markieren"
 msgid "Select None"
 msgstr "Nichts markieren"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr "Sitzungsstatistik"
 
@@ -2555,7 +2594,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Antwort anzeigen"
 
@@ -2619,7 +2658,7 @@ msgstr "Anki in Systemleiste anzeigen"
 msgid "Show/Hide"
 msgstr "Diagramme auswählen"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
@@ -2628,7 +2667,7 @@ msgstr ""
 "Synchronisierung führen kann, wird diese so \n"
 "lange ausgesetzt, bis das Problem behoben ist."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Gewisse Felder sind leer oder nicht eindeutig."
 
@@ -2637,7 +2676,7 @@ msgstr "Gewisse Felder sind leer oder nicht eindeutig."
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Einige Einstellungen werden erst nach einem Neustart von Anki angewendet."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Bald"
 
@@ -2646,7 +2685,8 @@ msgid "Sort as numbers"
 msgstr "Als Zahlen sortieren"
 
 #: ui/facteditor.py:874
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+#, fuzzy
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Audio/Video (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
 
 #: ui/deckproperties.py:189
@@ -2657,7 +2697,7 @@ msgstr "Source ID:"
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "Starte &Wiederholungen"
 
@@ -2669,7 +2709,7 @@ msgstr "Beginne damit, dein eigenes Material hinzuzufügen."
 msgid "Startup"
 msgstr "Starten"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Zustand"
 
@@ -2677,14 +2717,14 @@ msgstr "Zustand"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Diese Karte von den Wiederholungen ausschließen. Die Ausschließung kann im Editor rückgängig gemacht werden."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] "Heute <b>%(reps)d Karte</b> in <b>%(time)s</b> wiederholt."
 msgstr[1] "Heute <b>%(reps)d Karten</b> in <b>%(time)s</b> wiederholt."
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Aussetzen"
 
@@ -2692,7 +2732,7 @@ msgstr "Aussetzen"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr "Setze dieses Faktum aus, bis der Stapel geschlossen und erneut geöffnet wird"
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr "Ausgesetzt"
 
@@ -2700,7 +2740,7 @@ msgstr "Ausgesetzt"
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr "Synchronisation fehlgeschlagen. Bitte überprüfe deine Internetverbindung."
 
@@ -2728,7 +2768,7 @@ msgstr "Diesen Stapel synchronisieren"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Diesen Stapel mit Anki Online synchronisieren"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Medien synchronisieren..."
 
@@ -2737,11 +2777,11 @@ msgstr "Medien synchronisieren..."
 msgid "Syncing failed: %(a)s"
 msgstr "Synchronisierung fehlgeschlagen: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Karten taggen"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Fakten mit doppelten Feldern nur markieren statt sie zu löschen"
 
@@ -2749,11 +2789,11 @@ msgstr "Fakten mit doppelten Feldern nur markieren statt sie zu löschen"
 msgid "Tags"
 msgstr "Tags"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Tags zum Pauken:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Ziele müssen eindeutig sein."
 
@@ -2785,23 +2825,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr "Maximale Anzahl von <b>neuen Karten pro Tag</b>. Voreingestellt sind 20 Karten, damit du nicht nach ein paar Tagen von Wiederholungen überrannt wirst."
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Anzahl der Karten, die heute gelernt werden können"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Anzahl der Karten, die du in der jetzigen (blau) und der vorigen (schwarz) Sitzung wiederholt hast"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Anzahl der Karten, die du heute (blau) und gestern (schwarz) studiert hast"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr "Anzahl von Minuten, die du heute (blau) und gestern (schwarz) aufs Lernen verwendet hast"
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Anzahl neuer Karten, die heute gelernt werden können"
 
@@ -2809,7 +2849,7 @@ msgstr "Anzahl neuer Karten, die heute gelernt werden können"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Das Synchronisierungs-Protokoll hat sich geändert. Bitte updaten."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr "Gesamtzahl neuer Karten in diesem Stapel"
 
@@ -2896,7 +2936,7 @@ msgstr ""
 "%s\n"
 "Bitte lösche diesen Stapel zuerst."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2914,7 +2954,7 @@ msgstr ""
 "<b>Dieser Vorgang kann nicht rückgängig gemacht werden.</b><br>\n"
 "Fortsetzen?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2953,7 +2993,7 @@ msgstr ""
 "\n"
 "Diese Karten wirklich löschen?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr "Zeit/Tag:"
 
@@ -2961,7 +3001,7 @@ msgstr "Zeit/Tag:"
 msgid "Title"
 msgstr "Titel"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2973,7 +3013,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Die heutigen Wiederholungen sind abgearbeitet"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Werkzeugleiste anzeigen"
 
@@ -3004,7 +3044,7 @@ msgid ""
 "\n"
 msgstr "Keine Verbindung zum Server möglich"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3026,11 +3066,11 @@ msgstr ""
 "\n"
 "Um eine alte Stapeldatei zu aktualisieren, benutze Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Datei kann nicht geladen werden"
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3041,7 +3081,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Wiederherstellung gescheitert. Stapel konnte nicht geladen werden."
 
@@ -3053,7 +3093,7 @@ msgstr "Entpacke LaTeX"
 msgid "Underline text (Ctrl+u)"
 msgstr "Unterstrichen(Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Rückgängig: %s"
@@ -3063,11 +3103,11 @@ msgstr "Rückgängig: %s"
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 msgid "Unsuspend"
 msgstr "Aussetzen aufheben"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3077,7 +3117,7 @@ msgstr ""
 " - Du kannst weiterlernen\n"
 " - Bitte dieses Fenster nicht schließen"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr "%dKB auf den Server hochgeladen..."
@@ -3102,7 +3142,7 @@ msgstr "Andere Größe benutzen"
 msgid "Username"
 msgstr "Benutzername"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -3145,15 +3185,15 @@ msgstr ""
 msgid "X"
 msgstr "X"
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Du bist bereits am Pauken. Bitte schließe zuerst den Stapel."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr "Die Uhr deines Computers ist nicht richtig eingestellt. \n"
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3174,7 +3214,7 @@ msgstr "Karten"
 msgid "days"
 msgstr "Tage"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "früh"
 
@@ -3182,7 +3222,7 @@ msgstr "früh"
 msgid "facts"
 msgstr "Fakten"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "in %s"
@@ -3191,16 +3231,16 @@ msgstr "in %s"
 msgid "label"
 msgstr "Label"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "spät"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "abgebildet auf <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "abgebildet auf <b>Tags</b>"
 
@@ -3374,10 +3414,6 @@ msgstr "Label"
 #~ msgid "Please check the proxy settings."
 #~ msgstr "Bitte überprüfe die Proxy Einstellungen."
 
-#, fuzzy
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Bitte füge zuerst ein neues Feld hinzu."
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Wiederhole Audioausgabe der &Antwort"
 
diff --git a/ankiqt/locale/ankiqt_ee_EE.po b/ankiqt/locale/ankiqt_ee_EE.po
index 32b727eca..48dc0fb90 100644
--- a/ankiqt/locale/ankiqt_ee_EE.po
+++ b/ankiqt/locale/ankiqt_ee_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt_ee_EE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-03-17 18:43+0200\n"
 "Last-Translator: Meelis Vasser <meelis.vasser@gmail.com>\n"
 "Language-Team: Estonian <>\n"
@@ -38,17 +38,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "  Peata"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -75,11 +75,11 @@ msgstr " <b>Muutmise ajal (ülimuslik eelmisest):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Kordamise ja muutmise ajal:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 #, fuzzy
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Palun sisesta korrektne alguse ja lõppu vahemik."
@@ -89,7 +89,7 @@ msgstr "Palun sisesta korrektne alguse ja lõppu vahemik."
 msgid " applied %d modified cards."
 msgstr " panin peale %d muudetud kaarti."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, fuzzy, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -109,7 +109,7 @@ msgstr[1] "%(name)s [%(facts)d fakti]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s %(cards)d kaarti, millest (%(due)d tähtaegunud) - %(title)s"
@@ -126,33 +126,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d eksporditud."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "Mitte midagi valitud."
 msgstr[1] "Mitte midagi valitud."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -163,7 +163,7 @@ msgstr[1] ""
 "%(a)d puuduvat viidet.\n"
 "%(b)d kasutamata faili kustutatud."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s tagasi"
@@ -296,7 +296,7 @@ msgstr "&Graafik..."
 msgid "&Help"
 msgstr "&Abi"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Impordi"
 
@@ -400,12 +400,12 @@ msgstr "&Võta tagasi"
 msgid "&Unsuspend Cards"
 msgstr "&Lükka fakt edasi"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(uus)"
 
@@ -442,7 +442,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "<Sildi filter>"
@@ -460,7 +460,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ab
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Abi</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Abi</a>"
@@ -497,12 +497,12 @@ msgstr "<b>Vastus</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Kaardid</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Nimi</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Nimi</b>"
@@ -586,7 +586,7 @@ msgstr "<b>Uusi kaarte päevas:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Uus päev algab kell</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nimi</b>"
@@ -631,7 +631,7 @@ msgstr "<b>Vahejätmise korrutaja</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Edasi lükatud</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "Lisatavad sildid"
@@ -662,7 +662,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Väga kõrge prioriteet</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -714,7 +714,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Kaardi mallid</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -725,7 +725,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Tähtaeguvad kaardid kumulatiivselt</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>See kaart</h1>"
 
@@ -766,11 +766,11 @@ msgstr "<h1>Kordamise vahekaugused</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Keel</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Viimane kaart</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -778,7 +778,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Mudelid</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 #, fuzzy
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Online konto</h1>Et kasutada tasuta <a href=\"http://anki.ichi2.net/\">online kontot</a>,<br>palun sisesta oma andmed.<br>"
@@ -804,7 +804,7 @@ msgstr "<h1>Kordamised</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Kordamisaeg</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -816,7 +816,7 @@ msgstr "<h1>Kordamine</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Vali väli</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Õpingu suvandid</h1>"
 
@@ -832,7 +832,7 @@ msgstr "<h1>Sünkroniseerimine</h1><a href=\"http://anki.ichi2.net/\">Loo tasuta
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Sünkroniseeri</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -853,11 +853,11 @@ msgstr ""
 "        muutusi.Kas Sa soovid salvestada või loobuda\n"
 "        neist? Tühista küsimus?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Tubli!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<eiratud>"
 
@@ -911,7 +911,7 @@ msgstr "Lisa mudel"
 msgid "Add Model"
 msgstr "Lisa mudel"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Lisa silte"
 
@@ -962,7 +962,7 @@ msgstr "Lisaomadused"
 msgid "Again"
 msgstr "Uuesti"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "Väljad"
@@ -976,16 +976,16 @@ msgstr "Korda"
 msgid "Allow the answer to be blank"
 msgstr "Vastus võib olla tühi"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Muutub tuupimiseks. Esmalt, sulge praegune kaardibak."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+%d"
@@ -1003,7 +1003,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "Üritades avada %s, tuli viga"
 
-#: ui/main.py:201
+#: ui/main.py:202
 #, fuzzy
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
@@ -1012,7 +1012,7 @@ msgstr ""
 "Pluginas esines viga. Palun võta plugina autoriga ühendust.<br>\n"
 "See ei ole Anki viga.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1022,7 +1022,7 @@ msgstr ""
 "Soovid kontrollida, kas kaardipakis on vigu?\n"
 "See võib võtta aega."
 
-#: ui/main.py:192
+#: ui/main.py:193
 #, fuzzy
 msgid ""
 "An error occurred. Please:<p>\n"
@@ -1039,8 +1039,8 @@ msgstr ""
 "Kui see ei paranda probleemi, palun kopeeri järgnev<br>\n"
 "vearaportisse:<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1048,7 +1048,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1057,7 +1057,7 @@ msgstr ""
 "Häälestufaili salvestamine ebaõnnestus:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Vastus"
 
@@ -1085,6 +1085,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr "Värskendan kohalike andmeid..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 #, fuzzy
 msgid "Average time per answer: "
@@ -1130,7 +1139,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1142,14 +1151,21 @@ msgstr[1] "Redigeerija (%(tot)d-st kaardist %(cur)d näidatud; %(sel)d valitud)"
 msgid "Browser Font"
 msgstr "Vastuse kirjastiil"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Indexit tekitamine..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "Tuubi..."
@@ -1158,15 +1174,15 @@ msgstr "Tuubi..."
 msgid "Cache LaTeX"
 msgstr "Vahemälu LaTeX-le"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Muuta saab ainult ühte mudelit korraga."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Tegutseda saab ainult ühe mudeliga korraga."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Tühista"
 
@@ -1205,20 +1221,20 @@ msgstr "Kaarti on ootel"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "Kaardid"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Muuda"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "Muuda %s selleks:"
@@ -1227,7 +1243,7 @@ msgstr "Muuda %s selleks:"
 msgid "Change &Model..."
 msgstr "&Vaheta mudelit..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Vaheta mudelit"
 
@@ -1239,7 +1255,7 @@ msgstr "Kontrolli meedia andmebaasi..."
 msgid "Check complete."
 msgstr "Kontroll teostatud."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1251,7 +1267,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1322,7 +1338,7 @@ msgstr "Jätka kordamist"
 msgid "Connecting..."
 msgstr "Ühenduse võtmine..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "Jätka &kordamist"
 
@@ -1351,15 +1367,15 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Tuupimine"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1373,11 +1389,11 @@ msgstr "Tekitatud"
 msgid "Create '%s' on server"
 msgstr "Tekita '%s' serveris"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Tekitatud"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1529,7 +1545,7 @@ msgstr "Kohanda sünkroniseerimist, ajastamist, prioriteete ja mudeleid."
 msgid "Czech"
 msgstr "Tšehh"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1546,32 +1562,32 @@ msgstr "Kaardipaki graafik"
 msgid "Deck Properties"
 msgstr "Kaardipaki omadused"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Kaardipakid (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Kaardipakk on juba avatud."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Kustuta Viited"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Kustuta kaardid"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Kustuta Viited"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Kustuta silte"
 
@@ -1587,11 +1603,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "Selgitan erinevusi..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Dialoog"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "&Blokeeri"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Loobu väljast"
 
@@ -1646,7 +1666,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "Alla laadimised"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1660,7 +1680,7 @@ msgstr "&Lae alla..."
 msgid "Downloads"
 msgstr "Alla laadimised"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Tähtaeguvad kaardid"
@@ -1674,7 +1694,7 @@ msgstr "&Lõpeta"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Eeldatav ajakulu (ETA): "
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Kergendav"
 
@@ -1702,7 +1722,7 @@ msgstr ""
 msgid "Ena&ble"
 msgstr "&Võimalda"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1710,11 +1730,11 @@ msgstr ""
 msgid "English"
 msgstr "inglise keel"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Sisesta lisatavad sildid:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Sisesta kustutatavad sildid:"
 
@@ -1758,7 +1778,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1782,7 +1802,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Tekitatud"
@@ -1791,7 +1811,7 @@ msgstr "Tekitatud"
 msgid "Facts"
 msgstr "Faktid"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Meedia üleslaadimine ebaõnnestus. Palun käivita 'Kontrolli meedia andmebaasi'."
 
@@ -1819,12 +1839,12 @@ msgstr "%(num)d. väli: %(name)s [%(cards)s mittetühjad]"
 msgid "Field %d"
 msgstr "%d. väli"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Selle faili <b>%d.</b> väli on:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Väljade vastendus"
 
@@ -1841,7 +1861,7 @@ msgstr "<Sildi filter>"
 msgid "Find and Re&place..."
 msgstr "&Otsi ja asenda..."
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Otsi ja ssenda"
 
@@ -1862,17 +1882,17 @@ msgstr "A&nneta..."
 msgid "Fonts & Colours"
 msgstr "Kirjastiilid ja värvid"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Lisavalikud>>"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Lisavalikud>>"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1889,11 +1909,11 @@ msgstr "Kontrolli andmebaasi"
 msgid "General && Fields"
 msgstr "Andmed ja väljad"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Tekita kaardid"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Tekitan kaarte..."
 
@@ -1950,8 +1970,8 @@ msgstr "Eira seda uuendust"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Pildid (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Impordi"
 
@@ -1959,25 +1979,25 @@ msgstr "Impordi"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Importimine ebaõnnestus.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Importimise suvandid"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Importimine teostatud. Failist %(file)s imporditud %(num)d fakti.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Importimine ebaõnnestus.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Impordin..."
 
@@ -1994,11 +2014,11 @@ msgstr "Pane kaasa ajastamiste andmed"
 msgid "Include tags"
 msgstr "Pane kaasa sildid"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Vahekaugus"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Vigane regulaaravaldis."
 
@@ -2006,14 +2026,14 @@ msgstr "Vigane regulaaravaldis."
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2044,6 +2064,11 @@ msgstr ""
 msgid "Korean"
 msgstr "korea keel"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Kergendavad"
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2059,16 +2084,16 @@ msgstr "Latexi võrrand (Ctrl+l. siis e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Latexi matemaatika keskkond (Ctrl+l, siis m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Tšehh"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Laen kaardipakki..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Laen graafikat (võib võtta aega)..."
 
@@ -2076,20 +2101,25 @@ msgstr "Laen graafikat (võib võtta aega)..."
 msgid "Loading..."
 msgstr "Laen kaardipakki..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Impordi logi:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Liida väljadele %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Liida siltidega"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Raske"
@@ -2120,7 +2150,7 @@ msgstr "Mudeli omadused"
 msgid "Models && Priorities"
 msgstr "Mudelid ja prioriteedid"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Muutmisaeg"
 
@@ -2128,7 +2158,7 @@ msgstr "Muutmisaeg"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Lisavalikud>>"
@@ -2157,6 +2187,10 @@ msgstr "Teisalda valitud völi allapoole"
 msgid "Move selected field up"
 msgstr "Teisalda valitud väli ülespoole"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Nimi"
@@ -2169,12 +2203,12 @@ msgstr "Nimi serveris: "
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "Korda tähtaeguvad kaardid varakult"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "Korda tähtaeguvad kaardid varakult"
@@ -2187,7 +2221,7 @@ msgstr "Järgmine värv (F7, siis F8)"
 msgid "Next field must be blank."
 msgstr "Järgmine väli peab olema tühi."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Siltidele vastavaid kaarte ei ole."
 
@@ -2199,16 +2233,16 @@ msgstr "Ei ole esitatavaid kaarte."
 msgid "No changes found."
 msgstr "Muutusi ei leitud."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Praegust või eelmist kaart ei ole."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "Silte ei ole"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2217,7 +2251,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "korea keel"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "mitte midagi"
 
@@ -2225,12 +2259,12 @@ msgstr "mitte midagi"
 msgid "Nothing selected."
 msgstr "Mitte midagi valitud."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Ava..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Ava &hiljutised"
@@ -2240,7 +2274,7 @@ msgstr "Ava &hiljutised"
 msgid "Open Recent..."
 msgstr "Ava &hiljutised"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Ava kaardipakk"
 
@@ -2249,7 +2283,7 @@ msgstr "Ava kaardipakk"
 msgid "Open the bug tracker"
 msgstr "Ava vigade seiresüsteem."
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Ava kaardipakk"
@@ -2258,7 +2292,7 @@ msgstr "Ava kaardipakk"
 msgid "Optimize Database"
 msgstr "Optimeeri andmebaas"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Laen kaardipakki..."
@@ -2280,7 +2314,7 @@ msgstr "Pakitud Anki kaardipakk (*.zip)"
 msgid "Password"
 msgstr "Salasõna"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Salasõna:"
 
@@ -2311,6 +2345,10 @@ msgstr "Lisa kõigepealt uus väli."
 msgid "Please add another model first."
 msgstr "Lisa kõigepealt teine mudel."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Palun vali väli, mille järgi sortida."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Palun kontrollige kasutajanime ja salasõna."
@@ -2320,7 +2358,7 @@ msgstr "Palun kontrollige kasutajanime ja salasõna."
 msgid "Please enable a different template first."
 msgstr "Palun võimalda kõigepealt teine mudel."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Palun sisesta korrektne alguse ja lõppu vahemik."
 
@@ -2332,11 +2370,11 @@ msgstr ""
 "Heli lindistamiseks palun paigalda <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Palun paigalda python-matplotlib, kui soovid graafikuid."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2394,7 +2432,7 @@ msgstr "Eelvaata kaarte"
 msgid "Previous colour (F7 then F6)"
 msgstr "Eelmine värv (F7, siis F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2411,7 +2449,7 @@ msgstr "Töötlen..."
 msgid "Put space between question and answer"
 msgstr "Eralda küsimus ja vastus"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Küsimus"
 
@@ -2435,7 +2473,7 @@ msgstr "Küsimuse suurus"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Segan..."
 
@@ -2456,12 +2494,12 @@ msgstr "Lindista heli (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Lindistan...<br>Kestvus: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Tee uuesti %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Värskenda"
 
@@ -2490,15 +2528,15 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "Korda &heli"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Asendan..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Kordamised"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Ajasta  uuesti"
 
@@ -2522,7 +2560,7 @@ msgstr "Korda"
 msgid "Review Time"
 msgstr "Kordamisaeg"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "Korda tähtaeguvad kaardid varakult"
@@ -2545,7 +2583,7 @@ msgstr "Diskreetimise vaikus...<br>Kestvus: %0.1f"
 msgid "Save &As..."
 msgstr "Salvesta &nimega..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Salvesta kaardipakk nimega"
 
@@ -2600,7 +2638,7 @@ msgstr "Märgi &kõik"
 msgid "Select None"
 msgstr "Märgi &kõik"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "Kaardi&paki statistika"
@@ -2627,7 +2665,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Näite vastus"
 
@@ -2692,7 +2730,7 @@ msgstr "Näita süsteemisalvel ikooni"
 msgid "Show/Hide"
 msgstr "Näita/Peida"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2704,7 +2742,7 @@ msgstr ""
 "See võib põhjustada palju probleeme sünkroniseerimisel.\n"
 "Sünkroniseerimine on blokeeritud kuniks Sa parandad selle probleemi."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Mõned väljad on puudu või ei ole kordumatud."
 
@@ -2713,7 +2751,7 @@ msgstr "Mõned väljad on puudu või ei ole kordumatud."
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Varsti"
 
@@ -2723,7 +2761,7 @@ msgstr "Sorteeri nagu numbreid"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Helid (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2734,7 +2772,7 @@ msgstr "Allika ID:"
 msgid "Spanish"
 msgstr "hispaania keel"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "&Alusta kordamist"
 
@@ -2746,7 +2784,7 @@ msgstr ""
 msgid "Startup"
 msgstr "Käivitus"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Seisund"
 
@@ -2755,14 +2793,14 @@ msgstr "Seisund"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Peata selle kaardi kordamine kuniks see on jälle lubatud redaktorist"
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Peatatud"
 
@@ -2770,7 +2808,7 @@ msgstr "Peatatud"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "Peatatud"
@@ -2779,7 +2817,7 @@ msgstr "Peatatud"
 msgid "Swedish"
 msgstr "rootsi keel"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2808,7 +2846,7 @@ msgstr "Sünkroniseeri see kaardipakk"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Sünkroniseeri see kaardipakk"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Sünkroniseeri meedia..."
 
@@ -2817,11 +2855,11 @@ msgstr "Sünkroniseeri meedia..."
 msgid "Syncing failed: %(a)s"
 msgstr "Sünkroniseerimine ebaõnnestus: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Sildista kaarte"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Sildista faktid dubleeritud väljadega selmet kustutada"
 
@@ -2829,11 +2867,11 @@ msgstr "Sildista faktid dubleeritud väljadega selmet kustutada"
 msgid "Tags"
 msgstr "Sildid"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Sildid, mida tuupida:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Eesmärgid peavad olema kordumatud."
 
@@ -2865,23 +2903,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr ""
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2889,7 +2927,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Sünkroniseerimise protokoll on muutunud. Palun uuenda rakendust."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr ""
 
@@ -2976,7 +3014,7 @@ msgstr ""
 "%s\n"
 "Sa pead kõigepealt eemaldama selle allika."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2994,7 +3032,7 @@ msgstr ""
 "<b>Seda tegevust ei saa tagasi võtta.</b><br>\n"
 "Soovid jätkata?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3032,7 +3070,7 @@ msgstr ""
 "\n"
 "Kas oled kindel, et kustutada need kaardid?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3040,7 +3078,7 @@ msgstr ""
 msgid "Title"
 msgstr "Pealkiri"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3052,7 +3090,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Tänased kordamised on lõppenud"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Näita tööriisariba"
 
@@ -3084,7 +3122,7 @@ msgid ""
 "\n"
 msgstr "Serveriga ühenduse võtmine ebaõnnestus."
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3106,11 +3144,11 @@ msgstr ""
 "\n"
 "Vandade kaardipakkide uuendamiseks laadi alla Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Faili laadimine ebaõnnestus."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3121,7 +3159,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Veast taastumine ebaõnnestus. Kaardipaki laadimine ebaõnnestus."
 
@@ -3133,7 +3171,7 @@ msgstr "Puhasta LaTeX vahemälu"
 msgid "Underline text (Ctrl+u)"
 msgstr "Allajoonitud tekst (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Võta tagasi %s"
@@ -3143,12 +3181,12 @@ msgstr "Võta tagasi %s"
 msgid "Unknown error: %s"
 msgstr ""
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "Peatatud"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3158,7 +3196,7 @@ msgstr ""
 " - Sa võid jätkata õppimist\n"
 " - palun ära sulge seda akent"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3184,7 +3222,7 @@ msgstr "Teistsugune suurust"
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
@@ -3227,16 +3265,16 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 #, fuzzy
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Muutub tuupimiseks. Esmalt, sulge praegune kaardibak."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3257,7 +3295,7 @@ msgstr "kaardid"
 msgid "days"
 msgstr "päeva"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "ees"
 
@@ -3265,7 +3303,7 @@ msgstr "ees"
 msgid "facts"
 msgstr "faktid"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "%s"
@@ -3274,16 +3312,16 @@ msgstr "%s"
 msgid "label"
 msgstr "sedel"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "maas"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "liidetud väljadele <b>%s</b>-ga"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "liidetud <b>siltidega</b>"
 
@@ -3590,9 +3628,6 @@ msgstr "üleminesedel"
 #~ msgid "Del"
 #~ msgstr "Del"
 
-#~ msgid "Dialog"
-#~ msgstr "Dialoog"
-
 #, fuzzy
 #~ msgid "Download Deck"
 #~ msgstr "Lae alla ühiskasutusega kaardipakk"
@@ -3639,9 +3674,6 @@ msgstr "üleminesedel"
 #~ msgid "Please add a new card first."
 #~ msgstr "Lisa kõigepealt uus kaart."
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Palun vali väli, mille järgi sortida."
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Korda &vastuse heli"
 
diff --git a/ankiqt/locale/ankiqt_es_ES.po b/ankiqt/locale/ankiqt_es_ES.po
index 4d820a851..1a054c68c 100644
--- a/ankiqt/locale/ankiqt_es_ES.po
+++ b/ankiqt/locale/ankiqt_es_ES.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anki 0.9.7.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-06-08 20:55+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <pcsl88@gmail.com>\n"
@@ -35,17 +35,17 @@ msgstr ""
 msgid "  Stop"
 msgstr " Parar"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 #, fuzzy
 msgid " (and proxy settings)"
 msgstr "Compruebe también su configuración del proxy."
@@ -73,11 +73,11 @@ msgstr " <b>Al editar (anula lo superior):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Al repasar y editar:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Por favor, asegurese de que está ajustado correctamente y reinicie Anki."
 
@@ -86,7 +86,7 @@ msgstr "Por favor, asegurese de que está ajustado correctamente y reinicie Anki
 msgid " applied %d modified cards."
 msgstr " aplicados %d tarjetas modificadas."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -106,7 +106,7 @@ msgstr[1] "%(name)s [%(facts)d hechos]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d de %(totalSum)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d of %(cards)d programadas) - %(title)s"
@@ -123,40 +123,40 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d exportadas."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, fuzzy, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] "%d referencia no encontrada."
 msgstr[1] "%d referencias no encontradas."
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] "%d referencia no encontrada."
 msgstr[1] "%d referencias no encontradas."
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d seleccionada"
 msgstr[1] "%d seleccionadas"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] "%d archivo no usado eliminado."
 msgstr[1] "%d archivo no usados eliminados."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "Hace %s"
@@ -284,7 +284,7 @@ msgstr "&Gráficas..."
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importar"
 
@@ -387,12 +387,12 @@ msgstr "&Deshacer"
 msgid "&Unsuspend Cards"
 msgstr "&Activar Hechos"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(nueva tarjeta)"
 
@@ -428,7 +428,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr "<Filtro>"
 
@@ -445,7 +445,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ay
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ayuda</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ayuda</a>"
@@ -482,11 +482,11 @@ msgstr "<b>Respuesta</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Tarjetas</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 msgid "<b>Deck</b>"
 msgstr "<b>Mazo</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Programadas</b>"
@@ -565,7 +565,7 @@ msgstr "<b>Nuevas tarjetas por día:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>El nuevo día empieza a las</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nuevo</b>"
@@ -607,7 +607,7 @@ msgstr "<b>Multiplicador de espaciado</b>:"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Desactivadas</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 msgid "<b>Tags to append</b>:"
 msgstr "<b>Etiquetas a añadir:</b>:"
 
@@ -637,7 +637,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Prioridad Muy Alta</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -689,7 +689,7 @@ msgstr "<h1>Respaldos</h1>Los mazos son respaldados cuando están abierto, y sol
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Plantillas de Tarjetas</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -703,7 +703,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Acumulativo de las Programadas</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Tarjeta actual</h1>"
 
@@ -743,11 +743,11 @@ msgstr "<h1>Intervalos</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Idioma</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Última tarjeta</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Saber Más</h1>Pulsa el reloj en la barra de herramientas para terminar."
 
@@ -755,7 +755,7 @@ msgstr "<h1>Saber Más</h1>Pulsa el reloj en la barra de herramientas para termi
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modelos</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Cuenta Online</h1>Parar su <a href=\"http://anki.ichi2.net/\">cuenta online</a> gratuita,<br>por favor introduzca sus detalles a continuación.<br><br>Puede cambiar sus detalles despues con<br>Ajustes->Preferencias->Sincronización<br>"
 
@@ -779,7 +779,7 @@ msgstr "<h1>Reps</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Tiempo de Repaso</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Repasando Anticipadamente</h1>Pulsa el reloj en la barra de herramientas para terminar."
 
@@ -791,7 +791,7 @@ msgstr "<h1>Repasando</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Seleccionar Campo de Destino</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<b>Opciones de Estudio</b>"
 
@@ -807,7 +807,7 @@ msgstr "<h1>Sincronización</h1><a href=\"http://anki.ichi2.net/\">Crear una cue
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Sincronizar</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -829,11 +829,11 @@ msgstr ""
 "        guardados. ¿Desea guardarlos, descartarlos\n"
 "        o cancelar?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>¡Bien hecho!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignorado>"
 
@@ -886,7 +886,7 @@ msgstr "Añadir Material"
 msgid "Add Model"
 msgstr "Añadir Modelo"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Añadir Etiquetas"
 
@@ -937,7 +937,7 @@ msgstr "Avanzado"
 msgid "Again"
 msgstr "Otra vez"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Todos los Campos"
 
@@ -949,16 +949,16 @@ msgstr "Todos los Repasos"
 msgid "Allow the answer to be blank"
 msgstr "Permitir respuestas en blanco"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Empollando ya. Por favor, cierre antes el mazo."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr "Alt+m"
 
@@ -975,7 +975,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "Ha ocurrido un error mientras se abría %s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
@@ -983,7 +983,7 @@ msgstr ""
 "Ocurrió un error en un complemento. Por favor, contacte con el autor del complemento.<br>\n"
 "Por favor, no use el aviso de fallo de Anki.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -993,7 +993,7 @@ msgstr ""
 "¿Le gustaría comprobar errores en el mazo?\n"
 "Esto quizá tarde un tiempo."
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1011,8 +1011,8 @@ msgstr ""
 "Si eso no arregla el problema, por favor copie lo siguiente<br>\n"
 "en un aviso de fallo:<br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1020,7 +1020,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 "Anki no pudo guardar su archivo de configuración:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Respuesta"
 
@@ -1057,6 +1057,15 @@ msgstr "Aplicar la etiqueta 'marcada' a este hecho, para encontrarla más tarde
 msgid "Applying reply..."
 msgstr "Aplicando respuesta..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "Tiempo medio por respuesta:"
@@ -1100,7 +1109,7 @@ msgstr "Explorar Elementos"
 msgid "Browse and edit all items"
 msgstr "Explorar y editar todos los elementos"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1111,14 +1120,21 @@ msgstr[1] "Explorador (%(cur)d of %(tot)d tarjetas mostradas; %(sel)s)"
 msgid "Browser Font"
 msgstr "Fuente del Explorador"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Reconstruyendo Índice..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr "Enterrar"
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "E&mpollar..."
@@ -1127,15 +1143,15 @@ msgstr "E&mpollar..."
 msgid "Cache LaTeX"
 msgstr "Caché LaTeX"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Puede cambiar solamente un modelo a la vez."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Solo se puede operar con un modelo a la vez"
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1174,19 +1190,19 @@ msgstr "Tarjetas esperando"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr "Tarjetas/día:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr "Tarjetas/sesión:"
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Cambiar"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "Cambiar %s a:"
@@ -1195,7 +1211,7 @@ msgstr "Cambiar %s a:"
 msgid "Change &Model..."
 msgstr "Cambiar &Modelo..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Cambiar Modelo"
 
@@ -1207,7 +1223,7 @@ msgstr "Comprobar Base de Datos Multimedia..."
 msgid "Check complete."
 msgstr "Comprobación completada."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1219,7 +1235,7 @@ msgstr "Comprobar errores en la base de datos"
 msgid "Check the files in the media directory"
 msgstr "Comprobar archivos del directorio media"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr "Comprobando mazo %(x)d de %(y)d..."
@@ -1289,7 +1305,7 @@ msgstr "Configurar opciones de repaso"
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "Continuar &Repasando"
 
@@ -1318,15 +1334,15 @@ msgstr "Correctas hoy:"
 msgid "Correct under a month: "
 msgstr "Correctas antes de un mes:"
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "No se pueden reproducir sonidos. Por favor, instale mplayer."
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Empollar"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "¿Empollar las tarjetas seleccionadas en un nuevo mazo?"
 
@@ -1340,11 +1356,11 @@ msgstr "Creada"
 msgid "Create '%s' on server"
 msgstr "Creado '%s' en el servidor"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Creada"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1490,7 +1506,7 @@ msgstr "Personalizar sincronización, programación, prioridades y modelos"
 msgid "Czech"
 msgstr "Checo"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1507,32 +1523,32 @@ msgstr "Gráficas del Mazo"
 msgid "Deck Properties"
 msgstr "Propiedades del Mazo"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Archivos de mazo (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "El mazo está ya abierto."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, python-format
 msgid "Delete %s?"
 msgstr "¿Eliminar %s?"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Eliminar Tarjetas"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Eliminar Refs"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Eliminar Etiquetas"
 
@@ -1548,11 +1564,15 @@ msgstr "Eliminar la tarjeta mostrada actualmente"
 msgid "Determining differences..."
 msgstr "Determinando las diferencias..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Diálogo"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Desac&tivar"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Descartar campo"
 
@@ -1607,7 +1627,7 @@ msgstr "Descargar un complemento para añadir nuevas característica o cambiar e
 msgid "Downloaded %dKB"
 msgstr "Descargas"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr "Descargados %dKB desde el servidor..."
@@ -1620,7 +1640,7 @@ msgstr "Descargando..."
 msgid "Downloads"
 msgstr "Descargas"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Programada"
@@ -1634,7 +1654,7 @@ msgstr "S&alir"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "ETA: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Dificultad"
 
@@ -1662,7 +1682,7 @@ msgstr "Editar el elemento mostrado actualmente"
 msgid "Ena&ble"
 msgstr "Acti&var"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1670,11 +1690,11 @@ msgstr ""
 msgid "English"
 msgstr "Inglés"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Introduzca las etiquetas que se añadiran:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Introduzca las etiquetas que se eliminarán:"
 
@@ -1718,7 +1738,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1742,7 +1762,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr "Hecho Creado"
 
@@ -1750,7 +1770,7 @@ msgstr "Hecho Creado"
 msgid "Facts"
 msgstr "Hechos"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Error al subir multimedia. Por favor, ejecute 'Comprobar BD Multimedia'"
 
@@ -1778,12 +1798,12 @@ msgstr "Campo %(num)d: %(name)s [%(cards)s no vacíos]"
 msgid "Field %d"
 msgstr "Campo %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "El campo <b>%d</b> del archivo es:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Asignar campos"
 
@@ -1799,7 +1819,7 @@ msgstr "Fil&tros"
 msgid "Find and Re&place..."
 msgstr "Buscar y Re&emplazar."
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Buscar y Reemplazar."
 
@@ -1819,16 +1839,16 @@ msgstr "Fuente..."
 msgid "Fonts & Colours"
 msgstr "Fuentes & colores"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 msgid "Forget"
 msgstr "Olvidado"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Olvidado"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr "Olvidar borra el mazo de la lista sin eliminarlo"
 
@@ -1844,11 +1864,11 @@ msgstr "Comprobar Base de Datos completa..."
 msgid "General && Fields"
 msgstr "General && Campos"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Crear Tarjetas"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Produciendo Tarjetas..."
 
@@ -1904,8 +1924,8 @@ msgstr "Ignorar esta actualización"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Imágenes (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importar"
 
@@ -1913,24 +1933,24 @@ msgstr "Importar"
 msgid "Import cards from text files, Anki files and more"
 msgstr "Importar tarjetas desde archivos de texto, archivos Anki y más"
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 msgid "Import failed.\n"
 msgstr "Importación errónea.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Importar opciones"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Importación completada. %(num)d hechos importados de %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Error al importar.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Importando..."
 
@@ -1947,11 +1967,11 @@ msgstr "Incluir información de programación"
 msgid "Include tags"
 msgstr "Incluir etiquetas"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervalo"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Expresión regular incorrecta"
 
@@ -1959,14 +1979,14 @@ msgstr "Expresión regular incorrecta"
 msgid "Invert"
 msgstr "Invertir"
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] "Está %(sec)d segundos %(type)s.\n"
 msgstr[1] "Está %(sec)d segundos %(type)s.\n"
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2001,6 +2021,11 @@ msgstr "Conservar"
 msgid "Korean"
 msgstr "Coreano"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Dificultad"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l, l)"
@@ -2013,16 +2038,16 @@ msgstr "Ecuación Latex (Ctrl+l, e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Entorno matemático Latex (Ctrl+l, m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Checo"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Cargando mazo..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Cargando gráficas (puede tardar un rato)..."
 
@@ -2030,20 +2055,25 @@ msgstr "Cargando gráficas (puede tardar un rato)..."
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Log de la importación:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Asignar a %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Asignar a Etiquetas"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr "Marcada"
 
@@ -2074,7 +2104,7 @@ msgstr "Propiedades del Modelo"
 msgid "Models && Priorities"
 msgstr "Modelos && Prioridades"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Modificada"
 
@@ -2082,7 +2112,7 @@ msgstr "Modificada"
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr "Más"
 
@@ -2110,6 +2140,10 @@ msgstr "Mover abajo el campo seleccionado"
 msgid "Move selected field up"
 msgstr "Mover arriba el campo seleccionado"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Nombre"
@@ -2122,11 +2156,11 @@ msgstr "Nombre en el servidor:"
 msgid "Network"
 msgstr "Red"
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr "Nuevas hoy:"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr "Nuevas totales:"
 
@@ -2138,7 +2172,7 @@ msgstr "Siguiente color (F7, F8)"
 msgid "Next field must be blank."
 msgstr "El siguiente campo debe estar vacío."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Ninguna tarjeta tiene la etiqueta introducida"
 
@@ -2150,15 +2184,15 @@ msgstr "No hay tarjetas para previsualizar."
 msgid "No changes found."
 msgstr "No se encontró ningún cambio."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "No hay tarjeta actual ni anterior."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr "Sin etiquetas de hecho"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2166,7 +2200,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "Nada"
 
@@ -2174,11 +2208,11 @@ msgstr "Nada"
 msgid "Nothing selected."
 msgstr "Nada seleccionado."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 msgid "Open"
 msgstr "Abrir"
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Abrir &Reciente"
@@ -2188,7 +2222,7 @@ msgstr "Abrir &Reciente"
 msgid "Open Recent..."
 msgstr "Abrir &Reciente"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Abrir mazo"
 
@@ -2196,7 +2230,7 @@ msgstr "Abrir mazo"
 msgid "Open the bug tracker"
 msgstr "Abrir la base de datos de fallos"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, python-format
 msgid "Open this deck%s"
 msgstr "Abrir este mazo%s"
@@ -2205,7 +2239,7 @@ msgstr "Abrir este mazo%s"
 msgid "Optimize Database"
 msgstr "Optimizar Base de Datos"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 msgid "Ordering..."
 msgstr "Ordenando..."
 
@@ -2226,7 +2260,7 @@ msgstr "Mazo Anki Empaquetado (*.zip)"
 msgid "Password"
 msgstr "Contraseña"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -2255,6 +2289,10 @@ msgstr "Por favor, añada antes una nueva plantilla."
 msgid "Please add another model first."
 msgstr "Por favor, añada otro modelo antes."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Elija un campo por el que ordenar las tarjetas."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Por favor, revise dos veces su usuario y contraseña."
@@ -2263,7 +2301,7 @@ msgstr "Por favor, revise dos veces su usuario y contraseña."
 msgid "Please enable a different template first."
 msgstr "Por favor, active une plantilla diferente antes."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Por favor, introduzca un rango inicial y final válido."
 
@@ -2275,11 +2313,11 @@ msgstr ""
 "Por favor, instale <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "para activar la grabación."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Por favor, instale python-matplotlib para ver las gráficas."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Por favor, reinicie Anki antes de comprobar la BD"
 
@@ -2335,7 +2373,7 @@ msgstr "Previsualizar Tarjetas"
 msgid "Previous colour (F7 then F6)"
 msgstr "Color anterior (F7, F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2352,7 +2390,7 @@ msgstr "Procesando..."
 msgid "Put space between question and answer"
 msgstr "Poner espacio entre la pregunta y la respuesta"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Pregunta"
 
@@ -2376,7 +2414,7 @@ msgstr "Tamaño de la pregunta"
 msgid "Quick Database Check"
 msgstr "Rápida Comprobación de la Base de Datos"
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Distribuyendo Aleatoriamente..."
 
@@ -2397,12 +2435,12 @@ msgstr "Grabar sonido (F4)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Grabando...<br>Tiempo: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Deshacer %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Actualizar"
 
@@ -2430,15 +2468,15 @@ msgstr "Eliminar espacio no usado, haciendo el fichero de la base de datos menor
 msgid "Repeat &Audio"
 msgstr "Repetir &Sonido"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Reemplazando..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Reps"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Reprogramar"
 
@@ -2462,7 +2500,7 @@ msgstr "Repaso"
 msgid "Review Time"
 msgstr "Tiempo de Repaso"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr "Repasos previsto:"
 
@@ -2483,7 +2521,7 @@ msgstr "Muestreo digital del silencio...<br>Tiempo: %0.1f"
 msgid "Save &As..."
 msgstr "Guardar &Como..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Guardar Mazo Como"
 
@@ -2535,7 +2573,7 @@ msgstr "Seleccionar Todo"
 msgid "Select None"
 msgstr "Seleccionar Nada"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr "Estadísticas de la Sesión"
 
@@ -2561,7 +2599,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Mostrar Respuesta"
 
@@ -2625,7 +2663,7 @@ msgstr "Mostrar icono en la barra de tareas"
 msgid "Show/Hide"
 msgstr "Ocultar/Mostrar"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
@@ -2633,7 +2671,7 @@ msgstr ""
 "Como esto puede causar muchos problemas al sincronizar la,\n"
 "sincronización está desactivada hasta que arregle este problema."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Algunos campos faltan o no son únicos."
 
@@ -2642,7 +2680,7 @@ msgstr "Algunos campos faltan o no son únicos."
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Algunos ajustes tendrán efecto después de reiniciar Anki."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Próximamente"
 
@@ -2652,7 +2690,7 @@ msgstr "Ordenar como números"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Sonidos (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2663,7 +2701,7 @@ msgstr "ID de la fuente:"
 msgid "Spanish"
 msgstr "Español"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "Empezar &Repaso"
 
@@ -2675,7 +2713,7 @@ msgstr "Empiece añadiendo su propio material"
 msgid "Startup"
 msgstr "Arranque"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Estado"
 
@@ -2683,14 +2721,14 @@ msgstr "Estado"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Dejar de repasar esta tarjeta hasta que sea activada en el explorador."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Suspender"
 
@@ -2698,7 +2736,7 @@ msgstr "Suspender"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr "Suspender el hecho actual hasta que el mazo sea cerrado y abierto de nuevo"
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr "Suspendida"
 
@@ -2706,7 +2744,7 @@ msgstr "Suspendida"
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 #, fuzzy
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
@@ -2737,7 +2775,7 @@ msgstr "Sincronizar este mazo"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Sincronizar este mazo con Anki Online"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Sincronizando Multimedia..."
 
@@ -2746,11 +2784,11 @@ msgstr "Sincronizando Multimedia..."
 msgid "Syncing failed: %(a)s"
 msgstr "Sincronización fallida: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Etiquetas de Tarjetas"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Etiquetar hechos con campos duplicados en lugar de eliminar"
 
@@ -2758,11 +2796,11 @@ msgstr "Etiquetar hechos con campos duplicados en lugar de eliminar"
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Etiquetas a empollar:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "El objetivo debe ser único"
 
@@ -2794,23 +2832,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr "El máximo número de <b>nuevas tarjetas mostradas pro día</b>. Por defecto es 20, para asegurarse de que no se vea abrumado después de unos pocos días."
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "El número de tarjetas que esperan repaso hoy"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "El número de tarjetas que estudió en la sesión actual (azul) y la sesión previa (negro)"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "El número de tarjetas que estudió hoy (azul) y ayer (negro)"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr "El número de minutos que estudió hoy (azul) y ayer (negro)"
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "El número total de nuevas tarjetas que esperan ser aprendidas hoy"
 
@@ -2818,7 +2856,7 @@ msgstr "El número total de nuevas tarjetas que esperan ser aprendidas hoy"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "El protocolo de sincronización ha cambiado. Por favor, actualize."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr "El número total de nuevas tarjetas en el mazo"
 
@@ -2905,7 +2943,7 @@ msgstr ""
 "%s\n"
 "Necesitará eleminar el origen primero."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2923,7 +2961,7 @@ msgstr ""
 "<b>Esta operación no es reversible.</b><br>\n"
 "¿Continuar?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2962,7 +3000,7 @@ msgstr ""
 "\n"
 "¿Realmente desea eliminar estas tarjetas?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr "Tiempo/día:"
 
@@ -2970,7 +3008,7 @@ msgstr "Tiempo/día:"
 msgid "Title"
 msgstr "Título"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2982,7 +3020,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Los repasos han acabado por hoy"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Activar Barra de Herramientas"
 
@@ -3013,7 +3051,7 @@ msgid ""
 "\n"
 msgstr "Imposible conectar al servidor."
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3035,11 +3073,11 @@ msgstr ""
 "\n"
 "Para actualizar un mazo antiguo, descargue Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Imposible cargar el archivo."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3050,7 +3088,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Imposible la recuperación. Carga del mazo fallida."
 
@@ -3062,7 +3100,7 @@ msgstr "Sin Caché LaTeX"
 msgid "Underline text (Ctrl+u)"
 msgstr "Texto subrayado (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Deshacer %s"
@@ -3072,11 +3110,11 @@ msgstr "Deshacer %s"
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 msgid "Unsuspend"
 msgstr "Activar"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3086,7 +3124,7 @@ msgstr ""
 " - puede seguir estudiando\n"
 " - por favor, no cierre esto"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr "Subidos %dKB al servidor..."
@@ -3111,7 +3149,7 @@ msgstr "Personalizar tamaño"
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
@@ -3154,15 +3192,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Está empollando actualmente. Por favor, cierre antes el mazo."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr "El reloj de su ordenador no se ajusta a la hora correcta.\n"
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3183,7 +3221,7 @@ msgstr "tarjetas"
 msgid "days"
 msgstr "días"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "anticipadamente"
 
@@ -3191,7 +3229,7 @@ msgstr "anticipadamente"
 msgid "facts"
 msgstr "hechos"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "en %s"
@@ -3200,16 +3238,16 @@ msgstr "en %s"
 msgid "label"
 msgstr "etiqueta"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "retrasado"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "asignado a <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "asignado a <b>Etiquetas</b>"
 
@@ -3590,9 +3628,6 @@ msgstr "toplabel"
 #~ msgid "Del"
 #~ msgstr "Supr"
 
-#~ msgid "Dialog"
-#~ msgstr "Diálogo"
-
 #~ msgid "Download Deck"
 #~ msgstr "Descargar Mazo"
 
@@ -3670,9 +3705,6 @@ msgstr "toplabel"
 #~ msgid "Please check the proxy settings."
 #~ msgstr "Por favor, compruebe la configuración del proxy"
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Elija un campo por el que ordenar las tarjetas."
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Repetir &Respuesta de Sonido"
 
diff --git a/ankiqt/locale/ankiqt_fi_FI.po b/ankiqt/locale/ankiqt_fi_FI.po
index 16ab1ed80..1c10d252d 100644
--- a/ankiqt/locale/ankiqt_fi_FI.po
+++ b/ankiqt/locale/ankiqt_fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt_fi_FI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-03-22 11:12+0200\n"
 "Last-Translator: Niklas Laxström <niklas.laxstrom AT gmail.com>\n"
 "Language-Team: Finnish <>\n"
@@ -40,17 +40,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "  Pysäytä"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -77,11 +77,11 @@ msgstr " <b>Muokatessa (korvaa yllä olevan):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Kerratessa ja muokatessa:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 #, fuzzy
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Anna kelvollinen alku ja loppu välille."
@@ -92,7 +92,7 @@ msgstr "Anna kelvollinen alku ja loppu välille."
 msgid " applied %d modified cards."
 msgstr " päivitettiin %d muutettua korttia."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, fuzzy, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -112,7 +112,7 @@ msgstr[1] "%(name)s [%(facts)d faktaa]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(cards)d korttia, joista %(due)d erääntynyt) – %(title)s"
@@ -129,33 +129,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d viety."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "Ei valintaa."
 msgstr[1] "Ei valintaa."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -166,7 +166,7 @@ msgstr[1] ""
 "%(a)d puuttuvaa viittausta.\n"
 "%(b)d käyttämätöntä tiedostoa poistettiin."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s sitten"
@@ -299,7 +299,7 @@ msgstr "&Kuvaajat..."
 msgid "&Help"
 msgstr "&Ohje"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Tuo"
 
@@ -403,12 +403,12 @@ msgstr "&Kumoa"
 msgid "&Unsuspend Cards"
 msgstr "&Jäädytä fakta"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "’%s’"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(uusi)"
 
@@ -445,7 +445,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "Tägisuodin"
@@ -463,7 +463,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Oh
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ohje</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ohje</a>"
@@ -500,12 +500,12 @@ msgstr "<b>Vastaus</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Kortit</b>"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Nimi</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Nimi</b>"
@@ -587,7 +587,7 @@ msgstr "<b>Uusia kortteja päivässä:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Uusi päivä alkaa kello</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nimi</b>"
@@ -631,7 +631,7 @@ msgstr "<b>Etäisyyskerroin</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Jäädytetty</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "Lisättävät tägit:"
@@ -662,7 +662,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Hyvin korkea prioriteetti</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -713,7 +713,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Korttimallit</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -724,7 +724,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Erääntyvät kortit kasautuvasti</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Tämä kortti</h1>"
 
@@ -765,11 +765,11 @@ msgstr "<h1>Kertaamisaikavälit</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Kieli</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Edellinen kortti</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -777,7 +777,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Mallit</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 #, fuzzy
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Verkkotunnus</h1> Jos haluat käyttää <a href=\"http://anki.ichi2.net/\">verkkotunnusta</a>,<br>täydennä tunnuksen tiedot alle.<br>"
@@ -803,7 +803,7 @@ msgstr "<h1>Kertaukset</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Kertausaika</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -815,7 +815,7 @@ msgstr "<h1>Kertaaminen</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Valitse kohdekentät</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Kertaustilanne</h1>"
 
@@ -831,7 +831,7 @@ msgstr "<h1>Synkronointi</h1><a href=\"http://anki.ichi2.net/\">Luo ilmainen tun
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Synkronointi</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -850,11 +850,11 @@ msgid ""
 "        changes, or cancel?"
 msgstr "<h1>Tallentamattomia muutoksia</h1> Sinulla on tallentamattomia muutoksia. Haluatko tallentaa, heittää pois vai peruuttaa?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Hienoa</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<hylätty>"
 
@@ -908,7 +908,7 @@ msgstr "Lisää materiaalia"
 msgid "Add Model"
 msgstr "Mallin lisäys"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Lisää tägejä"
 
@@ -959,7 +959,7 @@ msgstr "Lisäasetukset"
 msgid "Again"
 msgstr "Uudestaan"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Kaikki kentät"
 
@@ -972,16 +972,16 @@ msgstr "Kertaa"
 msgid "Allow the answer to be blank"
 msgstr "Vastaus saa olla tyhjä"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Olet jo pänttäystilassa. Sulje pakka ensin."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+%d"
@@ -999,7 +999,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "Kohteen %s avaaminen epäonnistui."
 
-#: ui/main.py:201
+#: ui/main.py:202
 #, fuzzy
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
@@ -1008,7 +1008,7 @@ msgstr ""
 "Liitännäisessä tapahtui virhe. Ota yhteyttä liitännäisen tekijään.<br>\n"
 "Tämä ei ole virhe Ankissa.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1018,7 +1018,7 @@ msgstr ""
 "Haluatko tarkistaa pakan virheiden varalta?\n"
 "Se voi kestää hetken."
 
-#: ui/main.py:192
+#: ui/main.py:193
 #, fuzzy
 msgid ""
 "An error occurred. Please:<p>\n"
@@ -1036,8 +1036,8 @@ msgstr ""
 "</ol>\n"
 "Jos se ei korjaa ongelmaa, liitä seuraavat tiedot virheraporttiin:<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1045,7 +1045,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1054,7 +1054,7 @@ msgstr ""
 "Asetustiedoston tallentaminen epäonnistui:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Vastaus"
 
@@ -1082,6 +1082,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr "Päivitetään paikallisia tietoja..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 #, fuzzy
 msgid "Average time per answer: "
@@ -1127,7 +1136,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1139,14 +1148,21 @@ msgstr[1] "Muokkain (näkyvissä %(cur)d korttia %(tot)d kortista; %(sel)d valit
 msgid "Browser Font"
 msgstr "Vastauksen kirjasin"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Luodaan pikahakuluetteloa..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "Pä&nttäys..."
@@ -1155,15 +1171,15 @@ msgstr "Pä&nttäys..."
 msgid "Cache LaTeX"
 msgstr "Luo välimuisti LaTeX-merkinnöistä"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Voit muuttaa vain yhtä mallia kerrallaan."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Vain yhtä mallia voi käsitellä kerrallaan."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1202,20 +1218,20 @@ msgstr "Kortteja odottaa"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "Kortit"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Muuta"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "%s →"
@@ -1224,7 +1240,7 @@ msgstr "%s →"
 msgid "Change &Model..."
 msgstr "Vaihda &mallia..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Vaihda mallia"
 
@@ -1236,7 +1252,7 @@ msgstr "Tarkista mediatietokanta..."
 msgid "Check complete."
 msgstr "Tarkistus on valmis."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1248,7 +1264,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1319,7 +1335,7 @@ msgstr "Jatka kertaamista"
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "Jatka &kertaamista"
 
@@ -1348,15 +1364,15 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Pänttäys"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1370,11 +1386,11 @@ msgstr "Luomisaika"
 msgid "Create '%s' on server"
 msgstr "Luo ”%s” palvelimella"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Luomisaika"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1525,7 +1541,7 @@ msgstr "Mukauta synkronointia, ajastusta, prioriteetteja ja malleja."
 msgid "Czech"
 msgstr "tšekki"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1542,32 +1558,32 @@ msgstr "Tilastoja pakasta"
 msgid "Deck Properties"
 msgstr "Pakan ominaisuudet"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Pakat (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Pakka on jo avoin."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Poista"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Poista viittaukset"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Poista kortit"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Poista viittaukset"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Poista tägit"
 
@@ -1583,11 +1599,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "Etsitään eroavaisuuksia..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Poista &käytöstä"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Hylkää kenttä"
 
@@ -1642,7 +1662,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "Latauksia"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1656,7 +1676,7 @@ msgstr "&Lataa..."
 msgid "Downloads"
 msgstr "Latauksia"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Erääntyvät kortit"
@@ -1670,7 +1690,7 @@ msgstr "&Lopeta"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "ETA: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Helppous"
 
@@ -1698,7 +1718,7 @@ msgstr ""
 msgid "Ena&ble"
 msgstr "Ota &käyttöön"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1706,11 +1726,11 @@ msgstr ""
 msgid "English"
 msgstr "englanti"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Lisättävät tägit:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Poistettavat tägit:"
 
@@ -1754,7 +1774,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1778,7 +1798,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Luomisaika"
@@ -1787,7 +1807,7 @@ msgstr "Luomisaika"
 msgid "Facts"
 msgstr "Faktoja"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Median lähettäminen epäonnistui. Aja Työkalut→Aputoiminnot→Tarkista mediatietokanta."
 
@@ -1815,12 +1835,12 @@ msgstr "Kenttä %(num)d: %(name)s [%(cards)s ei-tyhjää]"
 msgid "Field %d"
 msgstr "Kenttä %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Tiedoston <b>%d.</b> kenttä on:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Kenttäliitokset"
 
@@ -1837,7 +1857,7 @@ msgstr "Tägisuodin"
 msgid "Find and Re&place..."
 msgstr "&Etsi ja korvaa..."
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Etsi ja korvaa"
 
@@ -1858,17 +1878,17 @@ msgstr "&Lahjoita..."
 msgid "Fonts & Colours"
 msgstr "Kirjasimet ja värit"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Lisäasetukset"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Lisäasetukset"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1885,11 +1905,11 @@ msgstr "Tarkista tietokannan eheys..."
 msgid "General && Fields"
 msgstr "Tiedot ja kentät"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Korttien luonti"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Luodaan kortteja..."
 
@@ -1946,8 +1966,8 @@ msgstr "Unohda tämä päivitys"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Kuvatiedostot (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Tuo"
 
@@ -1955,25 +1975,25 @@ msgstr "Tuo"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Tuonti epäonnistui.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Tuonnin asetukset"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Tuonti on valmis. %(num)d faktaa tuotiin tiedostosta %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Tuonti epäonnistui.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Tuodaan..."
 
@@ -1990,11 +2010,11 @@ msgstr "Liitä ajastustiedot"
 msgid "Include tags"
 msgstr "Liitä tägit"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Kertausvälit"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Säännöllinen lauseke on virheellinen."
 
@@ -2002,14 +2022,14 @@ msgstr "Säännöllinen lauseke on virheellinen."
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2040,6 +2060,11 @@ msgstr ""
 msgid "Korean"
 msgstr "korea"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Helppousjakauma"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l ja sitten l)"
@@ -2052,16 +2077,16 @@ msgstr "Latex-yhtälö (Ctrl+l ja sitten e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Latex-matematiikkaympäristö (Ctrl+l ja sitten m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "tšekki"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Ladataan pakkaa..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Luodaan kuvaajia..."
 
@@ -2069,20 +2094,25 @@ msgstr "Luodaan kuvaajia..."
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Tuontiloki:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Liitä kenttään %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Liitä tägeihin"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Vaikea"
@@ -2113,7 +2143,7 @@ msgstr "Mallin ominaisuudet"
 msgid "Models && Priorities"
 msgstr "Malli ja prioriteetit"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Muokkausaika"
 
@@ -2121,7 +2151,7 @@ msgstr "Muokkausaika"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Lisäasetukset"
@@ -2150,6 +2180,10 @@ msgstr "Siirrä valittua kenttää alas"
 msgid "Move selected field up"
 msgstr "Siirrä valittua kenttää ylös"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Nimi"
@@ -2162,12 +2196,12 @@ msgstr "Nimi palvelimella: "
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "&Kertaa erääntymättömiä kortteja etukäteen"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "&Kertaa erääntymättömiä kortteja etukäteen"
@@ -2180,7 +2214,7 @@ msgstr "Seuraava väri (F7 ja sitten F8)"
 msgid "Next field must be blank."
 msgstr "Seuraavan kentän on oltava tyhjä."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Tägejä vastaavia kortteja ei ole."
 
@@ -2192,16 +2226,16 @@ msgstr "Ei esikatseltavia kortteja."
 msgid "No changes found."
 msgstr "Ei muutoksia."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Ei nykyistä tai edellistä korttia."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "Ei tägejä"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2210,7 +2244,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "korea"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "ei mitään"
 
@@ -2218,12 +2252,12 @@ msgstr "ei mitään"
 msgid "Nothing selected."
 msgstr "Ei valintaa."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Avaa..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Avaa &viimeaikainen"
@@ -2233,7 +2267,7 @@ msgstr "Avaa &viimeaikainen"
 msgid "Open Recent..."
 msgstr "Avaa &viimeaikainen"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Avaa pakka"
 
@@ -2242,7 +2276,7 @@ msgstr "Avaa pakka"
 msgid "Open the bug tracker"
 msgstr "Avaa virheenseurantajärjestelmä."
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Avaa pakka"
@@ -2251,7 +2285,7 @@ msgstr "Avaa pakka"
 msgid "Optimize Database"
 msgstr "Optimoi tietokanta"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Ladataan..."
@@ -2273,7 +2307,7 @@ msgstr "Pakattu Anki-pakka (*.zip)"
 msgid "Password"
 msgstr "Salasana"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -2304,6 +2338,11 @@ msgstr "Lisää ensin kenttä."
 msgid "Please add another model first."
 msgstr "Lisää toinen malli ensin."
 
+#: forms/sort.py:46
+#, fuzzy
+msgid "Please choose a field to sort by."
+msgstr "Lisää ensin kenttä."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Tarkista käyttäjätunnus ja salasana."
@@ -2313,7 +2352,7 @@ msgstr "Tarkista käyttäjätunnus ja salasana."
 msgid "Please enable a different template first."
 msgstr "Ota ensin toinen malli käyttöön."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Anna kelvollinen alku ja loppu välille."
 
@@ -2323,11 +2362,11 @@ msgid ""
 "to enable recording."
 msgstr "Nauhoittaminen vaatii <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>-ohjelmiston."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Asenna python-matplotlib, jos haluat käyttää kuvaajia."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Käynnistä Anki uudelleen ennen tietokannan tarkistamista."
 
@@ -2385,7 +2424,7 @@ msgstr "Esikatsele kortteja"
 msgid "Previous colour (F7 then F6)"
 msgstr "Edellinen väri (F7 ja sitten F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2402,7 +2441,7 @@ msgstr "Käsitellään..."
 msgid "Put space between question and answer"
 msgstr "Erota kysymys ja vastaus välillä"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Kysymys"
 
@@ -2426,7 +2465,7 @@ msgstr "Kirjasinkoko"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Satunnaistetaan..."
 
@@ -2447,12 +2486,12 @@ msgstr "Nauhoita ääni (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Nauhoitetaan...<br>Kesto: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Tee uudelleen %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Päivitä"
 
@@ -2481,15 +2520,15 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "&Toista ääni"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Korvataan..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Kertauksia"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Ajasta uudelleen"
 
@@ -2513,7 +2552,7 @@ msgstr "Kertaa"
 msgid "Review Time"
 msgstr "Kertaamisaika"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "&Kertaa erääntymättömiä kortteja etukäteen"
@@ -2536,7 +2575,7 @@ msgstr "Tallennetaan hiljaisuutta...<br>Kesto: %0.1f"
 msgid "Save &As..."
 msgstr "Tallenna &nimellä..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Tallenna pakka nimellä"
 
@@ -2591,7 +2630,7 @@ msgstr "Valitse &kaikki"
 msgid "Select None"
 msgstr "Valitse &kaikki"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "&Pakan tilastot"
@@ -2618,7 +2657,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Näytä vastaus"
 
@@ -2683,7 +2722,7 @@ msgstr "Näytä ilmoitusaluekuvake"
 msgid "Show/Hide"
 msgstr "Näytetyt kuvaajat"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2696,7 +2735,7 @@ msgstr ""
 "synkronoidessa, joten se on estetty kunnes\n"
 "korjaat ongelman."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Osa kentistä puuttuu tai ovat samat kuin toisessa kortissa."
 
@@ -2707,7 +2746,7 @@ msgstr ""
 "Jotkin asetukset tulevat voimaan vasta\n"
 "Ankin uudelleen käynnistämisen jälkeen."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Pian"
 
@@ -2717,7 +2756,7 @@ msgstr "Lajittele lukuna"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Äänet (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2728,7 +2767,7 @@ msgstr "Lähde-ID:"
 msgid "Spanish"
 msgstr "espanja"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "Aloita &kertaaminen"
 
@@ -2740,7 +2779,7 @@ msgstr "Aloita oman materiaalin lisääminen."
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Tila"
 
@@ -2749,14 +2788,14 @@ msgstr "Tila"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Lopettaa tämän kortin kertaamisen kunnes sen jäädytys poistetaan muokkaimella."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Jäädytä"
 
@@ -2764,7 +2803,7 @@ msgstr "Jäädytä"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "Jäädytä"
@@ -2773,7 +2812,7 @@ msgstr "Jäädytä"
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2802,7 +2841,7 @@ msgstr "Synkronoi tämä pakka"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synkronoi tämä pakka"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Synkronoidaan mediaa..."
 
@@ -2811,11 +2850,11 @@ msgstr "Synkronoidaan mediaa..."
 msgid "Syncing failed: %(a)s"
 msgstr "Synkronointi epäonnistui: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Tägää kortteja"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Merkitse epäuniikit faktat tägeillä poistamisen sijaan"
 
@@ -2823,11 +2862,11 @@ msgstr "Merkitse epäuniikit faktat tägeillä poistamisen sijaan"
 msgid "Tags"
 msgstr "Tägit"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Päntättävät tägit:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Kohteiden pitää olla ainutkertaisia."
 
@@ -2859,23 +2898,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr ""
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2883,7 +2922,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Synkronointiprotokolla on muuttunut. Anki täytyy päivittää."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr ""
 
@@ -2970,7 +3009,7 @@ msgstr ""
 "%s\n"
 "Poista lähde ensin."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2988,7 +3027,7 @@ msgstr ""
 "<b>Tämä operaatio on peruuttamaton</b><br>\n"
 "Haluatko jatkaa?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3026,7 +3065,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti poistaa nämä kortit?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3034,7 +3073,7 @@ msgstr ""
 msgid "Title"
 msgstr "Nimi"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3044,7 +3083,7 @@ msgstr "Kuvaajien näyttämiseen tarvittava dll-tiedosto puuttuu. Asenna:\n"
 msgid "Today's reviews are finished"
 msgstr "Tämän päivän kertaukset on tehty"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Näytä työkalurivi"
 
@@ -3076,7 +3115,7 @@ msgid ""
 "\n"
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3098,11 +3137,11 @@ msgstr ""
 "\n"
 "Jos haluat päivittää vanhan pakan, lataa Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Tiedoston lataaminen epäonnistui."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3113,7 +3152,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Virheestä palautuminen epäonnistui. Pakan lataaminen epäonnistui."
 
@@ -3125,7 +3164,7 @@ msgstr "Tyhjennä LaTeX-merkintöjen välimuisti"
 msgid "Underline text (Ctrl+u)"
 msgstr "Alleviivaa (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Kumoa %s"
@@ -3135,12 +3174,12 @@ msgstr "Kumoa %s"
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "Jäädytä"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3150,7 +3189,7 @@ msgstr ""
 " - voit jatkaa kertausta\n"
 " - älä sulje tätä ikkunaa"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3176,7 +3215,7 @@ msgstr "Käytä kirjasinkokoa"
 msgid "Username"
 msgstr "Tunnus"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Tunnus:"
 
@@ -3219,16 +3258,16 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 #, fuzzy
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Olet jo pänttäystilassa. Sulje pakka ensin."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3249,7 +3288,7 @@ msgstr "vastatun kortin jälkeen"
 msgid "days"
 msgstr "päiv."
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "aikaisessa"
 
@@ -3257,7 +3296,7 @@ msgstr "aikaisessa"
 msgid "facts"
 msgstr "lisätyn faktan jälkeen"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "%s"
@@ -3266,16 +3305,16 @@ msgstr "%s"
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "myöhässä"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "liitetty kenttään <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "liitetty <b>tägeihin</b>"
 
@@ -3719,10 +3758,6 @@ msgstr ""
 #~ msgid "Please add a new card first."
 #~ msgstr "Lisää ensin kortteja."
 
-#, fuzzy
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Lisää ensin kenttä."
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Toista &vastauksen ääni"
 
diff --git a/ankiqt/locale/ankiqt_fr_FR.po b/ankiqt/locale/ankiqt_fr_FR.po
index 3b5dff06a..a2b01ca83 100644
--- a/ankiqt/locale/ankiqt_fr_FR.po
+++ b/ankiqt/locale/ankiqt_fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anki 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2008-09-24 02:36+0100\n"
 "Last-Translator: Emmanuel JARRI <emmanuel.jarri@gmail.com>\n"
 "Language-Team: LMS <anki_tradu@laurentsteffan.com>\n"
@@ -41,17 +41,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr "<b>Lors de l'ajout/modification</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr "<b>Lors de l'ajout/modification</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr ""
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -113,7 +113,7 @@ msgstr[1] "%(name)s [%(facts)d faits]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, fuzzy, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(facts)d faits, %(cards)d cartes) - %(title)s"
@@ -130,33 +130,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d exporté."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%(del)d effacé."
 msgstr[1] "%(del)d effacé."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, fuzzy, python-format
 msgid "%d successfully retrieved."
 msgstr "Export réussi."
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -167,7 +167,7 @@ msgstr[1] ""
 "%(a)d références orphelines.\n"
 "%(b)d fichiers utilisés supprimés."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s "
@@ -309,7 +309,7 @@ msgstr "&Graphiques"
 msgid "&Help"
 msgstr "&Aide"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importer"
 
@@ -426,12 +426,12 @@ msgstr ""
 msgid "&Unsuspend Cards"
 msgstr "&Suspendre le fait"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(carte nouvelle)"
 
@@ -457,7 +457,7 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 msgstr ""
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr ""
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr ""
@@ -518,12 +518,12 @@ msgstr "<b>Format de la réponse</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Difficile</b>"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Nom</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Nom</b>"
@@ -614,7 +614,7 @@ msgstr "<b>Nombre de nouvelles cartes par jour</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Caractéristiques</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nom</b>"
@@ -663,7 +663,7 @@ msgstr "<b>Fichier à importer</b> :"
 msgid "<b>Suspend leeches</b>"
 msgstr "<h2>Suspendu</h2>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "Marqueurs à ajouter :"
@@ -689,7 +689,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<h2>Priorité très haute</h2>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -745,7 +745,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Facilité de la carte</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -757,7 +757,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Vue cumulée des échéances de cartes</h>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Carte actuelle</h1>"
 
@@ -805,11 +805,11 @@ msgstr "<h1>Intervalles de carte</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Facilité de la carte</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Dernière carte</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modèles de carte</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -847,7 +847,7 @@ msgstr "<h1>Champs</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Champs</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -861,7 +861,7 @@ msgstr "<h1>Champs</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Cartes à échéance</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 #, fuzzy
 msgid "<h1>Study Options</h1>"
 msgstr "<b>Description</b>"
@@ -881,7 +881,7 @@ msgstr "<h1>Synchronisation</h1>Synchroniser vous permet d'accéder à votre paq
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Description du paquet</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -899,12 +899,12 @@ msgstr ""
 "        non enregistrées. Souhaitez-vous les enregistrer,\n"
 "        les jeter, ou annuler cette opération ?        "
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 #, fuzzy
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Champs</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignoré>"
 
@@ -962,7 +962,7 @@ msgstr "Modèle"
 msgid "Add Model"
 msgstr "Modèle"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 #, fuzzy
 msgid "Add Tags"
 msgstr "Ajouter un marqueur..."
@@ -1017,7 +1017,7 @@ msgstr "&Avancé"
 msgid "Again"
 msgstr ""
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "Champs"
@@ -1031,16 +1031,16 @@ msgstr "En révision"
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+A"
@@ -1060,20 +1060,20 @@ msgstr ""
 "Erreur lors de la mise à jour:\n"
 "%s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1084,8 +1084,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1093,7 +1093,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1102,7 +1102,7 @@ msgstr ""
 "Anki n'a pas pu enregistrer votre fichier de configuration:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Réponse"
 
@@ -1131,6 +1131,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr "Application de la réponse..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr ""
@@ -1172,7 +1181,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1184,14 +1193,21 @@ msgstr[1] "Anki - Modifier le paquet (%(cur)d cartes sur %(tot)d visibles)"
 msgid "Browser Font"
 msgstr "Police de la réponse"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 #, fuzzy
 msgid "C&ram..."
@@ -1201,15 +1217,15 @@ msgstr "&Forum..."
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 #, fuzzy
 msgid "Cancel"
 msgstr "&Changer..."
@@ -1251,20 +1267,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "Carte:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "&Changer..."
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "<h1>Facilité de la carte</h1>"
@@ -1274,7 +1290,7 @@ msgstr "<h1>Facilité de la carte</h1>"
 msgid "Change &Model..."
 msgstr "<h1>Facilité de la carte</h1>"
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 #, fuzzy
 msgid "Change Model"
 msgstr "<h1>Facilité de la carte</h1>"
@@ -1289,7 +1305,7 @@ msgstr "Vérifier la cohérence de la base de média"
 msgid "Check complete."
 msgstr "Synchronisation effectuée."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1302,7 +1318,7 @@ msgstr "Vérifier la cohérence de la base de données"
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1374,7 +1390,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr ""
 
@@ -1404,16 +1420,16 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 #, fuzzy
 msgid "Cram"
 msgstr "&Forum..."
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1427,12 +1443,12 @@ msgstr "Date de création"
 msgid "Create '%s' on server"
 msgstr "Créer '%s' sur le serveur"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 #, fuzzy
 msgid "Created"
 msgstr "Date de création"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, fuzzy, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+A"
@@ -1593,7 +1609,7 @@ msgstr "Personnaliser la synchro, la planification, les priorités et les modèl
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1610,35 +1626,35 @@ msgstr "Graphiques de paquet"
 msgid "Deck Properties"
 msgstr "Propriétés du &paquet..."
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Fichiers de paquets (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr ""
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 #, fuzzy
 msgid "Delete"
 msgstr "Effacer"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Supprimer le marqueur.."
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 #, fuzzy
 msgid "Delete Cards"
 msgstr "Effacer"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 #, fuzzy
 msgid "Delete Refs"
 msgstr "Supprimer le marqueur.."
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 #, fuzzy
 msgid "Delete Tags"
 msgstr "Supprimer le marqueur.."
@@ -1656,11 +1672,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "Détermination des différences..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Dialogue"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Désactiver"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Supprimer le champ"
 
@@ -1715,7 +1735,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "À &propos..."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1730,7 +1750,7 @@ msgstr "À &propos..."
 msgid "Downloads"
 msgstr "À &propos..."
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr ""
@@ -1744,7 +1764,7 @@ msgstr "&Quitter"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Fin prévue: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 #, fuzzy
 msgid "Ease"
 msgstr "Facile"
@@ -1777,7 +1797,7 @@ msgstr "Modifier le modèle en cours"
 msgid "Ena&ble"
 msgstr "Activer"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1785,12 +1805,12 @@ msgstr ""
 msgid "English"
 msgstr "Anglais"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 #, fuzzy
 msgid "Enter tags to add:"
 msgstr "Saisir le(s) marqueur(s) à ajouter à chaque carte :"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 #, fuzzy
 msgid "Enter tags to delete:"
 msgstr "Saisir le(s) marqueur(s) à effacer de chaque carte :"
@@ -1838,7 +1858,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1862,7 +1882,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Date de création"
@@ -1872,7 +1892,7 @@ msgstr "Date de création"
 msgid "Facts"
 msgstr "Faits..."
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1901,12 +1921,12 @@ msgstr "Champ %(num)d: %(name)s [%(cards)s non vides]"
 msgid "Field %d"
 msgstr "Champ %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Le champ <b>%d</b> du fichier est :"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Correspondance des champs"
 
@@ -1922,7 +1942,7 @@ msgstr ""
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1946,17 +1966,17 @@ msgstr "À &propos..."
 msgid "Fonts & Colours"
 msgstr "Polices et couleurs"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Modèle"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Modèle"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1974,12 +1994,12 @@ msgstr "Vérifier la cohérence de la base de média"
 msgid "General && Fields"
 msgstr "&Champs"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "Effacer"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "Effacer"
@@ -2039,8 +2059,8 @@ msgstr "Ignorer cette mise à jour"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importer"
 
@@ -2048,25 +2068,25 @@ msgstr "Importer"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Échec de l'importation.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Options d'importation"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, fuzzy, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Importation terminée. %(num)d cartes importées de %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Échec de l'importation.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 #, fuzzy
 msgid "Importing..."
 msgstr "&Importer..."
@@ -2084,11 +2104,11 @@ msgstr "Inclure les données de planification.."
 msgid "Include tags"
 msgstr "Inclure les marqueurs"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervalle"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -2096,14 +2116,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2134,6 +2154,11 @@ msgstr ""
 msgid "Korean"
 msgstr "Coréen"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Facile"
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2149,16 +2174,16 @@ msgstr "Équation LaTeX (Ctrl+E)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Environnement maths de LaTeX (Ctrl+M)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Tchèque"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr ""
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 #, fuzzy
 msgid "Loading graphs (may take time)..."
 msgstr "Chargement des graphiques (peut être long).."
@@ -2168,21 +2193,26 @@ msgstr "Chargement des graphiques (peut être long).."
 msgid "Loading..."
 msgstr "Enregistrement.."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Journal de l'importation:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Appliquer sur %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 #, fuzzy
 msgid "Map to Tags"
 msgstr "Appliquer sur %s"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Carte:"
@@ -2214,7 +2244,7 @@ msgstr "Propriétés du modèle"
 msgid "Models && Priorities"
 msgstr "Propriétés du modèle"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 #, fuzzy
 msgid "Modified"
 msgstr "Date modifiée"
@@ -2223,7 +2253,7 @@ msgstr "Date modifiée"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Modèle"
@@ -2252,6 +2282,10 @@ msgstr "Descendre ce champs"
 msgid "Move selected field up"
 msgstr "Monter ce champs"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 #, fuzzy
 msgid "Name"
@@ -2266,12 +2300,12 @@ msgstr "Créer '%s' sur le serveur"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "En révision"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "En révision"
@@ -2284,7 +2318,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2297,16 +2331,16 @@ msgstr ""
 msgid "No changes found."
 msgstr "Aucuns problème détecté"
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Pas de carte actuelle ni précédente."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "Tous les marqueurs"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2315,7 +2349,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Coréen"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 #, fuzzy
 msgid "Nothing"
 msgstr "Options d'importation"
@@ -2325,12 +2359,12 @@ msgstr "Options d'importation"
 msgid "Nothing selected."
 msgstr "Actions sur la sélection de..."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Ouvrir..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "&Récemment ouverts"
@@ -2340,7 +2374,7 @@ msgstr "&Récemment ouverts"
 msgid "Open Recent..."
 msgstr "&Récemment ouverts"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Ouvrir le paquet"
 
@@ -2349,7 +2383,7 @@ msgstr "Ouvrir le paquet"
 msgid "Open the bug tracker"
 msgstr "Ouvrir le suivi de bogues."
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Ouvrir le paquet"
@@ -2358,7 +2392,7 @@ msgstr "Ouvrir le paquet"
 msgid "Optimize Database"
 msgstr "Optimiser la base de données"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Enregistrement.."
@@ -2380,7 +2414,7 @@ msgstr ""
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ui/main.py:910
+#: ui/main.py:889
 #, fuzzy
 msgid "Password:"
 msgstr "Mot de passe"
@@ -2411,6 +2445,10 @@ msgstr "Veuillez d'abord ajouter un autre champ."
 msgid "Please add another model first."
 msgstr "Veuillez d'abord ajouter un autre modèle."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Choisissez un champ sur lequel trier."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Veuillez vérifier votre nom d'utilisateur et votre mot de passe."
@@ -2420,7 +2458,7 @@ msgstr "Veuillez vérifier votre nom d'utilisateur et votre mot de passe."
 msgid "Please enable a different template first."
 msgstr "Veuillez d'abord activer un modèle différent."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2430,11 +2468,11 @@ msgid ""
 "to enable recording."
 msgstr ""
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Installez python-matplotlib pour accéder aux graphes."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2495,7 +2533,7 @@ msgstr "Aperçu"
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2514,7 +2552,7 @@ msgstr "Connexion..."
 msgid "Put space between question and answer"
 msgstr "Cacher la question en montrant la réponse"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Question"
 
@@ -2538,7 +2576,7 @@ msgstr "Taille de la question"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 #, fuzzy
 msgid "Randomizing..."
 msgstr "Enregistrement.."
@@ -2562,12 +2600,12 @@ msgstr "Ajouter un son"
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr ""
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr ""
 
@@ -2597,16 +2635,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "Répé&ter le son précédent"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "Connexion..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr ""
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 #, fuzzy
 msgid "Reschedule"
 msgstr "Planification"
@@ -2635,7 +2673,7 @@ msgstr "En révision"
 msgid "Review Time"
 msgstr "En révision"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "En révision"
@@ -2659,7 +2697,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "Enregistrer &sous..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 #, fuzzy
 msgid "Save Deck As"
 msgstr "Enregistrer le paquet"
@@ -2718,7 +2756,7 @@ msgstr "Supprimer le marqueur.."
 msgid "Select None"
 msgstr "Supprimer le marqueur.."
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "Statistiques du &paquet"
@@ -2747,7 +2785,7 @@ msgstr "Ctrl+A"
 msgid "Shift+Alt+m"
 msgstr "Ctrl+A"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 #, fuzzy
 msgid "Show Answer"
 msgstr "Montrer la réponse"
@@ -2816,7 +2854,7 @@ msgstr "Montrer l'icône systray"
 msgid "Show/Hide"
 msgstr "Montrer l'horloge"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2826,7 +2864,7 @@ msgstr ""
 "Il est %(sec)d secondes %(type)s.\n"
 "Merci de vérifier qu'elle est bien réglée et redémarrez Anki."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr ""
 
@@ -2835,7 +2873,7 @@ msgstr ""
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 #, fuzzy
 msgid "Soon"
 msgstr "Options d'importation"
@@ -2846,7 +2884,7 @@ msgstr ""
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Sons (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2857,7 +2895,7 @@ msgstr ""
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr ""
 
@@ -2870,7 +2908,7 @@ msgstr ""
 msgid "Startup"
 msgstr "Statut"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Statut"
 
@@ -2879,14 +2917,14 @@ msgstr "Statut"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Arrêter de réviser cette carte jusqu'à ce qu'elle soit dé-suspendue dans l'éditeur."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 #, fuzzy
 msgid "Suspend"
 msgstr "&Suspendre le fait"
@@ -2895,7 +2933,7 @@ msgstr "&Suspendre le fait"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "&Suspendre le fait"
@@ -2904,7 +2942,7 @@ msgstr "&Suspendre le fait"
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2935,7 +2973,7 @@ msgstr "Synchronisez ce paquet sous le nom :"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synchronisez ce paquet sous le nom :"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 #, fuzzy
 msgid "Syncing Media..."
 msgstr "Synchronisation des faits."
@@ -2945,12 +2983,12 @@ msgstr "Synchronisation des faits."
 msgid "Syncing failed: %(a)s"
 msgstr "Échec de la synchronisation : %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 #, fuzzy
 msgid "Tag Cards"
 msgstr "Cartes"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Marquer les faits avec des champs en double, plutôt que les supprimer"
 
@@ -2958,12 +2996,12 @@ msgstr "Marquer les faits avec des champs en double, plutôt que les supprimer"
 msgid "Tags"
 msgstr "Marqueurs"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 #, fuzzy
 msgid "Tags to cram:"
 msgstr "Marqueurs à ajouter :"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 #, fuzzy
 msgid "Targets must be unique."
 msgstr "'%s' doit être unique"
@@ -2995,26 +3033,26 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 #, fuzzy
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Le nombre de cartes ajoutées un jour donné."
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 #, fuzzy
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Le nombre de cartes ajoutées un jour donné."
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 #, fuzzy
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Le nombre de cartes ajoutées un jour donné."
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 #, fuzzy
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Le nombre de cartes ajoutées un jour donné."
@@ -3023,7 +3061,7 @@ msgstr "Le nombre de cartes ajoutées un jour donné."
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Le protocole de synchro a change. Veuillez effectuer une mise à jour."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 #, fuzzy
 msgid "The total number of new cards in the deck"
 msgstr "Le nombre de cartes ajoutées un jour donné."
@@ -3109,7 +3147,7 @@ msgid ""
 "You will need to remove the source first."
 msgstr ""
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -3120,7 +3158,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3151,7 +3189,7 @@ msgstr ""
 "\n"
 "Faut-il vraiment effacer ces cartes ?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3160,7 +3198,7 @@ msgstr ""
 msgid "Title"
 msgstr "éléments"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3172,7 +3210,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr ""
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr ""
 
@@ -3205,7 +3243,7 @@ msgid ""
 "\n"
 msgstr "Impossible de se connecter au serveur"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3218,11 +3256,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Impossible de charger le fichier."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3233,7 +3271,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 #, fuzzy
 msgid "Unable to recover. Deck load failed."
 msgstr "Impossible de charger le fichier."
@@ -3246,7 +3284,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "Texte souligné (Ctrl+U)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, fuzzy, python-format
 msgid "Undo %s"
 msgstr "dans %s : "
@@ -3256,19 +3294,19 @@ msgstr "dans %s : "
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "&Suspendre le fait"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3294,7 +3332,7 @@ msgstr "Taille de police personnalisée"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ui/main.py:906
+#: ui/main.py:885
 #, fuzzy
 msgid "Username:"
 msgstr "Nom d'utilisateur"
@@ -3338,15 +3376,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 #, fuzzy
 msgid ""
 "Your version of Matplotlib is broken.\n"
@@ -3368,7 +3406,7 @@ msgstr "cartes"
 msgid "days"
 msgstr ""
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "plus tôt"
 
@@ -3376,7 +3414,7 @@ msgstr "plus tôt"
 msgid "facts"
 msgstr "faits"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "dans %s : "
@@ -3386,16 +3424,16 @@ msgstr "dans %s : "
 msgid "label"
 msgstr "tard"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "tard"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "associé à <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 #, fuzzy
 msgid "mapped to <b>Tags</b>"
 msgstr "associé à <b>%s</b>"
@@ -4438,9 +4476,6 @@ msgstr "tard"
 #~ msgid "Description && Synchronisation"
 #~ msgstr "Description && Synchronisation"
 
-#~ msgid "Dialog"
-#~ msgstr "Dialogue"
-
 #~ msgid "Difficult"
 #~ msgstr "Difficile"
 
@@ -4709,9 +4744,6 @@ msgstr "tard"
 #~ msgid "Please add a new card first."
 #~ msgstr "Veuillez d'abord ajouter une autre carte."
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Choisissez un champ sur lequel trier."
-
 #~ msgid "Please double-check your username."
 #~ msgstr "Veuillez vérifier votre nom d'utilisateur."
 
diff --git a/ankiqt/locale/ankiqt_it_IT.po b/ankiqt/locale/ankiqt_it_IT.po
index ac61678b9..b333ea700 100644
--- a/ankiqt/locale/ankiqt_it_IT.po
+++ b/ankiqt/locale/ankiqt_it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2008-10-24 14:28+0100\n"
 "Last-Translator: Marco Giancotti <nac.est@libero.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,17 +38,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Ctrl+Invio"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -77,11 +77,11 @@ msgstr " <b>Nelle fasi di creazione/modifica</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Nelle fasi di creazione/modifica</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr " validato %d carte modificate."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -110,7 +110,7 @@ msgstr[1] "%(name)s [%(facts)d fatti]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, fuzzy, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(facts)d fatti, %(cards)d carte) - %(title)s"
@@ -127,33 +127,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d esportate."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%(del)d eliminate."
 msgstr[1] "%(del)d eliminate."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -164,7 +164,7 @@ msgstr[1] ""
 "%(a)d riferimenti mancanti.\n"
 "%(b)d file inutilizzati rimossi."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s fa"
@@ -305,7 +305,7 @@ msgstr "&Grafici.."
 msgid "&Help"
 msgstr "Aiuto (&H)"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importa"
 
@@ -420,12 +420,12 @@ msgstr ""
 msgid "&Unsuspend Cards"
 msgstr "&Sospendi fatto"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(nuova carta)"
 
@@ -451,7 +451,7 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 msgstr ""
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ai
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Aiuto</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Aiuto</a>"
@@ -510,12 +510,12 @@ msgstr "<b>Formato risposta</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Carte</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Nome</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Nome</b>"
@@ -603,7 +603,7 @@ msgstr "<b>Numero di carte nuove al giorno"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Caratteristiche</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nome</b>"
@@ -652,7 +652,7 @@ msgstr "<b>File da importare</b>:"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Sospese</b"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "Tag da applicare:"
@@ -677,7 +677,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Priorità Molto Alta</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -733,7 +733,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Facilità carte</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -745,7 +745,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Rappresentazione cumulativa carte da ripassare</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Carta corrente</h1>"
 
@@ -792,11 +792,11 @@ msgstr "<h1>Intervalli carte</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Lingua</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Ultima carta</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -804,7 +804,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modelli</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 #, fuzzy
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Account Online</h1>Per utilizzare il tuo <a href=\"http://anki.ichi2.net/\">account online/a> gratuitamente,<br>inserisci le informazioni sottostanti.<br>"
@@ -833,7 +833,7 @@ msgstr "<h1>Campi Modello</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Campi Modello</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -847,7 +847,7 @@ msgstr "<h1>Campi Modello</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Seleziona tag da sospendere</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 #, fuzzy
 msgid "<h1>Study Options</h1>"
 msgstr "<b>Descrizione</b>"
@@ -865,7 +865,7 @@ msgstr "<h1>Sincronizzazione</h1><a href=\"http://anki.ichi2.net/\">Crea gratuit
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Sincronizzazione</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -883,12 +883,12 @@ msgstr ""
 "        salvate. Vuoi salvarle, scartarle o\n"
 "        annullare?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 #, fuzzy
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Campi Modello</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignorato>"
 
@@ -946,7 +946,7 @@ msgstr "Modello"
 msgid "Add Model"
 msgstr "Modello"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 #, fuzzy
 msgid "Add Tags"
 msgstr "Aggiungi Tag.."
@@ -1000,7 +1000,7 @@ msgstr "Avanzate"
 msgid "Again"
 msgstr ""
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "Campi"
@@ -1014,16 +1014,16 @@ msgstr "Campi"
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Già in studio intensivo. Chiudere questo mazzo prima di proseguire."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr ""
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr ""
 
@@ -1042,13 +1042,13 @@ msgstr ""
 "C'è stato un errore nell'upgrade:\n"
 "%s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1058,7 +1058,7 @@ msgstr ""
 "Vuoi esaminare il mazzo in cerca di errori?\n"
 "Ciò potrebbe richiedere del tempo."
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1069,8 +1069,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr ""
 
@@ -1078,7 +1078,7 @@ msgstr ""
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1087,7 +1087,7 @@ msgstr ""
 "Anki non è riuscito a salvare il tuo file di configurazione:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Risposta"
 
@@ -1116,6 +1116,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr "Invio risposta.."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr ""
@@ -1160,7 +1169,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1172,14 +1181,21 @@ msgstr[1] "Anki - Modifica mazzo (mostrate %(cur)d di %(tot)d carte)"
 msgid "Browser Font"
 msgstr "Carattere risposta"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 #, fuzzy
 msgid "C&ram..."
@@ -1189,15 +1205,15 @@ msgstr "Studio focalizzato (&r).."
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 #, fuzzy
 msgid "Cancel"
 msgstr "Cambia"
@@ -1239,20 +1255,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "Carta:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Cambia"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "<h1>Facilità carte</h1>"
@@ -1262,7 +1278,7 @@ msgstr "<h1>Facilità carte</h1>"
 msgid "Change &Model..."
 msgstr "<h1>Facilità carte</h1>"
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 #, fuzzy
 msgid "Change Model"
 msgstr "<h1>Facilità carte</h1>"
@@ -1276,7 +1292,7 @@ msgstr "Controllo Database Multimediale.."
 msgid "Check complete."
 msgstr "Controllo completo."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1289,7 +1305,7 @@ msgstr "Controlla Integrità del Database"
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1361,7 +1377,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connessione.."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr ""
 
@@ -1390,16 +1406,16 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 #, fuzzy
 msgid "Cram"
 msgstr "Studio focalizzato (&r).."
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1413,12 +1429,12 @@ msgstr "Data creazione"
 msgid "Create '%s' on server"
 msgstr "Crea '%s' sul server"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 #, fuzzy
 msgid "Created"
 msgstr "Data creazione"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr ""
@@ -1578,7 +1594,7 @@ msgstr "Personalizza sincronizzazione, programmazione, priorità e modelli"
 msgid "Czech"
 msgstr "Ceco"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1593,35 +1609,35 @@ msgstr "Grafici Mazzo"
 msgid "Deck Properties"
 msgstr "Proprietà Mazzo"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "File mazzo (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr ""
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 #, fuzzy
 msgid "Delete"
 msgstr "Elimina (&D)"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Elimina Tag.."
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 #, fuzzy
 msgid "Delete Cards"
 msgstr "Elimina (&D)"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 #, fuzzy
 msgid "Delete Refs"
 msgstr "Elimina Tag.."
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 #, fuzzy
 msgid "Delete Tags"
 msgstr "Elimina Tag.."
@@ -1639,11 +1655,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "Determinazione differenze"
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Finestra di dialogo"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Disa&bilita"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Scarta campo"
 
@@ -1698,7 +1718,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "Info (&A).."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1713,7 +1733,7 @@ msgstr "Info (&A).."
 msgid "Downloads"
 msgstr "Info (&A).."
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr ""
@@ -1727,7 +1747,7 @@ msgstr "Esci (&X)"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Rimanente: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr ""
 
@@ -1758,7 +1778,7 @@ msgstr "Modifica modello corrente"
 msgid "Ena&ble"
 msgstr "A&bilita"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1766,12 +1786,12 @@ msgstr ""
 msgid "English"
 msgstr "Inglese"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 #, fuzzy
 msgid "Enter tags to add:"
 msgstr "Inserire tag da aggiungere a ogni carta:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 #, fuzzy
 msgid "Enter tags to delete:"
 msgstr "Inserire tag da eliminare da ogni carta:"
@@ -1819,7 +1839,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1843,7 +1863,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Data creazione"
@@ -1853,7 +1873,7 @@ msgstr "Data creazione"
 msgid "Facts"
 msgstr "Fatti.."
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1881,12 +1901,12 @@ msgstr "Campo %(num)d: %(name)s [%(cards)s non-vuote]"
 msgid "Field %d"
 msgstr "Campo %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Il campo <b>%d</b> di questo file è:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Mappatura campi"
 
@@ -1902,7 +1922,7 @@ msgstr ""
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1925,17 +1945,17 @@ msgstr "Info (&A).."
 msgid "Fonts & Colours"
 msgstr "Caratteri e colori"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Modello"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Modello"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1952,12 +1972,12 @@ msgstr "Controllo Database.."
 msgid "General && Fields"
 msgstr ""
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "Elimina (&D)"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "Elimina (&D)"
@@ -2015,8 +2035,8 @@ msgstr "Ignora questo update"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Immagini (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importa"
 
@@ -2024,25 +2044,25 @@ msgstr "Importa"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Importazione fallita.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Importa opzioni"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, fuzzy, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Importazione completa. %(num)d carte importate da %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Importazione fallita.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 #, fuzzy
 msgid "Importing..."
 msgstr "&Importa.."
@@ -2060,11 +2080,11 @@ msgstr "Includi informazioni intervalli carte"
 msgid "Include tags"
 msgstr "Includi tag"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervallo"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -2072,14 +2092,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2110,6 +2130,10 @@ msgstr ""
 msgid "Korean"
 msgstr "Koreano"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+msgid "Lapses"
+msgstr ""
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2125,16 +2149,16 @@ msgstr "Equazione Latex (Ctrl+e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Ambiente matematico Latex (Ctrl+m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Ceco"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr ""
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 #, fuzzy
 msgid "Loading graphs (may take time)..."
 msgstr "Caricamento grafici (potrebbe richiedere tempo).."
@@ -2144,21 +2168,26 @@ msgstr "Caricamento grafici (potrebbe richiedere tempo).."
 msgid "Loading..."
 msgstr "Salvataggio.."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Resoconto dell'importazione:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Mappa su %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 #, fuzzy
 msgid "Map to Tags"
 msgstr "Mappa su %s"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Difficile"
@@ -2190,7 +2219,7 @@ msgstr "Proprietà Modelli"
 msgid "Models && Priorities"
 msgstr "Proprietà Modelli"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 #, fuzzy
 msgid "Modified"
 msgstr "Data modifica"
@@ -2199,7 +2228,7 @@ msgstr "Data modifica"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Modello"
@@ -2228,6 +2257,10 @@ msgstr "Muovi campo selezionato giù"
 msgid "Move selected field up"
 msgstr "Muovi campo selezionato su"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Nome"
@@ -2240,11 +2273,11 @@ msgstr "Nome sul server: "
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr ""
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr ""
 
@@ -2256,7 +2289,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2268,16 +2301,16 @@ msgstr ""
 msgid "No changes found."
 msgstr "Nessuna modifica trovata."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Nessuna carta corrente o ultima carta."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "Nessuna tag"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2286,7 +2319,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Koreano"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 #, fuzzy
 msgid "Nothing"
 msgstr "opzione"
@@ -2296,12 +2329,12 @@ msgstr "opzione"
 msgid "Nothing selected."
 msgstr "Azioni sulla selezione.."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "Apri (&O).."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Apri &Recente"
@@ -2311,7 +2344,7 @@ msgstr "Apri &Recente"
 msgid "Open Recent..."
 msgstr "Apri &Recente"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Apri mazzo"
 
@@ -2320,7 +2353,7 @@ msgstr "Apri mazzo"
 msgid "Open the bug tracker"
 msgstr "Apri il bug tracker"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Apri mazzo"
@@ -2329,7 +2362,7 @@ msgstr "Apri mazzo"
 msgid "Optimize Database"
 msgstr "Ottimizza Database"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Salvataggio.."
@@ -2352,7 +2385,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr ""
 
@@ -2382,6 +2415,10 @@ msgstr "Aggiungere un nuovo campo prima di procedere."
 msgid "Please add another model first."
 msgstr "Aggiungere un altro modello prima di procedere."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Scegliere un campo col quale ordinare l'elenco."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Ricontrollare username/password"
@@ -2391,7 +2428,7 @@ msgstr "Ricontrollare username/password"
 msgid "Please enable a different template first."
 msgstr "Abilitare un altro modelli prima di procedere."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2401,11 +2438,11 @@ msgid ""
 "to enable recording."
 msgstr ""
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Installare python-matplotlib per visualizzare i grafici."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2464,7 +2501,7 @@ msgstr ""
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2483,7 +2520,7 @@ msgstr "Connessione.."
 msgid "Put space between question and answer"
 msgstr "Nascondi domanda quando si visualizza la risposta"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Domanda"
 
@@ -2507,7 +2544,7 @@ msgstr "Dimensioni domanda"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 #, fuzzy
 msgid "Randomizing..."
 msgstr "Salvataggio.."
@@ -2530,12 +2567,12 @@ msgstr "Aggiungi audio"
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr ""
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr ""
 
@@ -2565,16 +2602,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "Ripe&ti ultimo audio"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "Connessione.."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr ""
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 #, fuzzy
 msgid "Reschedule"
 msgstr "Programmazione"
@@ -2600,7 +2637,7 @@ msgstr ""
 msgid "Review Time"
 msgstr ""
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "Campi"
@@ -2623,7 +2660,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "S&alva con nome"
 
-#: ui/main.py:1015
+#: ui/main.py:994
 #, fuzzy
 msgid "Save Deck As"
 msgstr "Salva mazzo"
@@ -2682,7 +2719,7 @@ msgstr "Elimina Tag.."
 msgid "Select None"
 msgstr "Elimina Tag.."
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "Statistiche Mazzo (&D)"
@@ -2709,7 +2746,7 @@ msgstr ""
 msgid "Shift+Alt+m"
 msgstr ""
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 #, fuzzy
 msgid "Show Answer"
 msgstr "Mostra risposta"
@@ -2779,7 +2816,7 @@ msgstr "Mostra icona nella barra"
 msgid "Show/Hide"
 msgstr "Mostra timer"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2791,7 +2828,7 @@ msgstr ""
 "Poichè questo potrebbe creare problemi di sincronizzazione,\n"
 "la sincronizzazione è bloccata finchè non risolverai il problema."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Alcuni campo sono assenti o non unici."
 
@@ -2800,7 +2837,7 @@ msgstr "Alcuni campo sono assenti o non unici."
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Presto"
 
@@ -2810,7 +2847,7 @@ msgstr ""
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Suoni (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2821,7 +2858,7 @@ msgstr "ID fonte:"
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr ""
 
@@ -2833,7 +2870,7 @@ msgstr ""
 msgid "Startup"
 msgstr "Avvio"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Stato"
 
@@ -2842,14 +2879,14 @@ msgstr "Stato"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Smetti di ripassare questa carta finchè la tag \"sospesa\" non viene rimossa nell'editor."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 #, fuzzy
 msgid "Suspend"
 msgstr "&Sospendi fatto"
@@ -2858,7 +2895,7 @@ msgstr "&Sospendi fatto"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "&Sospendi fatto"
@@ -2867,7 +2904,7 @@ msgstr "&Sospendi fatto"
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2897,7 +2934,7 @@ msgstr "Sincronizza questo mazzo"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Sincronizza questo mazzo"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 #, fuzzy
 msgid "Syncing Media..."
 msgstr "Sincronizzazione Media.."
@@ -2907,12 +2944,12 @@ msgstr "Sincronizzazione Media.."
 msgid "Syncing failed: %(a)s"
 msgstr "Sincronizzazione fallita: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 #, fuzzy
 msgid "Tag Cards"
 msgstr "Carte"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Applica una tag ai campi duplicati invece di cancellarli"
 
@@ -2920,11 +2957,11 @@ msgstr "Applica una tag ai campi duplicati invece di cancellarli"
 msgid "Tags"
 msgstr "Tag"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Tag per lo studio focalizzato"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr ""
 
@@ -2958,26 +2995,26 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 #, fuzzy
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Il numero di carte aggiunte in un dato giorno."
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 #, fuzzy
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Il numero di carte aggiunte in un dato giorno."
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 #, fuzzy
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Il numero di carte aggiunte in un dato giorno."
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 #, fuzzy
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Il numero di carte aggiunte in un dato giorno."
@@ -2986,7 +3023,7 @@ msgstr "Il numero di carte aggiunte in un dato giorno."
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Il protocollo di sincronizzazione è cambiato. Si prega di aggiornare."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 #, fuzzy
 msgid "The total number of new cards in the deck"
 msgstr "Il numero di carte aggiunte in un dato giorno."
@@ -3075,7 +3112,7 @@ msgstr ""
 "%s\n"
 "Devi prima eliminare l'origine."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -3086,7 +3123,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3117,7 +3154,7 @@ msgstr ""
 "\n"
 "Vuoi davvero cancellare queste carte?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3125,7 +3162,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3137,7 +3174,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr ""
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 #, fuzzy
 msgid "Toggle Toolbar"
 msgstr "Toolbar semplice"
@@ -3169,7 +3206,7 @@ msgid ""
 "\n"
 msgstr "Impossibile contattare server"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3182,11 +3219,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Impossibile caricare file."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3197,7 +3234,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Impossibile recuperare. Caricamento mazzo fallito."
 
@@ -3209,7 +3246,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "Sottolinea testo (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, fuzzy, python-format
 msgid "Undo %s"
 msgstr "tra %s"
@@ -3219,19 +3256,19 @@ msgstr "tra %s"
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "&Sospendi fatto"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3257,7 +3294,7 @@ msgstr "Dimensioni personalizzate"
 msgid "Username"
 msgstr ""
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr ""
 
@@ -3301,16 +3338,16 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 #, fuzzy
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Già in studio intensivo. Chiudere questo mazzo prima di proseguire."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3331,7 +3368,7 @@ msgstr "carte"
 msgid "days"
 msgstr ""
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "in anticipo"
 
@@ -3339,7 +3376,7 @@ msgstr "in anticipo"
 msgid "facts"
 msgstr "fatti"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "tra %s"
@@ -3348,16 +3385,16 @@ msgstr "tra %s"
 msgid "label"
 msgstr "etichetta"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "in ritardo"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "mappato su <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 #, fuzzy
 msgid "mapped to <b>Tags</b>"
 msgstr "mappato su <b>%s</b>"
@@ -3834,9 +3871,6 @@ msgstr "etichetta"
 #~ msgid "Description"
 #~ msgstr "Descrizione"
 
-#~ msgid "Dialog"
-#~ msgstr "Finestra di dialogo"
-
 #~ msgid "Difficulty"
 #~ msgstr "Difficoltà"
 
@@ -3981,9 +4015,6 @@ msgstr "etichetta"
 #~ msgid "Please add a new card first."
 #~ msgstr "Aggiungere una nuova carta prima di procedere."
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Scegliere un campo col quale ordinare l'elenco."
-
 #~ msgid "Prevent me from entering the same thing in this field twice"
 #~ msgstr "Impediscimi di inserire la stessa cosa in questo campo più di una volta"
 
diff --git a/ankiqt/locale/ankiqt_ja_JP.po b/ankiqt/locale/ankiqt_ja_JP.po
index c0d3b4e82..28427b6b5 100644
--- a/ankiqt/locale/ankiqt_ja_JP.po
+++ b/ankiqt/locale/ankiqt_ja_JP.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anki Japanese Translation v0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-06-17 01:43-0800\n"
 "Last-Translator: Jarvik7 <jarvik7@gmail.com>\n"
 "Language-Team: Jarvik7 <jarvik7@gmail.com>\n"
@@ -33,17 +33,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr " (Command+Option+%d)"
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 #, fuzzy
 msgid " (and proxy settings)"
 msgstr "プロキシの設定を確認してくださし。"
@@ -71,11 +71,11 @@ msgstr "<b>編集する時（上の設定より優先）：</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr "<b>編集と勉強する時：</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "設定を確認してAnkiを再起動してください。"
 
@@ -84,7 +84,7 @@ msgstr "設定を確認してAnkiを再起動してください。"
 msgid " applied %d modified cards."
 msgstr " 変更されたカードを%d個更新しました。"
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -104,7 +104,7 @@ msgstr[1] ""
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(totalSum)dのうちに%(partOf)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s（%(cards)d枚のうちに%(due)d枚のカードは満期）- %(title)s"
@@ -120,37 +120,37 @@ msgstr[0] ""
 msgid "%d exported."
 msgstr "%d個をエクスポートしました。"
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d個が選択されている"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] "%d個使用されていないファイルを削除しました。"
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
@@ -278,7 +278,7 @@ msgstr "グラフ(&G)…"
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "インポート(&I)"
 
@@ -382,12 +382,12 @@ msgstr "取り消す(&U)"
 msgid "&Unsuspend Cards"
 msgstr "ファクトを活性化する(&U)"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(新規カード)"
 
@@ -423,7 +423,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr "＜フィルタ＞"
 
@@ -440,7 +440,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">ヘルプ</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">ヘルプ</a>"
@@ -477,11 +477,11 @@ msgstr "<b>解答</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>カード</b>："
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 msgid "<b>Deck</b>"
 msgstr "<b>単語帳</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>今日<br>満期</b>"
 
@@ -563,7 +563,7 @@ msgstr "<b>失敗されたカードを最優先する</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>新しい日オフセット</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 msgid "<b>New<br>Today</b>"
 msgstr "<b>今日<br>新しい</b>"
 
@@ -604,7 +604,7 @@ msgstr "<b>間隔の乗数</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>保留された</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "<b>追加するタグ</b>："
@@ -629,7 +629,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>最優先</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -682,7 +682,7 @@ msgstr "<h1>バックアップ</h1>単語帳を開く時に以前のバックア
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>カードテンプレート</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -693,7 +693,7 @@ msgstr "<h1>詰め込み勉強中</h1>現在は詰め込み中です。編集さ
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>累加的な満期</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>現在のカード</h1>"
 
@@ -733,11 +733,11 @@ msgstr "<h1>期間</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>言語</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>先のカード</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -745,7 +745,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>モデル</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr "<h1>繰り返し数</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>勉強時間</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>予習しています</h1>辞めたい時にツールバーにある時計をクリックしてください。"
 
@@ -783,7 +783,7 @@ msgstr "<h1>勉強</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>現在のカード</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>勉強オプション</h1>"
 
@@ -800,7 +800,7 @@ msgstr "<h1>同期</h1><a href=\"http://anki.ichi2.net/\">無料で登録する<
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>同期</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -820,11 +820,11 @@ msgstr ""
 "<h1>変更された内容</h1>保存されてない変更内容があります。\n"
 "閉じる前に保存しますか。"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>よく出来まして！</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<無視されています>"
 
@@ -877,7 +877,7 @@ msgstr "項目を追加する"
 msgid "Add Model"
 msgstr "モデルを追加"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "タグを追加"
 
@@ -927,7 +927,7 @@ msgstr "上級設定"
 msgid "Again"
 msgstr "もう一回"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "全フィールド"
 
@@ -939,16 +939,16 @@ msgstr "全ての勉強"
 msgid "Allow the answer to be blank"
 msgstr "解答を入力しなくていい"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "既に詰め込み勉強中です。先にこの単語帳を閉じてください。"
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr "Alt+M"
 
@@ -965,20 +965,20 @@ msgstr "Ankiを起動する時に最後の単語帳を自動的に開く"
 msgid "An error occured while opening %s"
 msgstr "%sを開けませんでした"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -989,8 +989,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -998,7 +998,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1007,7 +1007,7 @@ msgstr ""
 "設定ファイルを保存できませんでした：\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "解答"
 
@@ -1035,6 +1035,15 @@ msgstr "カードブラウザで簡単に見つけれるように、このファ
 msgid "Applying reply..."
 msgstr ""
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "一枚当りかかった時間の平均："
@@ -1078,7 +1087,7 @@ msgstr "項目を閲覧する"
 msgid "Browse and edit all items"
 msgstr "全項目を閲覧して編集する"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1088,14 +1097,21 @@ msgstr[0] "カードブラウザ（%(tot)d枚のうちに%(cur)d枚のカード
 msgid "Browser Font"
 msgstr "カードブラウザのフォント"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "索引を作成中’…"
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr "延期する"
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "積み込み勉強(&R)…"
@@ -1104,15 +1120,15 @@ msgstr "積み込み勉強(&R)…"
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -1153,20 +1169,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "カード:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr "一セッション当りのカードの枚数："
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "変更"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "変更"
@@ -1175,7 +1191,7 @@ msgstr "変更"
 msgid "Change &Model..."
 msgstr "モデルを変える(&M)…"
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "モデルを変える…"
 
@@ -1187,7 +1203,7 @@ msgstr "メディアデータベースを検査…"
 msgid "Check complete."
 msgstr "検査を完了しました。"
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1199,7 +1215,7 @@ msgstr "データベースはエラーがないかを検査する"
 msgid "Check the files in the media directory"
 msgstr "メディアフォルダにあるファイルを検査"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr "%(y)d個のうちに%(x)d番目の単語帳を検査しています…"
@@ -1272,7 +1288,7 @@ msgstr "勉強オプションを設定する"
 msgid "Connecting..."
 msgstr "接続中…"
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "勉強を続ける"
 
@@ -1301,15 +1317,15 @@ msgstr "今日当たった："
 msgid "Correct under a month: "
 msgstr "一ヶ月以下当たった："
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "音声を再生出来ませんでした。mplayerをインストールしてください。"
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "詰め込み勉強"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "選択されたカードを新規単語帳で詰め込み勉強しますか。"
 
@@ -1322,11 +1338,11 @@ msgstr "製作"
 msgid "Create '%s' on server"
 msgstr "%sという単語帳をサーバーで作成"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "カードの登録日"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1471,7 +1487,7 @@ msgstr "同期、スケジュール、優先設定、モデルなどを設定す
 msgid "Czech"
 msgstr "Česky"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1488,32 +1504,32 @@ msgstr "単語帳のグラフ"
 msgid "Deck Properties"
 msgstr "単語帳プロパティ"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Ankiの単語帳 (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "単語帳は既に開いています。"
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "削除"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, python-format
 msgid "Delete %s?"
 msgstr "%sをさくじょしますか。"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "カードを削除"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "カードタグを削除"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "タグを削除"
 
@@ -1530,11 +1546,15 @@ msgstr "現在のカードを削除する"
 msgid "Determining differences..."
 msgstr "格差を究明中…"
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "無効にする(&B)"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr ""
 
@@ -1588,7 +1608,7 @@ msgstr "プラグインをダウンロードして昨日を付けるかAnkiの
 msgid "Downloaded %dKB"
 msgstr "%dKBをダウンロードしました"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr "%dKBをサーバーからダウンロードしました…"
@@ -1602,7 +1622,7 @@ msgstr "ダウンロード中…"
 msgid "Downloads"
 msgstr "ダウンロード…"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "満期"
@@ -1616,7 +1636,7 @@ msgstr "終了(&X)"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "完了予定時刻：後<b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "易しさ"
 
@@ -1644,7 +1664,7 @@ msgstr "現在の項目を編集"
 msgid "Ena&ble"
 msgstr "有効にする(&B)"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1652,11 +1672,11 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "タグを追加する："
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "タグを削除する："
 
@@ -1700,7 +1720,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1724,7 +1744,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr "ファクトの登録日"
 
@@ -1733,7 +1753,7 @@ msgstr "ファクトの登録日"
 msgid "Facts"
 msgstr "ファクト"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "メディアのアップロードが失敗しました。「メディアデータベースを検査…」をしてください。"
 
@@ -1761,12 +1781,12 @@ msgstr "フィールド%(num)d：「%(name)s」（%(cards)sは空白ではない
 msgid "Field %d"
 msgstr "フィールド %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "ファイルの<b>%d</b>番のフィールドは："
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr ""
 
@@ -1782,7 +1802,7 @@ msgstr "フィルタ(&T)"
 msgid "Find and Re&place..."
 msgstr "置き換えて検索(&P)…"
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "置き換えて検索"
 
@@ -1802,16 +1822,16 @@ msgstr "フォント…"
 msgid "Fonts & Colours"
 msgstr "フォントパネル"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 msgid "Forget"
 msgstr "忘れる"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, python-format
 msgid "Forget %s?"
 msgstr "%sを忘れる？"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr "「忘れる」は単語帳を削除せずに一覧から取り除く。"
 
@@ -1827,12 +1847,12 @@ msgstr "データベースを詳しく検査する…"
 msgid "General && Fields"
 msgstr "一般とフィールド設定"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "カードを削除"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "カードを作成中…"
 
@@ -1888,8 +1908,8 @@ msgstr "このアップデートを無視する"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "映像 (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "インポート"
 
@@ -1897,24 +1917,24 @@ msgstr "インポート"
 msgid "Import cards from text files, Anki files and more"
 msgstr "テキストファイルやAnki式単語帳などからカードをインポートする。"
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 msgid "Import failed.\n"
 msgstr "インポートは失敗しました。\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "インポートオプション"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "インポート完了しました。%(file)sから%(num)d個ファクトをインポートしました。\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "インポートは失敗しました。\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "インポート中…"
 
@@ -1931,11 +1951,11 @@ msgstr "スケジュール情報を付属する"
 msgid "Include tags"
 msgstr "タグを付属する"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "期間"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "無効な正規表現。"
 
@@ -1943,14 +1963,14 @@ msgstr "無効な正規表現。"
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -1981,6 +2001,11 @@ msgstr "バックアップファイルを"
 msgid "Korean"
 msgstr "한국어"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "易しさ"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "LaTeX（Ctrl+LそしてL）"
@@ -1993,16 +2018,16 @@ msgstr "LaTeX方程式（Ctrl+LそしてE）"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr ""
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Česky"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "単語帳を読み込み中…"
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "グラフを作成中、しばらくお待ちしてください…"
 
@@ -2010,20 +2035,25 @@ msgstr "グラフを作成中、しばらくお待ちしてください…"
 msgid "Loading..."
 msgstr "読み込み中…"
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "インポートログ：\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr ""
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr ""
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr "スターが付いている"
 
@@ -2054,7 +2084,7 @@ msgstr "モデルプロパティ"
 msgid "Models && Priorities"
 msgstr "モデルと優先設定"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "変更日"
 
@@ -2062,7 +2092,7 @@ msgstr "変更日"
 msgid "Mongolian"
 msgstr "Монгол хэл"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr "もっと"
 
@@ -2090,6 +2120,10 @@ msgstr "選択されたフィールドを下に移転"
 msgid "Move selected field up"
 msgstr "選択されたフィールドを上に移転"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "名"
@@ -2102,11 +2136,11 @@ msgstr "サーバーでの名前"
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr "今日新しい："
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr "全部で新しい："
 
@@ -2118,7 +2152,7 @@ msgstr "次の色（F7そしてF8）"
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2131,15 +2165,15 @@ msgstr ""
 msgid "No changes found."
 msgstr " * %sは変更されていません。"
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "現在のカードも先のカードもありません。"
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr "タグが付いていない"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2147,7 +2181,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr ""
 
@@ -2155,11 +2189,11 @@ msgstr ""
 msgid "Nothing selected."
 msgstr "何も選択されていません。"
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 msgid "Open"
 msgstr "開く"
 
-#: ui/main.py:784
+#: ui/main.py:763
 msgid "Open Recent Deck"
 msgstr "最近使った単語帳を開く"
 
@@ -2167,7 +2201,7 @@ msgstr "最近使った単語帳を開く"
 msgid "Open Recent..."
 msgstr "最近使った項目を開く…"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "単語帳を開く"
 
@@ -2175,7 +2209,7 @@ msgstr "単語帳を開く"
 msgid "Open the bug tracker"
 msgstr "バグ管理システムを開く"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, python-format
 msgid "Open this deck%s"
 msgstr "この単語帳を開く%s"
@@ -2184,7 +2218,7 @@ msgstr "この単語帳を開く%s"
 msgid "Optimize Database"
 msgstr "データベースを最適化"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "読み込み中…"
@@ -2206,7 +2240,7 @@ msgstr ""
 msgid "Password"
 msgstr "パスワード"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "パスワード："
 
@@ -2235,6 +2269,10 @@ msgstr "先に新規テンプレートを追加してください。"
 msgid "Please add another model first."
 msgstr "まずもう一つのモデルを作成してください。"
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "フィールドの整列を選んでください。"
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "ユーザー名とパスワードを確認してください。"
@@ -2243,7 +2281,7 @@ msgstr "ユーザー名とパスワードを確認してください。"
 msgid "Please enable a different template first."
 msgstr "先に他のテンプレートを有効にしてください。"
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2255,11 +2293,11 @@ msgstr ""
 "録音が出来るために<a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "をインストールしてください。"
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "python-matplotlabが必要です。python-matplotlibをインストールしてください。"
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "データベースを検査する前にAnkiを再起動してください。"
 
@@ -2317,7 +2355,7 @@ msgstr "カードをプレビュー"
 msgid "Previous colour (F7 then F6)"
 msgstr "前の色（F7そしてF6）"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2334,7 +2372,7 @@ msgstr "処理中…"
 msgid "Put space between question and answer"
 msgstr "質問と解答の間にスペースを残る"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "質問"
 
@@ -2358,7 +2396,7 @@ msgstr "質問サイズ"
 msgid "Quick Database Check"
 msgstr "データベースを軽く検査する"
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 #, fuzzy
 msgid "Randomizing..."
 msgstr "読み込み中…"
@@ -2380,12 +2418,12 @@ msgstr "録音する（F5）"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "録音中…<br>Time: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "やり直す - %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "再読み込み"
 
@@ -2413,16 +2451,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "音声を再生(&A)"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "読み込み中…"
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "繰り返し数"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr ""
 
@@ -2447,7 +2485,7 @@ msgstr "プレビュー"
 msgid "Review Time"
 msgstr "勉強した時間"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr "満期カード："
 
@@ -2468,7 +2506,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "別名で保存(&A)…"
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "別名で保存"
 
@@ -2520,7 +2558,7 @@ msgstr "すべてを選択"
 msgid "Select None"
 msgstr "すべてを除外"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr "セッションの統計"
 
@@ -2546,7 +2584,7 @@ msgstr "Shift+Alt+E"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+M"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "解答を表示"
 
@@ -2610,7 +2648,7 @@ msgstr "システムトレイにアイコンを表示"
 msgid "Show/Hide"
 msgstr "表示／隠し"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
@@ -2618,7 +2656,7 @@ msgstr ""
 "これで同期の問題がよく起こるので\n"
 "直すまで同期は無効しています。"
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "或フィールドは空白か重複しています。"
 
@@ -2627,7 +2665,7 @@ msgstr "或フィールドは空白か重複しています。"
 msgid "Some settings will take effect after you restart Anki."
 msgstr "或設定はAnkiを再起動後発効します。"
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "すぐに"
 
@@ -2636,8 +2674,8 @@ msgid "Sort as numbers"
 msgstr "番号順に分ける"
 
 #: ui/facteditor.py:874
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
-msgstr "音声・ビデオ (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
+msgstr "音声・ビデオ (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 
 #: ui/deckproperties.py:189
 msgid "Source ID:"
@@ -2647,7 +2685,7 @@ msgstr "ソースID："
 msgid "Spanish"
 msgstr "Español"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "勉強を始める"
 
@@ -2659,7 +2697,7 @@ msgstr "自分の勉強したいことを入力しましょう！"
 msgid "Startup"
 msgstr "スタートアップ"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "ステイタス"
 
@@ -2667,13 +2705,13 @@ msgstr "ステイタス"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "カードブラウザで活性化するまでこのカードを保留する"
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] "今日は<b>%(time)s</b>で<b>%(reps)d枚</b>のカードを勉強しました。"
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 #, fuzzy
 msgid "Suspend"
 msgstr "保留されたファクト"
@@ -2682,7 +2720,7 @@ msgstr "保留されたファクト"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr "このファクトを単語帳が閉じて再開かせるまで保留する"
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr "保留された"
 
@@ -2690,7 +2728,7 @@ msgstr "保留された"
 msgid "Swedish"
 msgstr "Suomi"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 #, fuzzy
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
@@ -2721,7 +2759,7 @@ msgstr "単語帳を同期する"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Anki Onlineと同期します"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "メディアを同期中…"
 
@@ -2730,12 +2768,12 @@ msgstr "メディアを同期中…"
 msgid "Syncing failed: %(a)s"
 msgstr "同期が出来ませんでした：%(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 #, fuzzy
 msgid "Tag Cards"
 msgstr "最後のカード"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "重複しているファクトを削除の代わりにタグを付ける"
 
@@ -2743,11 +2781,11 @@ msgstr "重複しているファクトを削除の代わりにタグを付ける
 msgid "Tags"
 msgstr "タグ"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "詰め込み勉強するタグ："
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr ""
 
@@ -2777,23 +2815,23 @@ msgstr "入力されたデータで全枚のカードの質問か解答は空白
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr "<b>一日あたりの出て来る新しいカード</b>の最大枚数。数日間後圧倒しないように、初期設定は20枚。"
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "最後（青）とその前（黒）のセッションの勉強していたカードの枚数"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "今日（青）と昨日（黒）の勉強していたカードの枚数"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr "今日（青）と昨日（黒）の勉強していた時間"
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2801,7 +2839,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "同期プロトコルがかわりました。最新のAnkiにアップデートしてください。"
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr "単語帳の新しいカードの枚数"
 
@@ -2884,7 +2922,7 @@ msgstr ""
 "はこのモデルを使用しています。\n"
 "先にソースを削除してください。"
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2895,7 +2933,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2923,7 +2961,7 @@ msgstr ""
 "\n"
 "カードを削除してよろしいですか。"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -2932,7 +2970,7 @@ msgstr ""
 msgid "Title"
 msgstr "ファイル"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2942,7 +2980,7 @@ msgstr "グラフを表示するための必要「.DLL」ファイルはあり
 msgid "Today's reviews are finished"
 msgstr "今日の勉強は済みました"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "ツールバーを表示"
 
@@ -2974,7 +3012,7 @@ msgid ""
 "\n"
 msgstr "サーバーに接続出来ませんでした。"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -2996,11 +3034,11 @@ msgstr ""
 "\n"
 "古い単語帳をアップデートするためにAnki0.9.8.7をダウンロードしてください。"
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "ファイルを開けませんでした。"
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3011,7 +3049,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 #, fuzzy
 msgid "Unable to recover. Deck load failed."
 msgstr "ファイルを開けませんでした。"
@@ -3024,7 +3062,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "下線（Ctrl+U）"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "取り消す - %s"
@@ -3034,11 +3072,11 @@ msgstr "取り消す - %s"
 msgid "Unknown error: %s"
 msgstr "一般エラー：%s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 msgid "Unsuspend"
 msgstr "活性化する"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3048,7 +3086,7 @@ msgstr ""
 "●勉強を続けれるんですが、\n"
 "●このウインドウを閉じないでください"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr "%dKBをサーバーにアップロードされまして…"
@@ -3073,7 +3111,7 @@ msgstr "カスタムサイズを使用"
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "ユーザー名："
 
@@ -3116,15 +3154,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr "現在は詰め込み勉強中です。先にこの単語帳を閉じてください。"
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr "パソコンの時刻設定は正しくありません。\n"
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3145,7 +3183,7 @@ msgstr "カード毎に保存する"
 msgid "days"
 msgstr "日"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr ""
 
@@ -3153,7 +3191,7 @@ msgstr ""
 msgid "facts"
 msgstr "ファクト毎に保存する"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "後%s"
@@ -3162,17 +3200,17 @@ msgstr "後%s"
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 #, fuzzy
 msgid "late"
 msgstr "削除"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "<b>%s</b>へ写像しました"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 #, fuzzy
 msgid "mapped to <b>Tags</b>"
 msgstr "<b>%s</b>へ写像しました"
@@ -3289,9 +3327,6 @@ msgstr ""
 #~ msgid "Please check the proxy settings."
 #~ msgstr "プロキシの設定を確認してくださし。"
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "フィールドの整列を選んでください。"
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "解答の音声を再生(&A)"
 
diff --git a/ankiqt/locale/ankiqt_ko_KR.po b/ankiqt/locale/ankiqt_ko_KR.po
index a10c57415..6628f90f7 100644
--- a/ankiqt/locale/ankiqt_ko_KR.po
+++ b/ankiqt/locale/ankiqt_ko_KR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2008-05-24 09:54+0900\n"
 "Last-Translator: Jin Eun-Deok <jin.eundeok@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,17 +30,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -69,11 +69,11 @@ msgstr " <b>추가/편집 할때</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>추가/편집 할때</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr ""
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -102,7 +102,7 @@ msgstr[1] "%(name)s [%(facts)d지식]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, fuzzy, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(facts)d지식, %(cards)d카드) - %(title)s"
@@ -119,40 +119,40 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d 내보내기 완료."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%(del)d 삭제 됨."
 msgstr[1] "%(del)d 삭제 됨."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s 전"
@@ -296,7 +296,7 @@ msgstr "그래프(&G)"
 msgid "&Help"
 msgstr "도움말(&H)"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "가져오기(&I)"
 
@@ -413,12 +413,12 @@ msgstr ""
 msgid "&Unsuspend Cards"
 msgstr "보류(&S)"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(새 카드)"
 
@@ -444,7 +444,7 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 msgstr ""
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr ""
 
@@ -460,7 +460,7 @@ msgstr ""
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr ""
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr ""
@@ -502,12 +502,12 @@ msgstr "<b>답 형식</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>어려움</b>"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>이름</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>이름</b>"
@@ -598,7 +598,7 @@ msgstr "<b>특별한 기능</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>특별한 기능</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>이름</b>"
@@ -647,7 +647,7 @@ msgstr "<b>가져올 파일</b>:"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>필수?</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "꼬리표 추가:"
@@ -672,7 +672,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr ""
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -724,7 +724,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>카드 난이도</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -736,7 +736,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>카드 누적 개수</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>현재 카드</h1>"
 
@@ -784,11 +784,11 @@ msgstr "<h1>복습 간격</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>카드 난이도</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>지난 카드</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -797,7 +797,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>카드 모델</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -826,7 +826,7 @@ msgstr "<h1>필드</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>필드</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -840,7 +840,7 @@ msgstr "<h1>필드</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>예정된 카드</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 #, fuzzy
 msgid "<h1>Study Options</h1>"
 msgstr "<b>설명</b>"
@@ -860,7 +860,7 @@ msgstr "<h1>동기화</h1>동기화 기능을 사용하면 묶음을 웹과 휴
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>묶음 설명</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -878,12 +878,12 @@ msgstr ""
 "         변경이 사항이 있습니다. 변경 내용을 저장 또는 무시하거나\n"
 "         프로그램 종료를 취소할 수 있습니다."
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 #, fuzzy
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>필드</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<무시>"
 
@@ -941,7 +941,7 @@ msgstr "모델"
 msgid "Add Model"
 msgstr "모델"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 #, fuzzy
 msgid "Add Tags"
 msgstr "꼬리표 추가..."
@@ -996,7 +996,7 @@ msgstr "추가(&A)"
 msgid "Again"
 msgstr ""
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "필드"
@@ -1010,16 +1010,16 @@ msgstr "복습 중"
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+A"
@@ -1039,20 +1039,20 @@ msgstr ""
 "업데이트 중 오류 발생:\n"
 "%s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1063,8 +1063,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "앙키"
 
@@ -1072,7 +1072,7 @@ msgstr "앙키"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1081,7 +1081,7 @@ msgstr ""
 "설정 파일을 저장할 수 없습니다:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "답"
 
@@ -1110,6 +1110,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr "응답 적용 중.."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr ""
@@ -1152,7 +1161,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1164,14 +1173,21 @@ msgstr[1] "앙키 - 묶음 편집 (%(tot)d개 중에 %(cur)d개)"
 msgid "Browser Font"
 msgstr "답 글꼴"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 #, fuzzy
 msgid "C&ram..."
@@ -1181,15 +1197,15 @@ msgstr "게시판(&F)..."
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 #, fuzzy
 msgid "Cancel"
 msgstr "수정"
@@ -1231,20 +1247,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "카드:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "수정"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "<h1>카드 난이도</h1>"
@@ -1254,7 +1270,7 @@ msgstr "<h1>카드 난이도</h1>"
 msgid "Change &Model..."
 msgstr "<h1>카드 난이도</h1>"
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 #, fuzzy
 msgid "Change Model"
 msgstr "<h1>카드 난이도</h1>"
@@ -1268,7 +1284,7 @@ msgstr ""
 msgid "Check complete."
 msgstr "열 때 동기화"
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1280,7 +1296,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1351,7 +1367,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr "연결 중..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr ""
 
@@ -1380,16 +1396,16 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 #, fuzzy
 msgid "Cram"
 msgstr "게시판(&F)..."
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1403,12 +1419,12 @@ msgstr "만든 날"
 msgid "Create '%s' on server"
 msgstr "서버에 '%s' 묶음 만들기"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 #, fuzzy
 msgid "Created"
 msgstr "만든 날"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, fuzzy, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+A"
@@ -1570,7 +1586,7 @@ msgstr "동기화, 복습 일정, 우선순위, 모델 수정"
 msgid "Czech"
 msgstr "체코어"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1587,35 +1603,35 @@ msgstr "묶음 그래프"
 msgid "Deck Properties"
 msgstr "묶음 속성(&D)..."
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "묶음 파일 (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr ""
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 #, fuzzy
 msgid "Delete"
 msgstr "삭제(&D)"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "꼬리표 삭제..."
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 #, fuzzy
 msgid "Delete Cards"
 msgstr "삭제(&D)"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 #, fuzzy
 msgid "Delete Refs"
 msgstr "꼬리표 삭제..."
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 #, fuzzy
 msgid "Delete Tags"
 msgstr "꼬리표 삭제..."
@@ -1633,11 +1649,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "묶음 비교하는 중.."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "대화상자"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "끄기(&B)"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "필드 제거"
 
@@ -1692,7 +1712,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "소개(&A)..."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1707,7 +1727,7 @@ msgstr "소개(&A)..."
 msgid "Downloads"
 msgstr "소개(&A)..."
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr ""
@@ -1721,7 +1741,7 @@ msgstr "종료(&X)"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "예상 시간: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 #, fuzzy
 msgid "Ease"
 msgstr "쉬움"
@@ -1754,7 +1774,7 @@ msgstr "현재 모델 편집"
 msgid "Ena&ble"
 msgstr "켜기(&B)"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1762,12 +1782,12 @@ msgstr ""
 msgid "English"
 msgstr "영어"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 #, fuzzy
 msgid "Enter tags to add:"
 msgstr "각 카드에 추가할 태그(들)을 입력하세요:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 #, fuzzy
 msgid "Enter tags to delete:"
 msgstr "각 카드에서 삭제할 태그(들)을 입력하세요:"
@@ -1815,7 +1835,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1839,7 +1859,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "만든 날"
@@ -1849,7 +1869,7 @@ msgstr "만든 날"
 msgid "Facts"
 msgstr "지식..."
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1878,12 +1898,12 @@ msgstr "필드 %(num)d: %(name)s [%(cards)s 사용 중]"
 msgid "Field %d"
 msgstr "필드 %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "필드 <b>%d</b:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "필드 할당"
 
@@ -1899,7 +1919,7 @@ msgstr ""
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1923,17 +1943,17 @@ msgstr "소개(&A)..."
 msgid "Fonts & Colours"
 msgstr "글꼴과 색깔"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "모델"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "모델"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1949,12 +1969,12 @@ msgstr ""
 msgid "General && Fields"
 msgstr ""
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "삭제(&D)"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "삭제(&D)"
@@ -2014,8 +2034,8 @@ msgstr ""
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "이미지 (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "가져오기"
 
@@ -2023,25 +2043,25 @@ msgstr "가져오기"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "가져오기 실패\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "가져오기 설정"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, fuzzy, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "가져오기 완료. %(file)s로부터 %(num)d개 카드.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "가져오기 실패\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 #, fuzzy
 msgid "Importing..."
 msgstr "가져오기(&I)..."
@@ -2059,11 +2079,11 @@ msgstr "복습 일정 포함"
 msgid "Include tags"
 msgstr "꼬리표 포함"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "복습 간격"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -2071,14 +2091,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2110,6 +2130,11 @@ msgstr ""
 msgid "Korean"
 msgstr "한국어"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "쉬움"
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2125,16 +2150,16 @@ msgstr "Latex equation"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Latex 수식 환경"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "체코어"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr ""
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 #, fuzzy
 msgid "Loading graphs (may take time)..."
 msgstr "그래프 불러오는 중 (시간이 걸릴 수 있음)..."
@@ -2144,21 +2169,26 @@ msgstr "그래프 불러오는 중 (시간이 걸릴 수 있음)..."
 msgid "Loading..."
 msgstr "저장 중..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "가져오기 결과:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "%s로 할당하기"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 #, fuzzy
 msgid "Map to Tags"
 msgstr "%s로 할당하기"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "카드:"
@@ -2190,7 +2220,7 @@ msgstr "모델 속성"
 msgid "Models && Priorities"
 msgstr "모델 속성"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 #, fuzzy
 msgid "Modified"
 msgstr "수정한 날"
@@ -2199,7 +2229,7 @@ msgstr "수정한 날"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "모델"
@@ -2228,6 +2258,10 @@ msgstr ""
 msgid "Move selected field up"
 msgstr ""
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr ""
@@ -2241,12 +2275,12 @@ msgstr "서버에 '%s' 묶음 만들기"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "복습 중"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "복습 중"
@@ -2259,7 +2293,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2271,16 +2305,16 @@ msgstr ""
 msgid "No changes found."
 msgstr ""
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "아무 카드도 없음"
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "꼬리표 포함"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2289,7 +2323,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "한국어"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 #, fuzzy
 msgid "Nothing"
 msgstr "가져오기 설정"
@@ -2299,12 +2333,12 @@ msgstr "가져오기 설정"
 msgid "Nothing selected."
 msgstr "선택한 카드를..."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "열기(&O)..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "최근에 공부한 묶음(&R)"
@@ -2314,7 +2348,7 @@ msgstr "최근에 공부한 묶음(&R)"
 msgid "Open Recent..."
 msgstr "최근에 공부한 묶음(&R)"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "묶음 열기"
 
@@ -2323,7 +2357,7 @@ msgstr "묶음 열기"
 msgid "Open the bug tracker"
 msgstr "오류 신고 게시판 열기"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "묶음 열기"
@@ -2332,7 +2366,7 @@ msgstr "묶음 열기"
 msgid "Optimize Database"
 msgstr ""
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "저장 중..."
@@ -2354,7 +2388,7 @@ msgstr ""
 msgid "Password"
 msgstr "비밀번호"
 
-#: ui/main.py:910
+#: ui/main.py:889
 #, fuzzy
 msgid "Password:"
 msgstr "비밀번호"
@@ -2385,6 +2419,10 @@ msgstr "먼저 새 필드를 추가해 주세요."
 msgid "Please add another model first."
 msgstr "먼저 새 모델을 추가해 주세요."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "정렬 기준이 될 필드를 선택해 주세요."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "아이디와 비밀번호를 다시 확인해 주세요."
@@ -2394,7 +2432,7 @@ msgstr "아이디와 비밀번호를 다시 확인해 주세요."
 msgid "Please enable a different template first."
 msgstr "먼저 다른 모델을 켜주세요."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2404,11 +2442,11 @@ msgid ""
 "to enable recording."
 msgstr ""
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "그래프를 보려면 python-matplotlib를 설치해 주세요."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2469,7 +2507,7 @@ msgstr "미리보기"
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2486,7 +2524,7 @@ msgstr "연결 중..."
 msgid "Put space between question and answer"
 msgstr "답을 보여줄 때, 질문을 감춤"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "질문"
 
@@ -2510,7 +2548,7 @@ msgstr "질문 글자 크기"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 #, fuzzy
 msgid "Randomizing..."
 msgstr "저장 중..."
@@ -2534,12 +2572,12 @@ msgstr "소리 넣기"
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr ""
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr ""
 
@@ -2569,16 +2607,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "마지막 소리 다시 듣기(&T)"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "연결 중..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr ""
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 #, fuzzy
 msgid "Reschedule"
 msgstr "복습 일정"
@@ -2606,7 +2644,7 @@ msgstr "복습 중"
 msgid "Review Time"
 msgstr "복습 중"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "복습 중"
@@ -2630,7 +2668,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "다른 이름으로 저장(&A)"
 
-#: ui/main.py:1015
+#: ui/main.py:994
 #, fuzzy
 msgid "Save Deck As"
 msgstr "묶음 저장"
@@ -2689,7 +2727,7 @@ msgstr "꼬리표 삭제..."
 msgid "Select None"
 msgstr "꼬리표 삭제..."
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "묶음 통계(&D)"
@@ -2718,7 +2756,7 @@ msgstr "Ctrl+A"
 msgid "Shift+Alt+m"
 msgstr "Ctrl+A"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 #, fuzzy
 msgid "Show Answer"
 msgstr "정답 보기"
@@ -2788,14 +2826,14 @@ msgstr ""
 msgid "Show/Hide"
 msgstr "정답 보기"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
 msgstr "현재 컴퓨터의 시계가 1분 이상 느리거나 빠릅니다. 정확하게 맞춰 주세요."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr ""
 
@@ -2804,7 +2842,7 @@ msgstr ""
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 #, fuzzy
 msgid "Soon"
 msgstr "가져오기 설정"
@@ -2815,7 +2853,7 @@ msgstr ""
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "소리 (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2826,7 +2864,7 @@ msgstr ""
 msgid "Spanish"
 msgstr "스페인어"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr ""
 
@@ -2839,7 +2877,7 @@ msgstr ""
 msgid "Startup"
 msgstr "상태"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "상태"
 
@@ -2848,14 +2886,14 @@ msgstr "상태"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "현재 카드를 보류합니다. 묶음 편집기에서 해제할 수 있습니다."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 #, fuzzy
 msgid "Suspend"
 msgstr "보류(&S)"
@@ -2864,7 +2902,7 @@ msgstr "보류(&S)"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "보류(&S)"
@@ -2873,7 +2911,7 @@ msgstr "보류(&S)"
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2905,7 +2943,7 @@ msgstr "동기시킬 묶음 이름:"
 msgid "Synchronize this deck with Anki Online"
 msgstr "동기시킬 묶음 이름:"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 #, fuzzy
 msgid "Syncing Media..."
 msgstr "동기화 실패: %(a)s"
@@ -2915,12 +2953,12 @@ msgstr "동기화 실패: %(a)s"
 msgid "Syncing failed: %(a)s"
 msgstr "동기화 실패: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 #, fuzzy
 msgid "Tag Cards"
 msgstr "카드"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "필드가 중복되면 삭제하지 않고 꼬리표를 붙여 구분합니다."
 
@@ -2928,12 +2966,12 @@ msgstr "필드가 중복되면 삭제하지 않고 꼬리표를 붙여 구분합
 msgid "Tags"
 msgstr "꼬리표"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 #, fuzzy
 msgid "Tags to cram:"
 msgstr "꼬리표 추가:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr ""
 
@@ -2964,26 +3002,26 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 #, fuzzy
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "매일 추가된 카드 개수"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 #, fuzzy
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "매일 추가된 카드 개수"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 #, fuzzy
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "매일 추가된 카드 개수"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 #, fuzzy
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "매일 추가된 카드 개수"
@@ -2992,7 +3030,7 @@ msgstr "매일 추가된 카드 개수"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "동기화 프로토콜이 변경되었습니다. 업데이트 해 주세요."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 #, fuzzy
 msgid "The total number of new cards in the deck"
 msgstr "매일 추가된 카드 개수"
@@ -3078,7 +3116,7 @@ msgid ""
 "You will need to remove the source first."
 msgstr ""
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -3089,7 +3127,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3120,7 +3158,7 @@ msgstr ""
 "\n"
 "카드도 같이 삭제할까요?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3128,7 +3166,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3140,7 +3178,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr ""
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr ""
 
@@ -3172,7 +3210,7 @@ msgid ""
 "\n"
 msgstr "서버에 연결할 수 없음"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3185,11 +3223,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "파일을 불러올 수 없습니다."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3200,7 +3238,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 #, fuzzy
 msgid "Unable to recover. Deck load failed."
 msgstr "파일을 불러올 수 없습니다."
@@ -3214,7 +3252,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "밑줄"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, fuzzy, python-format
 msgid "Undo %s"
 msgstr "%s 안에"
@@ -3224,19 +3262,19 @@ msgstr "%s 안에"
 msgid "Unknown error: %s"
 msgstr "알 수 없는 오류: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "보류(&S)"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3262,7 +3300,7 @@ msgstr "글자 크기 지정"
 msgid "Username"
 msgstr "아이디"
 
-#: ui/main.py:906
+#: ui/main.py:885
 #, fuzzy
 msgid "Username:"
 msgstr "아이디"
@@ -3306,15 +3344,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 #, fuzzy
 msgid ""
 "Your version of Matplotlib is broken.\n"
@@ -3336,7 +3374,7 @@ msgstr "카드"
 msgid "days"
 msgstr ""
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr ""
 
@@ -3344,7 +3382,7 @@ msgstr ""
 msgid "facts"
 msgstr "지식"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "%s 안에"
@@ -3354,17 +3392,17 @@ msgstr "%s 안에"
 msgid "label"
 msgstr "Latex"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 #, fuzzy
 msgid "late"
 msgstr "Latex"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "<b>%s</b>로 할당 됨"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 #, fuzzy
 msgid "mapped to <b>Tags</b>"
 msgstr "<b>%s</b>로 할당 됨"
@@ -4138,9 +4176,6 @@ msgstr "Latex"
 #~ msgid "Description && Synchronisation"
 #~ msgstr "설명 및 동기화"
 
-#~ msgid "Dialog"
-#~ msgstr "대화상자"
-
 #~ msgid "Difficult"
 #~ msgstr "어려움"
 
@@ -4317,9 +4352,6 @@ msgstr "Latex"
 #~ msgid "Please add a new card first."
 #~ msgstr "먼저 새 카드를 추가해 주세요."
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "정렬 기준이 될 필드를 선택해 주세요."
-
 #~ msgid "Prevent me from entering the same thing in this field twice"
 #~ msgstr "이 필드에 같은 내용이 입력되는 것을 방지"
 
diff --git a/ankiqt/locale/ankiqt_mn_MN.po b/ankiqt/locale/ankiqt_mn_MN.po
index 49a4b60fc..40f6a8b45 100644
--- a/ankiqt/locale/ankiqt_mn_MN.po
+++ b/ankiqt/locale/ankiqt_mn_MN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-04-20 13:10+0600\n"
 "Last-Translator: Charlene <charlener@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,17 +40,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "  Зогс"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -77,11 +77,11 @@ msgstr " <b>Засварлахдаа (дээрхийг нь орлоно):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Давтаад сурахдаа:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 #, fuzzy
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Хүчинтэй хэрэглээний хүрээг оруулна уу?"
@@ -91,7 +91,7 @@ msgstr "Хүчинтэй хэрэглээний хүрээг оруулна уу
 msgid " applied %d modified cards."
 msgstr " %d өөрчилсөн картуудыг хэрэглэсэн."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -111,7 +111,7 @@ msgstr[1] "%(name)s [%(facts)d баримтууд]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(totalSum)d-с %(partOf)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(cards)d-с %(due)d-г дахин давтах) - %(title)s"
@@ -128,33 +128,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d экспортолсон."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d-г сонгосон"
 msgstr[1] "%d-г сонгосон"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -165,7 +165,7 @@ msgstr[1] ""
 "%(a)d дутсан ишлэлүүд.\n"
 "%(b)d хэрэггүй файлуудыг устгасан."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s-н өмнө"
@@ -297,7 +297,7 @@ msgstr "&Диаграммууд"
 msgid "&Help"
 msgstr "&Тусламж"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "И&мпорт"
 
@@ -401,12 +401,12 @@ msgstr "&Буцаа"
 msgid "&Unsuspend Cards"
 msgstr "&Баримтыг түдгэлзэх"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(new card)"
 
@@ -443,7 +443,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "<Tag filter>"
@@ -461,7 +461,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Т
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Тусламж</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Тусламж</a>"
@@ -498,12 +498,12 @@ msgstr "<b>Хариулт</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Картууд</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Нэр</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Нэр</b>"
@@ -585,7 +585,7 @@ msgstr "<b>Өдөр бүрд хэдэн шинэ карт:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Шинэ өдрийн цаг</b>:"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Нэр</b>"
@@ -629,7 +629,7 @@ msgstr "<b>Зайн олшруулагч</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Түдгэлзүүлсэн</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "Нэмэхийн шошгууд:"
@@ -660,7 +660,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Хамгийн Чухал</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -712,7 +712,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Картын Бэлдцүүд</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -723,7 +723,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Дахин давтах</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Одоогийн карт</h1>"
 
@@ -764,11 +764,11 @@ msgstr "<h1>Зайнууд</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Хэл</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Сүүлийн карт</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -776,7 +776,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Зүйлүүд</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 #, fuzzy
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Вебийн данс</h1>Таны үнэгүй <a href=\"http://anki.ichi2.net/\">вебийн дансыг</a> хэрэглэхээр,<br>дараагийн маягт баглаарай.<br>"
@@ -802,7 +802,7 @@ msgstr "<h1>Удаа</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Хичээл давталтын цаг</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -814,7 +814,7 @@ msgstr "<h1>Давталт</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Төлөвлөгөөний Талбарыг Сонго</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Сурахын тохиргоонууд</h1>"
 
@@ -830,7 +830,7 @@ msgstr "<h1>Давхцал</h1><a href=\"http://anki.ichi2.net/\">Үнэгүй 
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Давхцах</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -852,11 +852,11 @@ msgstr ""
 "        байна. Өөрчлөлтүүдийг нь хадгалах, устгах,\n"
 "        эсвэл хүчингүй гэсийн юм?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Сайн байна!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignored>"
 
@@ -910,7 +910,7 @@ msgstr "Материалыг нэм"
 msgid "Add Model"
 msgstr "Зүйлийг нэм"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Шошгыг нэм"
 
@@ -961,7 +961,7 @@ msgstr "Давтан"
 msgid "Again"
 msgstr "Дахиад"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Бүх талбарууд"
 
@@ -973,16 +973,16 @@ msgstr "Бүх давталтууд"
 msgid "Allow the answer to be blank"
 msgstr "Хоосон хариулт хийхийг зөвшөөрөх"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Одоо оройтож бэлтгэж байна. Эхлээд цуглуулгыг хаана уу?"
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+%d"
@@ -1000,7 +1000,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "%s-г нээхэд алдаа болсон"
 
-#: ui/main.py:201
+#: ui/main.py:202
 #, fuzzy
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
@@ -1009,7 +1009,7 @@ msgstr ""
 "Хавсарга програмын алдаа байсан.  Хавсарга програмын зохиолыг хэлж өгөөч.<br>\n"
 "Анки-н сайтын дээр алдааны тайлан битгий баглаарай.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1019,7 +1019,7 @@ msgstr ""
 "Та цуглуулгыг алдаад шалгаж үзэх уу?\n"
 "Яаралгүй хийнэ байхаа."
 
-#: ui/main.py:192
+#: ui/main.py:193
 #, fuzzy
 msgid ""
 "An error occurred. Please:<p>\n"
@@ -1038,8 +1038,8 @@ msgstr ""
 "Алдааг засварлахгүй бол дараагийн нь<br>\n"
 "алдааны тайланд хуулаарай:<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Анки"
 
@@ -1047,7 +1047,7 @@ msgstr "Анки"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 "Анки таны тохиргооны файлыг хадгалаагүй:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Хариулт"
 
@@ -1084,6 +1084,15 @@ msgstr "Дараа браузерын дээр энэ баримт хайхаа
 msgid "Applying reply..."
 msgstr "Хариултыг хадгалж байна..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "Нэг хариултын дундаж цаг:"
@@ -1127,7 +1136,7 @@ msgstr "Хэсгүүдийг үз"
 msgid "Browse and edit all items"
 msgstr "Бүх хэсгүүдээс нэг нэгийг нь үзээд засварлах"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1139,14 +1148,21 @@ msgstr[1] "Браузер %(tot)d-с (%(cur)d картууд үзүүлсэн; %
 msgid "Browser Font"
 msgstr "Хэсгүүдийг үз"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Индекс хийж байна..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "&Оройтож бэлтгэх"
@@ -1155,15 +1171,15 @@ msgstr "&Оройтож бэлтгэх"
 msgid "Cache LaTeX"
 msgstr "Ойн дээр LaTeX-г хадгалах"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Зүйлээс зөвхөн нэг нэгийг нь өөрчлөх чадна."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Зүйлээс зөвхөн нэг нэгийг нь өөрчлөх чадна."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Хүчингүй"
 
@@ -1202,20 +1218,20 @@ msgstr "Картууд таныг хүлээж байна"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "Карт:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Өөрчлөх"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "%s-с дараагийн нь өөрчлөх:"
@@ -1224,7 +1240,7 @@ msgstr "%s-с дараагийн нь өөрчлөх:"
 msgid "Change &Model..."
 msgstr "&Зүйлийг Өөрчлөх..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Зүлийг Өөрчлөх"
 
@@ -1236,7 +1252,7 @@ msgstr "Медианы өгөгдлийн саныг шалгах..."
 msgid "Check complete."
 msgstr "Шалгалт дууссан"
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1248,7 +1264,7 @@ msgstr "Өгөгдлийн саныг алдаануудад шалгах..."
 msgid "Check the files in the media directory"
 msgstr "Медиа каталогийн файлуудыг шалгах"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1319,7 +1335,7 @@ msgstr "Давталтын тохиргоонуудыг өөрчлөх"
 msgid "Connecting..."
 msgstr "Холбож байна..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "Давтахыг &Үргэлжлэх"
 
@@ -1348,15 +1364,15 @@ msgstr "Өнөөдөр зөв хариулсан нь:"
 msgid "Correct under a month: "
 msgstr "Сараас бага зөв хариулсан нь:"
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Оройтож бэлтгэх"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "Шинэ цуглуулгын сонгосон картуудыг нь оройтож бэлтгэх уу?"
 
@@ -1370,11 +1386,11 @@ msgstr "Үүсгэсэн"
 msgid "Create '%s' on server"
 msgstr "Серверийн дээр '%s' үүсгэх"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Үүсгэсэн"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1523,7 +1539,7 @@ msgstr "Давхцал, төлөвлөлт, яаралууд, бас зүйлү
 msgid "Czech"
 msgstr "Чех хэл"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1540,32 +1556,32 @@ msgstr "Цуглуулгын тохиргоонууд"
 msgid "Deck Properties"
 msgstr "Диаграммууд"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Цуглуулгын файлууд (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Цуглуулга нээж л байна."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Устга"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Лавлахуудыг устгах"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Картуудыг устга"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Лавлахуудыг устгах"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Шошгыг устгах"
 
@@ -1581,11 +1597,15 @@ msgstr "Одоогийн картыг устгах"
 msgid "Determining differences..."
 msgstr "Ялгааг тодорхойлж байна..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Диалог"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "&Унтраах"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Талбарыг устга"
 
@@ -1640,7 +1660,7 @@ msgstr "Шинэ чанар Анкит нэмэхээр хавсарга про
 msgid "Downloaded %dKB"
 msgstr "Таталтууд"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1654,7 +1674,7 @@ msgstr "&Тат..."
 msgid "Downloads"
 msgstr "Таталтууд"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Дахин давтах"
@@ -1668,7 +1688,7 @@ msgstr "&Гарах"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "<b>%(timeLeft)s</b> үлдлэж байна"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Амрын түвшин"
 
@@ -1696,7 +1716,7 @@ msgstr "Одоогийн үзүүлсэн хэсгийг засварлах"
 msgid "Ena&ble"
 msgstr "&Асаах"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1704,11 +1724,11 @@ msgstr ""
 msgid "English"
 msgstr "Англи"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Нэмэхийн шошгыг оруулах: "
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Устгахын шошгыг оруулах:"
 
@@ -1752,7 +1772,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1776,7 +1796,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Үүсгэсэн"
@@ -1785,7 +1805,7 @@ msgstr "Үүсгэсэн"
 msgid "Facts"
 msgstr "Баримтууд"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Медиа илгээхийг дампуурсан. 'Медиа өгөгдлийн саныг шалгах' гүйцэтгээрэй.  "
 
@@ -1813,12 +1833,12 @@ msgstr "Талбар %(num)d: %(name)s [%(cards)s бүү хоосон]"
 msgid "Field %d"
 msgstr "Талбар %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Файлын талбар <b>%d</b> :"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Талбарын тааруулах"
 
@@ -1835,7 +1855,7 @@ msgstr "<Tag filter>"
 msgid "Find and Re&place..."
 msgstr "Хайж &орлуулах..."
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Хайж орлуулах"
 
@@ -1856,17 +1876,17 @@ msgstr "&Бэлэглэх..."
 msgid "Fonts & Colours"
 msgstr "Фонт бас өнгөнүүд"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Илүү>>"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Илүү>>"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1883,11 +1903,11 @@ msgstr "Өгөгдлийн саныг шалгах..."
 msgid "General && Fields"
 msgstr "Ерөнхий && Талбарууд"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Картуудыг гаргах"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Картуудыг гаргах..."
 
@@ -1944,8 +1964,8 @@ msgstr "Энэ шинэчлэлийг үл тоох"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Зургууд (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Импорт хий"
 
@@ -1953,25 +1973,25 @@ msgstr "Импорт хий"
 msgid "Import cards from text files, Anki files and more"
 msgstr "Текст файлууд, Анки файлууд, өөрөөс нь картыг импортлох"
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Импортлохыг дампуурсан.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Импортын тохиргоонууд"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Импортыг дуусчихсан.  %(file)s-с %(num)d баримтуудыг импортолсон.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Импортлохыг дампуурсан.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Импортолж байна..."
 
@@ -1988,11 +2008,11 @@ msgstr "Төлөвлөлтийн мэдээллийг хамрах"
 msgid "Include tags"
 msgstr "Шошгуудыг оруулах"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Зай"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Хүчингүй байнгын илэрхийлэл"
 
@@ -2000,14 +2020,14 @@ msgstr "Хүчингүй байнгын илэрхийлэл"
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2038,6 +2058,11 @@ msgstr ""
 msgid "Korean"
 msgstr "Солонгон хэл"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Амрын төвшнүүд"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "LaTeX (Ctrl+l тэгээд l)"
@@ -2050,16 +2075,16 @@ msgstr "LaTeX-н тэгшитгэл (Ctrl+l тэгээд e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "LaTeX математикийн ахуй (Ctrl+l тэгээд m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Чех хэл"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Цуглуулгын ачаалагдаж байна..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Диаграммуудыг ачаалагдаж байна.  Та хүлээнэ уу..."
 
@@ -2067,20 +2092,25 @@ msgstr "Диаграммуудыг ачаалагдаж байна.  Та хүл
 msgid "Loading..."
 msgstr "Ачаалагдаж байна..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Импортын бүртгэлц:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "%s-тай тааруулах"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Шошготой холбо"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Хэцүү"
@@ -2111,7 +2141,7 @@ msgstr "Зүйлийн чанарууд"
 msgid "Models && Priorities"
 msgstr "Зүйлийн && чанарууд"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Өөрчилсөн"
 
@@ -2119,7 +2149,7 @@ msgstr "Өөрчилсөн"
 msgid "Mongolian"
 msgstr "Монгол хэл"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Илүү>>"
@@ -2148,6 +2178,10 @@ msgstr "Сонгосон талбарыг доошоо хөдлөх"
 msgid "Move selected field up"
 msgstr "Сонгосон талбарыг дээшээ хөдлөх"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Нэр"
@@ -2160,12 +2194,12 @@ msgstr "Серверийн дээр нэр:"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "Өнөөдрийн давталтууд"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr ""
 
@@ -2177,7 +2211,7 @@ msgstr "Дараагийн өнгө (F7 тэгээд F8)"
 msgid "Next field must be blank."
 msgstr "Дараагийн талбар хоослуулах ёстой."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Картуудаас сонгосон шошготой нь байхгүй."
 
@@ -2189,16 +2223,16 @@ msgstr "Өмнөх үзэмжийн картууд байхгүй."
 msgid "No changes found."
 msgstr "Өөрчлөлт олоогүй."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Одоогийн бас сүүлийн карт байхгүй."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "Шошгогүй"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2207,7 +2241,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Солонгон хэл"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "Юу ч байхгүй"
 
@@ -2215,12 +2249,12 @@ msgstr "Юу ч байхгүй"
 msgid "Nothing selected."
 msgstr "Юуг ч сонгоогүй."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Нээ..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "&Сүүлд хаасан нь нээ"
@@ -2230,7 +2264,7 @@ msgstr "&Сүүлд хаасан нь нээ"
 msgid "Open Recent..."
 msgstr "&Сүүлд хаасан нь нээ"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Цуглуулгыг нээ"
 
@@ -2238,7 +2272,7 @@ msgstr "Цуглуулгыг нээ"
 msgid "Open the bug tracker"
 msgstr "Алдааны мөрчийг нээ"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Цуглуулгыг нээ"
@@ -2247,7 +2281,7 @@ msgstr "Цуглуулгыг нээ"
 msgid "Optimize Database"
 msgstr "Өгөгдлийн саныг зүгшрүүлэх"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Ачаалагдаж байна..."
@@ -2269,7 +2303,7 @@ msgstr "Хэмжин савласан цуглуулга (*.zip)"
 msgid "Password"
 msgstr "Нууц үг"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Нууц үг:"
 
@@ -2299,6 +2333,10 @@ msgstr "Эхлээд шинэ талбарыг нэмнэ уу?"
 msgid "Please add another model first."
 msgstr "Дахин зүйл нэмнэ уу?"
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Талбараас эрэмбэлэхээр нь сонго."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Та зөв хэрэглэгчийн нэр, нууц үгийг оруулна уу?"
@@ -2308,7 +2346,7 @@ msgstr "Та зөв хэрэглэгчийн нэр, нууц үгийг ору
 msgid "Please enable a different template first."
 msgstr "Өөр зүйлийг асаана уу?"
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Хүчинтэй хэрэглээний хүрээг оруулна уу?"
 
@@ -2318,11 +2356,11 @@ msgid ""
 "to enable recording."
 msgstr "Дуу хураахаар <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>-г суулгаарай."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Диаграммууд руу орох болохоор python-matplotlib-г суулгаарай."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Өгөгдлийн саныг шалгахыг өмнө Анки дахин асаарай."
 
@@ -2380,7 +2418,7 @@ msgstr "Картуудыг өмнөх үзэх"
 msgid "Previous colour (F7 then F6)"
 msgstr "Өнгөрсөн өнгө (F6 тэгээд F7)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2397,7 +2435,7 @@ msgstr "Гүйцэтгэж байна..."
 msgid "Put space between question and answer"
 msgstr "Асуулт, хариулт хоёрын хооронд зай тавих"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Асуулт"
 
@@ -2421,7 +2459,7 @@ msgstr "Асуултын хэмжээ"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Санамсаргүй дараалал хийж байна..."
 
@@ -2442,12 +2480,12 @@ msgstr "Дуу хураах (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Дуу хурааж байна...<br>Цаг: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "%s дахиад хий"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Шинэчлэх"
 
@@ -2475,15 +2513,15 @@ msgstr "Хэрэглээгүй хэмжээг устгаад өгөгдлийн
 msgid "Repeat &Audio"
 msgstr "Дуу &дахиад тоглох"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Оруулж байна..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Удаа"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Дахин төлөвлөх"
 
@@ -2507,7 +2545,7 @@ msgstr "Давталт"
 msgid "Review Time"
 msgstr "Давталтын Цаг"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "Өнөөдрийн давталтууд"
@@ -2529,7 +2567,7 @@ msgstr "Чимээгүй хуурдаж байна...<br>Цаг: %0.1f"
 msgid "Save &As..."
 msgstr "&Өөр нэрт хадгалах..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Цуглуулга өөр нэрийг хадгалах"
 
@@ -2583,7 +2621,7 @@ msgstr "&Бүгдийг сонго"
 msgid "Select None"
 msgstr "&Бүгдийг сонго"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "&Цуглуулгын статистикс"
@@ -2610,7 +2648,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Хариулт үзүүлэх"
 
@@ -2674,7 +2712,7 @@ msgstr "Мэдээллийн цэгийн тэмдэг үзүүлэх"
 msgid "Show/Hide"
 msgstr "Үзүүлэх/Hуух"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2686,7 +2724,7 @@ msgstr ""
 "Яагаад гэвэл үүнээс олон давхцалын алдаа шалтгаацаж чадна,\n"
 "Алдааг засварлахын хүртэл давхцал унтраасан."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Зарим талбар байхгүй эсвэл цор ганц битгий байна."
 
@@ -2695,7 +2733,7 @@ msgstr "Зарим талбар байхгүй эсвэл цор ганц бит
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Зарим тохируулгууд Анкиг дахин асаахийн дараа үр дүн нь гарна."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Одоохон"
 
@@ -2705,7 +2743,7 @@ msgstr "Тоотоор эрэмбэлэх"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Дуунууд (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2716,7 +2754,7 @@ msgstr "Эх үүсвэрийн ялгах тэмдэг:"
 msgid "Spanish"
 msgstr "Испани хэл"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "Давтахыг &эхлэх"
 
@@ -2728,7 +2766,7 @@ msgstr "Материалаа эхлэн нэм."
 msgid "Startup"
 msgstr "Эхлэл"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Байдал"
 
@@ -2736,14 +2774,14 @@ msgstr "Байдал"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Энэ карт браузерт бүү түдгэлзүүлэхийн хүртэл давтахгүй"
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Түдгэлзэх"
 
@@ -2751,7 +2789,7 @@ msgstr "Түдгэлзэх"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "Түдгэлзэх"
@@ -2760,7 +2798,7 @@ msgstr "Түдгэлзэх"
 msgid "Swedish"
 msgstr "Швед хэл"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2788,7 +2826,7 @@ msgstr "Энэ цуглуулгыг давхац"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Энэ цуглуулга Анки Вебтэй давхац"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Медиа түдгэлзүүлж байна..."
 
@@ -2797,11 +2835,11 @@ msgstr "Медиа түдгэлзүүлж байна..."
 msgid "Syncing failed: %(a)s"
 msgstr "Давхцал дампуурсан: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Картуудыг шошго хий"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Устгахын оронд нь картуудыг хуулбар шошгуудтай хий"
 
@@ -2809,11 +2847,11 @@ msgstr "Устгахын оронд нь картуудыг хуулбар шо
 msgid "Tags"
 msgstr "Шошгууд"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Шошгоос оройтож бэлтгэх нь:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Төлөвлөгөөт цор ганц ёстой."
 
@@ -2845,23 +2883,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr ""
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2869,7 +2907,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Давхцал протокол өөрчлүүлсэн. Программыг шинэчлээрэй."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr ""
 
@@ -2956,7 +2994,7 @@ msgstr ""
 "%s\n"
 "Эхлээд та эх үүсвэрийг устгах хэрэгтэй."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2974,7 +3012,7 @@ msgstr ""
 "<b>Энэ гүйцэтгэлийг тайлж чадахгүй шүү дээ.</b><br>\n"
 "Үргэлжлэх мөн уу?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3013,7 +3051,7 @@ msgstr ""
 "\n"
 "Ийм картыг устгах мөн уу?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3021,7 +3059,7 @@ msgstr ""
 msgid "Title"
 msgstr "Гарчиг"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3033,7 +3071,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Өнөөдрийн давталтууд дууссан"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Багажид самбарыг хөшүүрэгдэх"
 
@@ -3064,7 +3102,7 @@ msgid ""
 "\n"
 msgstr "Сервертэй холбож чадаагүй."
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3086,11 +3124,11 @@ msgstr ""
 "\n"
 "Хөгшин цуглуулгыг дээшлүүлэхээр Анки 0.9.8.7-г тат."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Файлыг ачаалагдаж чадаагүй."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3101,7 +3139,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Сэргээх  чадаагүй. Цуглуулга ачаалагдахыг дампуурсан. "
 
@@ -3113,7 +3151,7 @@ msgstr "LaTeX ойгоос устгах"
 msgid "Underline text (Ctrl+u)"
 msgstr "Доогуур зурах (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "%s-г тайлах"
@@ -3123,12 +3161,12 @@ msgstr "%s-г тайлах"
 msgid "Unknown error: %s"
 msgstr ""
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "Түдгэлзэх"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3138,7 +3176,7 @@ msgstr ""
 " - сурахыг үргэлжилж болно\n"
 " - энэ битгий хаагаарай"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3164,7 +3202,7 @@ msgstr "Тохируулалтын хэмжээг хэрэглэх"
 msgid "Username"
 msgstr "Хэрэглэгч"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Хэрэглэгч:"
 
@@ -3207,16 +3245,16 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 #, fuzzy
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Одоо оройтож бэлтгэж байна. Эхлээд цуглуулгыг хаана уу?"
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3237,7 +3275,7 @@ msgstr "картууд"
 msgid "days"
 msgstr "өдрүүд"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "эрт"
 
@@ -3245,7 +3283,7 @@ msgstr "эрт"
 msgid "facts"
 msgstr "баримтууд"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "%s-н дотор"
@@ -3254,16 +3292,16 @@ msgstr "%s-н дотор"
 msgid "label"
 msgstr "тэмдэг"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "хойш"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "<b>%s</b>-тай тааруулсан"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "<b>Шошгууд</b>-той тааруулах"
 
@@ -3453,9 +3491,6 @@ msgstr "toplabel"
 #~ msgid "Customize card layout, fields, etc"
 #~ msgstr "Картын байрлал, талбарууд, гэх мэтийг тохируулах"
 
-#~ msgid "Dialog"
-#~ msgstr "Диалог"
-
 #, fuzzy
 #~ msgid "Download Deck"
 #~ msgstr "Нийтийн Цуглуулгыг тат"
@@ -3494,9 +3529,6 @@ msgstr "toplabel"
 #~ msgid "Please add a new card first."
 #~ msgstr "Эхлээд шинэ картыг нэмнэ уу?"
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Талбараас эрэмбэлэхээр нь сонго."
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "&Хариултын дуу дахиад тоглох"
 
diff --git a/ankiqt/locale/ankiqt_nb_NO.po b/ankiqt/locale/ankiqt_nb_NO.po
index c372cd737..120506a74 100644
--- a/ankiqt/locale/ankiqt_nb_NO.po
+++ b/ankiqt/locale/ankiqt_nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt 0.9.9.7.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-05-03 15:29+0100\n"
 "Last-Translator: Lars Lem <larslem@online.no>\n"
 "Language-Team: Norwegian <larslem@online.no>\n"
@@ -40,17 +40,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "Stopp"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -77,11 +77,11 @@ msgstr " <b>Ved endring (foretrekkes før det over):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Ved repetisjon og endring:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 #, fuzzy
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Angi et gyldig start- og sluttintervall"
@@ -91,7 +91,7 @@ msgstr "Angi et gyldig start- og sluttintervall"
 msgid " applied %d modified cards."
 msgstr "tatt i bruk %d endrede kort."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -111,7 +111,7 @@ msgstr[1] "%(name)s [%(facts)d fakta]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d av %(totalSum)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d av %(cards)d er på tide å repetere) - %(title)s"
@@ -128,33 +128,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d eksportert."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d valgt"
 msgstr[1] "%d valgt"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -165,7 +165,7 @@ msgstr[1] ""
 "%(a)d savnede referanser.\n"
 "%(b)d ubrukte filer tatt bort."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s siden"
@@ -296,7 +296,7 @@ msgstr "&Grafer..."
 msgid "&Help"
 msgstr "&Hjelp"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importere"
 
@@ -400,12 +400,12 @@ msgstr "A&ngre"
 msgid "&Unsuspend Cards"
 msgstr "&Deaktivere fakta"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(nytt kort)"
 
@@ -441,7 +441,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr "<Filter>"
 
@@ -458,7 +458,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Hj
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Hjelp</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Hjelp</a>"
@@ -495,12 +495,12 @@ msgstr "<b>Svar</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Kort</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Navn</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Navn</b>"
@@ -579,7 +579,7 @@ msgstr "<b>Nye kort per dag:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Ny dag begynner kl. </b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Navn</b>"
@@ -622,7 +622,7 @@ msgstr "<b>Multippel for tiden mellom kort</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Deaktivert</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 msgid "<b>Tags to append</b>:"
 msgstr "<b>Etiketter å legge til</b>:"
 
@@ -652,7 +652,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Meget høy prioritet</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -704,7 +704,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Kortmaler</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -718,7 +718,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Akkumulert antall hvis frist er ute</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Dette kort</h1>"
 
@@ -759,11 +759,11 @@ msgstr "<h1>Intervall</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Språk</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Siste kortet</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Lær deg mer</h1>Trykk på klokken på verktøylinjen for å avslutte."
 
@@ -771,7 +771,7 @@ msgstr "<h1>Lær deg mer</h1>Trykk på klokken på verktøylinjen for å avslutt
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modeller</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 #, fuzzy
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Konto på nettet</h1>For å bruke din gratis <a href=\"http://anki.ichi2.net/\">konto på nettet</a>,<br>fyller du inn dine data her.<br>"
@@ -797,7 +797,7 @@ msgstr "<h1>Repetisjoner</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Øvingstid</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Repeter tidlig</h1>Trykk på klokken på verktøylinjen for å avslutte."
 
@@ -809,7 +809,7 @@ msgstr "<h1>Øving</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Velg målfelt</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Innlæringsalternativ</h1>"
 
@@ -825,7 +825,7 @@ msgstr "<h1>Synkronisering</h1><a href=\"http://anki.ichi2.net/\">Opprett en gra
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Synkronisere</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -847,11 +847,11 @@ msgstr ""
 "        endringer. Vil du lagre dem, forkaste\n"
 "        endringene eller avbryte?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Bra gjort!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignorert>"
 
@@ -905,7 +905,7 @@ msgstr "Legg til materiale"
 msgid "Add Model"
 msgstr "Legg til modell"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Legg til etiketter"
 
@@ -956,7 +956,7 @@ msgstr "Avansert"
 msgid "Again"
 msgstr "Igjen"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Alle felt"
 
@@ -968,16 +968,16 @@ msgstr "Alle repetisjoner"
 msgid "Allow the answer to be blank"
 msgstr "Tillat tomme svar"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Holder allerede på med å øve. Avslutt denne kortstokken først."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+%d"
@@ -995,7 +995,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "Det oppstod en feil når %s skulle åpnes"
 
-#: ui/main.py:201
+#: ui/main.py:202
 #, fuzzy
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
@@ -1004,7 +1004,7 @@ msgstr ""
 "Det oppstod en feil i en innstikksmodul. Kontakt instikksmodulens opphavsmann.<br>\n"
 "Ikke rapporter feilen til Anki.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1014,7 +1014,7 @@ msgstr ""
 "Vil du kjøre en kortstokkskontroll?\n"
 "Dette kan ta litt tid."
 
-#: ui/main.py:192
+#: ui/main.py:193
 #, fuzzy
 msgid ""
 "An error occurred. Please:<p>\n"
@@ -1033,8 +1033,8 @@ msgstr ""
 "Hvis dette ikke løser problemet, kopier følgende tekst<br>\n"
 "til en feilrapport:<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1042,7 +1042,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Anki kunne ikke lagre din konfigurasjonsfil:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Svar"
 
@@ -1079,6 +1079,15 @@ msgstr "Sett etiketten 'markert' på denne faktaen så du senere kan finne den i
 msgid "Applying reply..."
 msgstr "Tilpasser svaret..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "Gjenomsnittstid per svar: "
@@ -1122,7 +1131,7 @@ msgstr "Søk blant poster"
 msgid "Browse and edit all items"
 msgstr "Søk og rediger alle poster"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1133,14 +1142,21 @@ msgstr[1] "Søker (%(cur)d av %(tot)d kort vises; %(sel)s)"
 msgid "Browser Font"
 msgstr "Font for browser"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Konstruerer indeks..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr "Gravlegg"
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "&Råpugge"
@@ -1149,15 +1165,15 @@ msgstr "&Råpugge"
 msgid "Cache LaTeX"
 msgstr "Les inn Latex i cachen"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Du kan bare endre en modell av gangen."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Du kan bare arbeide med en modell av gangen."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1197,19 +1213,19 @@ msgstr "Det finnes kort som venter"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr "Kort/dag"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr "Kort/øvingssesjon:"
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Endre"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "Endre %s til:"
@@ -1218,7 +1234,7 @@ msgstr "Endre %s til:"
 msgid "Change &Model..."
 msgstr "Bytt &modell..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Bytt modell"
 
@@ -1230,7 +1246,7 @@ msgstr "Kontroller mediadatabasen..."
 msgid "Check complete."
 msgstr "Kontroll ferdig."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1242,7 +1258,7 @@ msgstr "Undersøk om databasen inneholder feil"
 msgid "Check the files in the media directory"
 msgstr "Kontrollere filene i mediebiblioteket"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1313,7 +1329,7 @@ msgstr "Tilpasse repetisjonsalternativ"
 msgid "Connecting..."
 msgstr "Tilkobler..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "&Fortsett gjennomgåelsen"
 
@@ -1342,15 +1358,15 @@ msgstr "Riktig idag: "
 msgid "Correct under a month: "
 msgstr "Riktig yngre enn en måned: "
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "Kunne ikke spille lyd. Installer mplayer."
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Råpugge"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "Råpugge valgte kort i en ny kortstokk?"
 
@@ -1364,11 +1380,11 @@ msgstr "Opprettet"
 msgid "Create '%s' on server"
 msgstr "Opprette '%s' på server"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Opprettet"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1515,7 +1531,7 @@ msgstr "Tilpasse synkronisering, planlegging, prioritering og modeller."
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1532,32 +1548,32 @@ msgstr "Kortstokksdiagram"
 msgid "Deck Properties"
 msgstr "Kortstokksegenskaper"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Kortstokksfiler (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Kortstokken er allerede åpen."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Ta bort referanser"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Ta bort kort"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Ta bort referanser"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Ta bort etiketter"
 
@@ -1573,11 +1589,15 @@ msgstr "Ta bort det kortet som vises nå"
 msgid "Determining differences..."
 msgstr "Kartlegger forskjeller..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Dialog"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Inakti&ver"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Forkaste felt"
 
@@ -1632,7 +1652,7 @@ msgstr "Laste ned en innstikksmodul for å utvikle eller endre Ankis funksjonali
 msgid "Downloaded %dKB"
 msgstr "Nedlastinger"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1646,7 +1666,7 @@ msgstr "&Hente..."
 msgid "Downloads"
 msgstr "Nedlastinger"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Tidsfrist ute"
@@ -1660,7 +1680,7 @@ msgstr "&Avslutt"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Nedtelling:<b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Innlæringsgrad"
 
@@ -1688,7 +1708,7 @@ msgstr "Redigere kortet som vises nå"
 msgid "Ena&ble"
 msgstr "A&ktivere"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1696,11 +1716,11 @@ msgstr ""
 msgid "English"
 msgstr "Engelsk"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Skriv inn etiketter som skal legges til:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Skriv inn hvilke etiketter som skal tas bort"
 
@@ -1744,7 +1764,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1768,7 +1788,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr "Fakta opprettet"
 
@@ -1776,7 +1796,7 @@ msgstr "Fakta opprettet"
 msgid "Facts"
 msgstr "Fakta"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Mislyktes med å laste opp media. Kjør kommandoen 'kontrollere mediadatabasen'."
 
@@ -1804,12 +1824,12 @@ msgstr "Felt %(num)d: %(name)s [%(cards)s ikke tomme]"
 msgid "Field %d"
 msgstr "Felt %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Felt <b>%d</b> i fil er:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Feltkobling"
 
@@ -1826,7 +1846,7 @@ msgstr "Fil&ter"
 msgid "Find and Re&place..."
 msgstr "Søk og &erstatt"
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Søk og erstatt"
 
@@ -1846,17 +1866,17 @@ msgstr "Font..."
 msgid "Fonts & Colours"
 msgstr "Font og farger"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Mer"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Mer"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1873,11 +1893,11 @@ msgstr "Kontroller databasen..."
 msgid "General && Fields"
 msgstr "Allment && Felt"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Opprett kort"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Oppretter kort..."
 
@@ -1933,8 +1953,8 @@ msgstr "Hopp over denne oppdateringen"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Bilder (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importere"
 
@@ -1942,25 +1962,25 @@ msgstr "Importere"
 msgid "Import cards from text files, Anki files and more"
 msgstr "Importer kort fra tekstfiler, anki-filer mm."
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Import mislyktes.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Importalternativ"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Importering gjennomført. %(num)d fakta ble importert fra %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Import mislyktes.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Importerer..."
 
@@ -1977,11 +1997,11 @@ msgstr "Innkluder planleggingsinformasjon"
 msgid "Include tags"
 msgstr "Innkluder etiketter"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervall"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Ugyldig regular expression."
 
@@ -1989,14 +2009,14 @@ msgstr "Ugyldig regular expression."
 msgid "Invert"
 msgstr "Veksle"
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2027,6 +2047,11 @@ msgstr ""
 msgid "Korean"
 msgstr "Koreansk"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Innlæringsgrader"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l deretter l)"
@@ -2039,16 +2064,16 @@ msgstr "Latexformel (Ctrl+l deretter e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Matematikkmiljø for Latex (Ctrl+l deretter m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Tjekkisk"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Leser inn kortstokk..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Leser inn diagram (kan ta tid)..."
 
@@ -2056,20 +2081,25 @@ msgstr "Leser inn diagram (kan ta tid)..."
 msgid "Loading..."
 msgstr "Leser inn..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Importlogg:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Koble til %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Koble til etiketter"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr "Merket"
 
@@ -2099,7 +2129,7 @@ msgstr "Modellegenskaper"
 msgid "Models && Priorities"
 msgstr "Modeller && Prioriteter"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Endret"
 
@@ -2107,7 +2137,7 @@ msgstr "Endret"
 msgid "Mongolian"
 msgstr "mongolsk"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr "Mer"
 
@@ -2135,6 +2165,10 @@ msgstr "Flytt valgt felt ned"
 msgid "Move selected field up"
 msgstr "Flytt valgt felt opp"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Navn"
@@ -2147,11 +2181,11 @@ msgstr "Navn på server: "
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr "Nye idag:"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr "Nye totalt:"
 
@@ -2163,7 +2197,7 @@ msgstr "Neste farge (F7 deretter F8)"
 msgid "Next field must be blank."
 msgstr "Neste felt må være tomt."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Ingen kort er markert med angitte etiketter."
 
@@ -2175,15 +2209,15 @@ msgstr "Det finnes ikke noen kort å forhåndsvise"
 msgid "No changes found."
 msgstr "Ingen endringer ble funnet."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Ingen åpent kort eller seneste kort."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr "Ingen etiketter på fakta"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2192,7 +2226,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Koreansk"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "Ingenting"
 
@@ -2200,12 +2234,12 @@ msgstr "Ingenting"
 msgid "Nothing selected."
 msgstr "Ingenting er valgt."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Åpne..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Å&pne siste"
@@ -2215,7 +2249,7 @@ msgstr "Å&pne siste"
 msgid "Open Recent..."
 msgstr "Å&pne siste"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Åpne kortstokk"
 
@@ -2223,7 +2257,7 @@ msgstr "Åpne kortstokk"
 msgid "Open the bug tracker"
 msgstr "Åpne bug tracker"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Åpne kortstokk"
@@ -2232,7 +2266,7 @@ msgstr "Åpne kortstokk"
 msgid "Optimize Database"
 msgstr "Optimalisere database"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 msgid "Ordering..."
 msgstr "Bestiller..."
 
@@ -2253,7 +2287,7 @@ msgstr "Pakket Ankikortstokk (*.zip)"
 msgid "Password"
 msgstr "Passord"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Passord:"
 
@@ -2282,6 +2316,10 @@ msgstr "Legg først til en ny mal."
 msgid "Please add another model first."
 msgstr "Legg først til en annen modell."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Velg et felt å sortere etter"
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Kontroller ditt brukernavn og passord en gang til."
@@ -2291,7 +2329,7 @@ msgstr "Kontroller ditt brukernavn og passord en gang til."
 msgid "Please enable a different template first."
 msgstr "Aktiver først en annen modell."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Angi et gyldig start- og sluttintervall"
 
@@ -2303,11 +2341,11 @@ msgstr ""
 "Innstaller <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "for å muliggjøre innspilling."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Innstaller python-matplotlib for å kunne bruke diagram."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Restarte Anki før du kontrollerer databasen."
 
@@ -2364,7 +2402,7 @@ msgstr "Forhåndsvise kort"
 msgid "Previous colour (F7 then F6)"
 msgstr "Forrige farge (F7 deretter F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2381,7 +2419,7 @@ msgstr "Behandler..."
 msgid "Put space between question and answer"
 msgstr "Skill spørsmål og svar med mellomrom"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Spørsmål"
 
@@ -2405,7 +2443,7 @@ msgstr "Spørsmålsstørrelse"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Stokker..."
 
@@ -2426,12 +2464,12 @@ msgstr "Spill inn lyd (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Opptak...<br>Tid: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Gjenta %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Oppfrisk"
 
@@ -2459,15 +2497,15 @@ msgstr "Ta bort ubrukt plass slik at databasen blir mindre"
 msgid "Repeat &Audio"
 msgstr "&Gjenta lyd"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Erstatter..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Gjentagelser"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Lag ny plan"
 
@@ -2491,7 +2529,7 @@ msgstr "Repetere"
 msgid "Review Time"
 msgstr "Repetisjonstid"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr "På tide å repetere:"
 
@@ -2512,7 +2550,7 @@ msgstr "Sampler stillhet...<br>Tid: %0.1f"
 msgid "Save &As..."
 msgstr "Lagre s&om..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Lagre kortstokk som"
 
@@ -2564,7 +2602,7 @@ msgstr "Marker alt"
 msgid "Select None"
 msgstr "Tøm alt"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr "Statistikk over øvingssesjoner"
 
@@ -2590,7 +2628,7 @@ msgstr "Skift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Skift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Vis svar"
 
@@ -2654,7 +2692,7 @@ msgstr "Vis ikon i systemruta"
 msgid "Show/Hide"
 msgstr "Vis/Skjul"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2666,7 +2704,7 @@ msgstr ""
 "Fordi dette kan skape problemer i forbindelse\n"
 "med synkronisering, er synkronisering deaktivert til problemet er løst."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Noen felt mangler eller er ikke unike"
 
@@ -2675,7 +2713,7 @@ msgstr "Noen felt mangler eller er ikke unike"
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Visse innstillinger blir aktive først etter at du har restartet Anki."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Snart"
 
@@ -2685,7 +2723,7 @@ msgstr "Sorter som tall"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Lyd (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2696,7 +2734,7 @@ msgstr "Kilde-ID:"
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "&Start øving"
 
@@ -2708,7 +2746,7 @@ msgstr "Start med å legge til ditt eget materiale."
 msgid "Startup"
 msgstr "Start"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Status"
 
@@ -2716,14 +2754,14 @@ msgstr "Status"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Ikke repeter dette kortet før du har opphevet deaktiveringen i browseren"
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Deaktiver"
 
@@ -2731,7 +2769,7 @@ msgstr "Deaktiver"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr "Deaktiver denne faktaen til kortstokken er blitt lukket og åpnet igjen."
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr "Åsidosatt"
 
@@ -2739,7 +2777,7 @@ msgstr "Åsidosatt"
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 #, fuzzy
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
@@ -2770,7 +2808,7 @@ msgstr "Synkroniser denne kortstokken"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synkroniser denne kortstokken med Anki Online"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Synkroniserer media..."
 
@@ -2779,11 +2817,11 @@ msgstr "Synkroniserer media..."
 msgid "Syncing failed: %(a)s"
 msgstr "Synkroniseringen mislyktes: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Sett etikett på kort"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Sett etikett på fakta i duplikerte felt i stedet for å slette."
 
@@ -2791,11 +2829,11 @@ msgstr "Sett etikett på fakta i duplikerte felt i stedet for å slette."
 msgid "Tags"
 msgstr "Etiketter"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Etiketter å råpugge:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Mål må være unike."
 
@@ -2827,23 +2865,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr "Maksimalt antall <b>nye kort som vises på en dag</b>. Standardverdien er 20, og er valgt for å garantere at du ikke blir oversvømt av repetisjoner etter noen dager."
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Antall kort som venter på å bli repetert idag"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Antall kort som du har øvd på i aktuell øvingssesjon (blå) og i forrige øvingssesjon (svart)"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Antall kort som du har øvd på idag (blå) og igår (svart)"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr "Antall minutter som du har øvd idag (blå) og igår (svart)"
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Antall nye kort som venter på å øves på idag"
 
@@ -2851,7 +2889,7 @@ msgstr "Antall nye kort som venter på å øves på idag"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Synkroniseringsprotokollen er endret. Du må oppgradere."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr "Det totale antall nye kort i kortstokken"
 
@@ -2938,7 +2976,7 @@ msgstr ""
 "%s\n"
 "Du må ta bort kilden først."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2956,7 +2994,7 @@ msgstr ""
 "<b>Denne operasjonen kan ikke gjøres om.</b><br>\n"
 "Fortsett?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2995,7 +3033,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil fjerne disse kortene?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr "Tid/dag:"
 
@@ -3003,7 +3041,7 @@ msgstr "Tid/dag:"
 msgid "Title"
 msgstr "Tittel"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3015,7 +3053,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Dagens repetisjon er avsluttet"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Vis eller skjul verktøyslinja"
 
@@ -3046,7 +3084,7 @@ msgid ""
 "\n"
 msgstr "Kan ikke koble til serveren."
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3068,11 +3106,11 @@ msgstr ""
 "\n"
 "For å oppgradere en gammel kortstokk, last ned Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Kan ikke lese inn filen."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3083,7 +3121,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Kan ikke fortsette. Innlesing av kortstokken mislyktes."
 
@@ -3095,7 +3133,7 @@ msgstr "Ta bort Latex fra cachen"
 msgid "Underline text (Ctrl+u)"
 msgstr "Strek under tekst (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Angre %s"
@@ -3105,12 +3143,12 @@ msgstr "Angre %s"
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "Aktivere"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3120,7 +3158,7 @@ msgstr ""
 " - du kan fortsette øvingen\n"
 " - Ikke lukk denne!"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3146,7 +3184,7 @@ msgstr "Bruk tilpasset størrelse"
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -3189,15 +3227,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Du holder nå på med å råpugge. Steng denne kortstokken først."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3218,7 +3256,7 @@ msgstr "kort"
 msgid "days"
 msgstr "dager"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "tidlig"
 
@@ -3226,7 +3264,7 @@ msgstr "tidlig"
 msgid "facts"
 msgstr "fakta"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "om %s"
@@ -3235,16 +3273,16 @@ msgstr "om %s"
 msgid "label"
 msgstr "etikett"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "sent"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "koblet sammen med <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "koblet sammen med <b>etiketter</b>"
 
@@ -3682,9 +3720,6 @@ msgstr "toppetikett"
 #~ msgid "Del"
 #~ msgstr "Ta bort"
 
-#~ msgid "Dialog"
-#~ msgstr "Dialog"
-
 #, fuzzy
 #~ msgid "Download Deck"
 #~ msgstr "Laste ned delt kortstokk"
@@ -3750,9 +3785,6 @@ msgstr "toppetikett"
 #~ msgid "Please add a new card first."
 #~ msgstr "Legg først til et nytt kort."
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Velg et felt å sortere etter"
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Gjenta  &svarlyd"
 
diff --git a/ankiqt/locale/ankiqt_pl_PL.po b/ankiqt/locale/ankiqt_pl_PL.po
index bbbc43280..d778848fe 100644
--- a/ankiqt/locale/ankiqt_pl_PL.po
+++ b/ankiqt/locale/ankiqt_pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt_pl_PL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-05-31 00:26+0200\n"
 "Last-Translator: Piotr Kubowicz <derbeth-fora@wp.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -39,17 +39,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "  Stop"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Alt+%d"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -76,11 +76,11 @@ msgstr " <b>Przy edycji (nadpisuje powyższe):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Przy przeglądaniu i edycji:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Upewnij się, że jest ustawiony poprawnie i uruchom Anki ponownie."
 
@@ -89,7 +89,7 @@ msgstr "Upewnij się, że jest ustawiony poprawnie i uruchom Anki ponownie."
 msgid " applied %d modified cards."
 msgstr " zastosowano %d zmodyfikowanych kart."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -111,7 +111,7 @@ msgstr[2] "%(name)s [%(facts)d faktów]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d z %(totalSum)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d z %(cards)d do przeglądnięcia) - %(title)s"
@@ -129,7 +129,7 @@ msgstr[2] ""
 msgid "%d exported."
 msgstr "%d wyeksportowano."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, fuzzy, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
@@ -137,7 +137,7 @@ msgstr[0] "%d brakująca referencja."
 msgstr[1] "%d brakujące referencje."
 msgstr[2] "%d brakujących referencji."
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
@@ -145,7 +145,7 @@ msgstr[0] "%d brakująca referencja."
 msgstr[1] "%d brakujące referencje."
 msgstr[2] "%d brakujących referencji."
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
@@ -153,12 +153,12 @@ msgstr[0] "%d wybrana"
 msgstr[1] "%d wybrane"
 msgstr[2] "%d wybranych"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -166,7 +166,7 @@ msgstr[0] "Usunięto %d nieużywany plik."
 msgstr[1] "Usunięto %d nieużywane pliki."
 msgstr[2] "Usunięto %d nieużywanych plików."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s temu"
@@ -294,7 +294,7 @@ msgstr "&Wykresy..."
 msgid "&Help"
 msgstr "Pomo&c"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "I&mport"
 
@@ -397,12 +397,12 @@ msgstr "&Cofnij"
 msgid "&Unsuspend Cards"
 msgstr "&Cofnij zawieszenie faktów"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(nowa karta)"
 
@@ -438,7 +438,7 @@ msgstr ""
 "</style></head><body style=\" font-family:sans-serif; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:Arial,sans-serif;\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr "<Filtr>"
 
@@ -455,7 +455,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Po
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Pomoc</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Pomoc</a>"
@@ -492,12 +492,12 @@ msgstr "<b>Odpowiedź</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Karty</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Nazwa</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Nazwa</b>"
@@ -576,7 +576,7 @@ msgstr "<b>Nowych kart dziennie:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Nowy dzień od godziny</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nazwa</b>"
@@ -618,7 +618,7 @@ msgstr "<b>Mnożnik odstępu</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Zawieszona</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 msgid "<b>Tags to append</b>:"
 msgstr "<b>Etykiety do dodania</b>:"
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Bardzo wysoki</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -700,7 +700,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Szablony kart</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -714,7 +714,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Kumulatywny czas przyjścia</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Aktualna karta</h1>"
 
@@ -755,11 +755,11 @@ msgstr "<h1>Przerwy</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Język</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Ostatnia karta</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Nauka kolejnych</h1>Kliknij zegar na pasku zadań, by zakończyć."
 
@@ -767,7 +767,7 @@ msgstr "<h1>Nauka kolejnych</h1>Kliknij zegar na pasku zadań, by zakończyć."
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modele</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Konto online</h1>Aby wykorzystać swoje darmowe <a href=\"http://anki.ichi2.net/\">konto online</a>,<br>wpisz jego dane poniżej.<br><br>Możesz później zmienić szczegółowe dane wchodząc w<br>Ustawienia->Preferencje->Synchronizacja<br>"
 
@@ -792,7 +792,7 @@ msgstr "<h1>Powtórki</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Czas powtórki</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Wczesna powtórka</h1>Kliknij zegar na pasku zadań, by zakończyć."
 
@@ -804,7 +804,7 @@ msgstr "<h1>Powtarzanie</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Wybierz pole docelowe</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<b>Opcje nauki</b>"
 
@@ -820,7 +820,7 @@ msgstr "<h1>Synchronizacja</h1><a href=\"http://anki.ichi2.net/\">Stwórz darmow
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Synchronizacja</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -842,11 +842,11 @@ msgstr ""
 "        zmiany. Czy chcesz je zapisać, porzucić swoje\n"
 "        zmiany lub anulować?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Brawo!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<zignorowane>"
 
@@ -900,7 +900,7 @@ msgstr "Dodaj materiał"
 msgid "Add Model"
 msgstr "Dodawanie modelu"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Dodaj etykiety"
 
@@ -951,7 +951,7 @@ msgstr "Zaawansowane"
 msgid "Again"
 msgstr "Znowu"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Wszystkie pola"
 
@@ -963,16 +963,16 @@ msgstr "Wszystkie powtórki"
 msgid "Allow the answer to be blank"
 msgstr "Pozwól na pustą odpowiedź"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Jesteś już w trybie sprawdzianu. Musisz zamknąć tę talię."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Alt+%d"
@@ -990,7 +990,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "Wystąpił błąd przy otwieraniu %s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
@@ -998,7 +998,7 @@ msgstr ""
 "Wystąpił błąd w dodatku. Skontaktuj się z jego autorem.<br>\n"
 "Prosimy nie wysyłać raportu o błędzie do twórców Anki.<br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1008,7 +1008,7 @@ msgstr ""
 "Czy możesz uruchomić wyszukiwanie błędów w talii?\n"
 "Czynność ta może potrwać trochę czasu."
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1026,8 +1026,8 @@ msgstr ""
 "Jeśli po tym błąd będzie się powtarzał, załącz poniższy<br>\n"
 "tekst do raportu o błędzie.<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1035,7 +1035,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1044,7 +1044,7 @@ msgstr ""
 "Anki nie było w stanie zapisać twojego pliku konfiguracyjnego:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Odpowiedź"
 
@@ -1072,6 +1072,15 @@ msgstr "Dodaj do tego faktu etykietę 'zaznaczony', żeby potem można było go
 msgid "Applying reply..."
 msgstr "Wprowadzanie odpowiedzi..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "Średni czas na odpowiedź: "
@@ -1115,7 +1124,7 @@ msgstr "Przeglądarka elementów"
 msgid "Browse and edit all items"
 msgstr "Przeglądaj i edytuj wszystkie elementy"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1127,14 +1136,21 @@ msgstr[2] "Przeglądarka (pokazano %(cur)d z %(tot)d kart; %(sel)s)"
 msgid "Browser Font"
 msgstr "Czcionka przeglądarki"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Budowanie indeksu..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr "Zakop"
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "&Sprawdzian..."
@@ -1143,15 +1159,15 @@ msgstr "&Sprawdzian..."
 msgid "Cache LaTeX"
 msgstr "Przechowuj LaTeX w pamięci podręcznej"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Można zmieniać tylko jeden model jednocześnie."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Można działać tylko na jednym modelu jednocześnie."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1190,19 +1206,19 @@ msgstr "Są karty do przejrzenia"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr "Kart dziennie:"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr "Kart na sesję:"
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Zmień"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "Zmień %s na:"
@@ -1211,7 +1227,7 @@ msgstr "Zmień %s na:"
 msgid "Change &Model..."
 msgstr "Zmień &model..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Zmiana modelu"
 
@@ -1223,7 +1239,7 @@ msgstr "Sprawdź bazę plików..."
 msgid "Check complete."
 msgstr "Zakończono sprawdzanie."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1235,7 +1251,7 @@ msgstr "Przeszukaj bazę danych w poszukiwaniu błędów"
 msgid "Check the files in the media directory"
 msgstr "Sprawdź pliki w katalogu plików"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1305,7 +1321,7 @@ msgstr "Konfiguruj opcje powtórki"
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "&Kontynuuj powtórkę"
 
@@ -1334,15 +1350,15 @@ msgstr "Poprawne dzisiaj: "
 msgid "Correct under a month: "
 msgstr "Poprawne w ciągu miesiąca: "
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "Nie można odtworzyć dźwięku. Zainstaluj mplayer."
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Sprawdzian"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "Czy zacząć w nowej talii sprawdzian z wybranych kart?"
 
@@ -1356,11 +1372,11 @@ msgstr "Utworzona"
 msgid "Create '%s' on server"
 msgstr "Tworzenie '%s' na serwerze"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Utworzona"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1506,7 +1522,7 @@ msgstr "Ustawianie synchronizacji, planowania, priorytetów i modeli"
 msgid "Czech"
 msgstr "Czeski"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1523,32 +1539,32 @@ msgstr "Wykresy talii"
 msgid "Deck Properties"
 msgstr "Właściwości talii"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Pliki talii (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Talia jest już otwarta."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Usuń"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "Usuń odwołania"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Usuń karty"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Usuń odwołania"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Usuń etykiety"
 
@@ -1564,11 +1580,15 @@ msgstr "Usuń aktualnie wyświetlaną kartę"
 msgid "Determining differences..."
 msgstr "Ustalanie różnic..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "&Wyłącz"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Odrzuć pole"
 
@@ -1623,7 +1643,7 @@ msgstr "Pobierz dodatek, by dodać nowe funkcje lub zmienić zachowanie Anki"
 msgid "Downloaded %dKB"
 msgstr "Pobrania"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1637,7 +1657,7 @@ msgstr "Ścią&gnij..."
 msgid "Downloads"
 msgstr "Pobrania"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Pojawienie się"
@@ -1651,7 +1671,7 @@ msgstr "Zakoń&cz"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Do końca: <b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Łatwość"
 
@@ -1679,7 +1699,7 @@ msgstr "Edytuj aktualnie wyświetlany element"
 msgid "Ena&ble"
 msgstr "Włą&cz"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1687,11 +1707,11 @@ msgstr ""
 msgid "English"
 msgstr "Angielski"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Wpisz etykiety do dodania:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Wpisz etykiety do usunięcia:"
 
@@ -1735,7 +1755,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1759,7 +1779,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr "Utworzenie faktu"
 
@@ -1767,7 +1787,7 @@ msgstr "Utworzenie faktu"
 msgid "Facts"
 msgstr "Fakty"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Nie udało się przesłać pliku. Uruchom sprawdzanie bazy plików."
 
@@ -1795,12 +1815,12 @@ msgstr "Pole %(num)d: %(name)s [%(cards)s niepustych]"
 msgid "Field %d"
 msgstr "Pole %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Pole <b>%d</b> z pliku jest:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Odwzorowanie pól"
 
@@ -1816,7 +1836,7 @@ msgstr "&Filtry"
 msgid "Find and Re&place..."
 msgstr "Znajdź i za&mień..."
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Znajdź i zamień"
 
@@ -1836,17 +1856,17 @@ msgstr "Czcionki..."
 msgid "Fonts & Colours"
 msgstr "Czcionki i kolory"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Więcej"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Więcej"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1862,11 +1882,11 @@ msgstr "Pełne sprawdzenie bazy danych..."
 msgid "General && Fields"
 msgstr "Ogólne i pola"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Generowanie kart"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Generowanie kart..."
 
@@ -1922,8 +1942,8 @@ msgstr "Ignoruj tę aktualizację"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Grafiki (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Import"
 
@@ -1931,24 +1951,24 @@ msgstr "Import"
 msgid "Import cards from text files, Anki files and more"
 msgstr "Importuj karty z plików tekstowych, plików Anki i innych"
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 msgid "Import failed.\n"
 msgstr "Import nie powiódł się.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Opcje importu"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Zakończono import. %(num)d faktów zostało zaimportowanych z %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Import nie powiódł się.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Importowanie..."
 
@@ -1965,11 +1985,11 @@ msgstr "Dołącz informację o planowaniu"
 msgid "Include tags"
 msgstr "Dołącz etykiety"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Przerwa"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Niepoprawne wyrażenie regularne."
 
@@ -1977,7 +1997,7 @@ msgstr "Niepoprawne wyrażenie regularne."
 msgid "Invert"
 msgstr "Odwróć"
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
@@ -1985,7 +2005,7 @@ msgstr[0] "%(type)s %(sec)d sekundę.\n"
 msgstr[1] "%(type)s %(sec)d sekundy.\n"
 msgstr[2] "%(type)s %(sec)d sekund.\n"
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2023,6 +2043,11 @@ msgstr ""
 msgid "Korean"
 msgstr "Koreański"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Łatwość"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l, następnie l)"
@@ -2035,16 +2060,16 @@ msgstr "Równanie Latexa (Ctrl+l, następnie e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Otoczenie matematyczne Latexa (Ctrl+l, następnie m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Czeski"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Ładowanie talii..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Ładowanie wykresów (może to chwilę potrwać)..."
 
@@ -2052,20 +2077,25 @@ msgstr "Ładowanie wykresów (może to chwilę potrwać)..."
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Log importu:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Odwzorowanie na %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Odwzorowanie na etykiety"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr "Zaznaczone"
 
@@ -2095,7 +2125,7 @@ msgstr "Właściwości modelu"
 msgid "Models && Priorities"
 msgstr "Modele i priorytety"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Zmodyfikowana"
 
@@ -2103,7 +2133,7 @@ msgstr "Zmodyfikowana"
 msgid "Mongolian"
 msgstr "Mongolski"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr "Więcej"
 
@@ -2131,6 +2161,10 @@ msgstr "Przesuń wybrane pole niżej"
 msgid "Move selected field up"
 msgstr "Przesuń wybrane pole wyżej"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Nazwa"
@@ -2143,11 +2177,11 @@ msgstr "Nazwa na serwerze:"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr "Nowe dzisiaj:"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr "Nowych ogólnie:"
 
@@ -2159,7 +2193,7 @@ msgstr "Następny kolor (F7, następnie F8)"
 msgid "Next field must be blank."
 msgstr "Następne pole musi być puste."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Żadne karty nie pasują do podanych etykiet."
 
@@ -2171,15 +2205,15 @@ msgstr "Nie ma kart do podglądu."
 msgid "No changes found."
 msgstr "Nie znaleziono zmian."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Brak aktualnej karty lub ostatnia karta."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr "Bez etykiet faktu"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2187,7 +2221,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Norweski"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "Nic"
 
@@ -2195,12 +2229,12 @@ msgstr "Nic"
 msgid "Nothing selected."
 msgstr "Nic nie wybrano."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Otwórz..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Otwórz o&statnio używany"
@@ -2210,7 +2244,7 @@ msgstr "Otwórz o&statnio używany"
 msgid "Open Recent..."
 msgstr "Otwórz o&statnio używany"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Otwórz talię"
 
@@ -2218,7 +2252,7 @@ msgstr "Otwórz talię"
 msgid "Open the bug tracker"
 msgstr "Otwórz zgłaszanie błędów"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Otwórz talię"
@@ -2227,7 +2261,7 @@ msgstr "Otwórz talię"
 msgid "Optimize Database"
 msgstr "Optymalizacja bazy danych"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 msgid "Ordering..."
 msgstr "Sortowanie..."
 
@@ -2248,7 +2282,7 @@ msgstr "Spakowana talia Anki (*.zip)"
 msgid "Password"
 msgstr "Hasło"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -2277,6 +2311,11 @@ msgstr "Dodaj najpierw nowy szablon."
 msgid "Please add another model first."
 msgstr "Dodaj najpierw nowy model."
 
+#: forms/sort.py:46
+#, fuzzy
+msgid "Please choose a field to sort by."
+msgstr "Dodaj najpierw nowe pole."
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Sprawdź ponownie swoją nazwę użytkownika/hasło."
@@ -2285,7 +2324,7 @@ msgstr "Sprawdź ponownie swoją nazwę użytkownika/hasło."
 msgid "Please enable a different template first."
 msgstr "Włącz najpierw inny szabon."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Wpisz poprawny zakres początku i końca."
 
@@ -2297,11 +2336,11 @@ msgstr ""
 "Zainstaluj <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "by móc nagrywać."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Zainstaluj python-mathplotlib, aby mieć dostęp do wykresów."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Uruchom ponownie Anki przed sprawdzaniem bazy danych."
 
@@ -2358,7 +2397,7 @@ msgstr "Podgląd kart"
 msgid "Previous colour (F7 then F6)"
 msgstr "Poprzednie kolory (F7, następnie F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2375,7 +2414,7 @@ msgstr "Przetwarzanie..."
 msgid "Put space between question and answer"
 msgstr "Wstaw spację między pytanie a odpowiedź"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Pytanie"
 
@@ -2399,7 +2438,7 @@ msgstr "Rozmiar pytania"
 msgid "Quick Database Check"
 msgstr "Szybkie sprawdzenie bazy danych"
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Losowanie..."
 
@@ -2420,12 +2459,12 @@ msgstr "Nagraj dźwięk (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Nagrywanie...<br>Czas: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Powtórz %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Odśwież"
 
@@ -2453,15 +2492,15 @@ msgstr "Usuń niewykorzystane miejsce, zmniejszając plik z bazą danych"
 msgid "Repeat &Audio"
 msgstr "Powtórz &nagranie"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Zastępowanie..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Powtórki"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Zaplanuj ponownie"
 
@@ -2485,7 +2524,7 @@ msgstr "Powtórka"
 msgid "Review Time"
 msgstr "Czas powtórki"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr "Do przeglądnięcia:"
 
@@ -2506,7 +2545,7 @@ msgstr "Próbkowanie ciszy...<br>Czas: %0.1f"
 msgid "Save &As..."
 msgstr "Zapisz &jako..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Zapisz talię jako"
 
@@ -2558,7 +2597,7 @@ msgstr "Zaznacz wszystko"
 msgid "Select None"
 msgstr "Wyczyść zaznaczenie"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr "Statystyki sesji"
 
@@ -2584,7 +2623,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Pokaż odpowiedź"
 
@@ -2648,7 +2687,7 @@ msgstr "Pokaż ikonę w zasobniku systemowym"
 msgid "Show/Hide"
 msgstr "Pokaż/Schowaj"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
@@ -2656,7 +2695,7 @@ msgstr ""
 "Ponieważ może to spowodować wiele problemów podczas synchronizacji,\n"
 "zostanie ona wyłączona do czasu usunięcia problemu."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Brakuje niektórych pól lub niektóre pola nie są unikalne."
 
@@ -2665,7 +2704,7 @@ msgstr "Brakuje niektórych pól lub niektóre pola nie są unikalne."
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Niektóre ustawienia zadziałają po ponownym uruchomieniu Anki."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Wkrótce"
 
@@ -2675,7 +2714,7 @@ msgstr "Sortuj jak liczby"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Dźwięk (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2686,7 +2725,7 @@ msgstr "ID źródła:"
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "&Zacznij powtórkę"
 
@@ -2698,7 +2737,7 @@ msgstr "Zacznij dodawanie swojego materiału."
 msgid "Startup"
 msgstr "Przy starcie"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Stan"
 
@@ -2706,7 +2745,7 @@ msgstr "Stan"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Nie wyświetlaj tej karty, dopóki nie zostanie odwieszona w edytorze."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
@@ -2714,7 +2753,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Zawieszenie"
 
@@ -2722,7 +2761,7 @@ msgstr "Zawieszenie"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr "Zawieś aktualny fakt, dopóki talia nie zostanie zamknięta i otwarta ponownie"
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr "Zawieszone"
 
@@ -2730,7 +2769,7 @@ msgstr "Zawieszone"
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 #, fuzzy
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
@@ -2761,7 +2800,7 @@ msgstr "Synchronizuj tę talię"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synchronizuj tę talię z Anki Online"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Synchronizacja plików"
 
@@ -2770,11 +2809,11 @@ msgstr "Synchronizacja plików"
 msgid "Syncing failed: %(a)s"
 msgstr "Synchronizacja nie powiodła się: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Nadaj etykietę"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Nadaj etykiety faktom ze zduplikowanymi polami zamiast usuwać je"
 
@@ -2782,11 +2821,11 @@ msgstr "Nadaj etykiety faktom ze zduplikowanymi polami zamiast usuwać je"
 msgid "Tags"
 msgstr "Etykiety"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Etykiety wykorzystane w sprawdzianie:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Cele muszą być unikalne."
 
@@ -2818,23 +2857,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr "Maksymalna liczba <b>nowych kart na dzień</b>. Domyślnie jest to 20, by uniknąć przeciążenia cię powtórkami."
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Liczba kart będących dzisiaj do przeglądnięcia"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Liczba kart powtarzanych w aktualnej (na niebiesko) i poprzedniej sesji (na czarno)"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Liczba kart powtarzanych dzisiaj (na niebiesko) i wczoraj (na czarno)"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr "Liczba minut w trakcie powtórki dzisiaj (na niebiesko) i wczoraj (na czarno)"
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Liczba nowych kart oczekujących dzisiaj"
 
@@ -2842,7 +2881,7 @@ msgstr "Liczba nowych kart oczekujących dzisiaj"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Zmienił się protokół synchronizacji. Zaktualizuj Anki."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr "Ogólna liczba nowych kart w talii"
 
@@ -2934,7 +2973,7 @@ msgstr ""
 "%s\n"
 "Musisz najpierw usunąć źródło."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2952,7 +2991,7 @@ msgstr ""
 "<b>Tej operacji nie można cofnąć.</b><br>\n"
 "Kontynuować?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2991,7 +3030,7 @@ msgstr ""
 "\n"
 "Na pewno chcesz usunąć te karty?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr "Czas dziennie:"
 
@@ -2999,7 +3038,7 @@ msgstr "Czas dziennie:"
 msgid "Title"
 msgstr "Tytuł"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3011,7 +3050,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Zakończono dzisiejsze powtórki"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Pokaż/ukryj pasek narzędzi"
 
@@ -3042,7 +3081,7 @@ msgid ""
 "\n"
 msgstr "Nie można połączyć się z serwerem."
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3064,11 +3103,11 @@ msgstr ""
 "\n"
 "Aby zaktualizować starą talię, ściągnij Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Nie można załadować pliku."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3079,7 +3118,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Nie można przeprowadzić odzyskiwania. Nie powiodło się ładowanie talii."
 
@@ -3091,7 +3130,7 @@ msgstr "Nie przechowuj LaTeXa"
 msgid "Underline text (Ctrl+u)"
 msgstr "Tekst podkreślony (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Cofnij %s"
@@ -3101,11 +3140,11 @@ msgstr "Cofnij %s"
 msgid "Unknown error: %s"
 msgstr "Nieznany błąd: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 msgid "Unsuspend"
 msgstr "Wycofanie zawieszenia"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3115,7 +3154,7 @@ msgstr ""
 " - możesz kontynuować naukę\n"
 " - nie zamykaj tego okna"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3141,7 +3180,7 @@ msgstr "Użyj własnego rozmiaru"
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
@@ -3184,15 +3223,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Jesteś już w trybie sprawdzianu. Musisz zamknąć tę talię."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr "Zegar twojego komputera nie jest ustawiony na poprawny czas.\n"
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3213,7 +3252,7 @@ msgstr "kart"
 msgid "days"
 msgstr "dni"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "Spieszy o"
 
@@ -3221,7 +3260,7 @@ msgstr "Spieszy o"
 msgid "facts"
 msgstr "faktów"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "w %s"
@@ -3230,16 +3269,16 @@ msgstr "w %s"
 msgid "label"
 msgstr "napis"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "Spóźnia się"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "odwzorowane na <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "odwzorowane na <b>etykiety</b>"
 
@@ -3395,10 +3434,6 @@ msgstr "toplabel"
 #~ msgid "Open a pre-made deck or plugin"
 #~ msgstr "Otwórz przygotowaną talię lub dodatek"
 
-#, fuzzy
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Dodaj najpierw nowe pole."
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Powtórz &nagranie odpowiedzi"
 
diff --git a/ankiqt/locale/ankiqt_pt_BR.po b/ankiqt/locale/ankiqt_pt_BR.po
index 97f33647b..e7b0a2aa5 100644
--- a/ankiqt/locale/ankiqt_pt_BR.po
+++ b/ankiqt/locale/ankiqt_pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anki 0.9.7.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jo Nakashima <jonakashima@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,17 +40,17 @@ msgstr ""
 msgid "  Stop"
 msgstr " Parar"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, python-format
 msgid " (Alt+%d)"
 msgstr ""
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -77,11 +77,11 @@ msgstr " <b>Quando editar (substitui os anteriores):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Quando revisar e editar:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 #, fuzzy
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Por favor entre um valor válido de início e fim"
@@ -91,7 +91,7 @@ msgstr "Por favor entre um valor válido de início e fim"
 msgid " applied %d modified cards."
 msgstr " aplicado %d cards motificados."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -111,7 +111,7 @@ msgstr[1] ""
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d de %(cards)d programados) - %(title)s"
@@ -128,33 +128,33 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d exportado."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d exportado."
 msgstr[1] "%d exportado."
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, fuzzy, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
@@ -165,7 +165,7 @@ msgstr[1] ""
 "%(a)d referências perdidas.\n"
 "%(b)d arquivos não usados removidos."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s atrás"
@@ -298,7 +298,7 @@ msgstr "&Gráficos..."
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importar"
 
@@ -403,12 +403,12 @@ msgstr "&Desfazer"
 msgid "&Unsuspend Cards"
 msgstr "&Suspender Fato"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(novo card)"
 
@@ -445,7 +445,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:xx-large; font-weight:600;\"><span style=\" font-size:xx-large;\">Fontes</span></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "&Arquivo"
@@ -463,7 +463,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Aj
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ajuda</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Ajuda</a>"
@@ -500,12 +500,12 @@ msgstr "<b>Resposta</b>"
 msgid "<b>Cards</b>:"
 msgstr ""
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>Nome</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Nome</b>"
@@ -590,7 +590,7 @@ msgstr "<b>Novos cards por dia:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Novo dia começa em</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nome</b>"
@@ -636,7 +636,7 @@ msgstr "<b>Multiplicador de espaçamento</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Suspenso</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "Tags para anexar:"
@@ -661,7 +661,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Prioridade Muito Alta</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -714,7 +714,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr ""
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -725,7 +725,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Programadas Acumuladas</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Card corrente</h1>"
 
@@ -766,11 +766,11 @@ msgstr "<h1>Intervalos</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Língua</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Último card</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -778,7 +778,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modelos</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 #, fuzzy
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Conta Online</h1>Para usar sua <a href=\"http://anki.ichi2.net/\">conta online</a> grátis,<br>por favor coloque seus detalhes a seguir.<br>"
@@ -804,7 +804,7 @@ msgstr ""
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Tempo de Revisão</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -816,7 +816,7 @@ msgstr "<h1>Revisando</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Escolha o Campo Alvo</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Opções de Estudo</h1>"
 
@@ -832,7 +832,7 @@ msgstr "<h1>Sincronização</h1><a href=\"http://anki.ichi2.net/\">Crie uma cont
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Sincronize</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -850,11 +850,11 @@ msgstr ""
 "        salvas. Gostaria de salvá-las, descartar as\n"
 "        alterações, ou cancelar?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Muito bem!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignorado>"
 
@@ -908,7 +908,7 @@ msgstr "Adicionar Modelo"
 msgid "Add Model"
 msgstr "Adicionar Modelo"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Adicionar Tags"
 
@@ -959,7 +959,7 @@ msgstr "Avançado"
 msgid "Again"
 msgstr "Repetir"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "Campos"
@@ -973,16 +973,16 @@ msgstr "Revisão"
 msgid "Allow the answer to be blank"
 msgstr "Permitir resposta em branco"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Já cramming. Por favor, feche este deck primeiro."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr ""
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr ""
 
@@ -999,7 +999,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr "Um erro ocorreu ao tentar abrir %s"
 
-#: ui/main.py:201
+#: ui/main.py:202
 #, fuzzy
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
@@ -1008,7 +1008,7 @@ msgstr ""
 "Um erro ocorreu em um plugin. Por favor, contate o autor.<br>\n"
 "Por favor, não reporte este bug com o Anki.<br><br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -1018,7 +1018,7 @@ msgstr ""
 "Gostaria de tentar verificar erros no deck?\n"
 "Isto pode levar um tempo."
 
-#: ui/main.py:192
+#: ui/main.py:193
 #, fuzzy
 msgid ""
 "An error occurred. Please:<p>\n"
@@ -1035,8 +1035,8 @@ msgstr ""
 "Se isso não arrumar o problema, por favor copie o seguinte<br>\n"
 "em um bug report:<br><br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr ""
 
@@ -1044,7 +1044,7 @@ msgstr ""
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1053,7 +1053,7 @@ msgstr ""
 "Anki não conseguiu salvar seu arquivo de configuração:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Resposta"
 
@@ -1081,6 +1081,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr "Aplicando resposta..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 #, fuzzy
 msgid "Average time per answer: "
@@ -1128,7 +1137,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, fuzzy, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1140,15 +1149,22 @@ msgstr[1] "Editor (%(cur)d de %(tot)d cards exibidos; %(sel)d selecionados)"
 msgid "Browser Font"
 msgstr "Fonte da resposta"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 #, fuzzy
 msgid "Building Index..."
 msgstr "Carregando deck..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr ""
@@ -1157,16 +1173,16 @@ msgstr ""
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 #, fuzzy
 msgid "Can only change one model at a time."
 msgstr "Pode apenas alterar templates em um único modelo."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1205,19 +1221,19 @@ msgstr "Cards estão esperando"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr ""
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Alterar"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "Alterar"
@@ -1227,7 +1243,7 @@ msgstr "Alterar"
 msgid "Change &Model..."
 msgstr "Alterar &Template..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 #, fuzzy
 msgid "Change Model"
 msgstr "Alterar"
@@ -1240,7 +1256,7 @@ msgstr ""
 msgid "Check complete."
 msgstr ""
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1252,7 +1268,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1324,7 +1340,7 @@ msgstr "Continue &Revisando"
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "Continue &Revisando"
 
@@ -1354,15 +1370,15 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr ""
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1376,11 +1392,11 @@ msgstr "Criado"
 msgid "Create '%s' on server"
 msgstr "Criar '%s' no servidor"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Criado"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr ""
@@ -1527,7 +1543,7 @@ msgstr "Customizar sincronização, agendamento, prioridades e modelos."
 msgid "Czech"
 msgstr ""
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1542,32 +1558,32 @@ msgstr "Gráfico do Deck"
 msgid "Deck Properties"
 msgstr "Propriedades do Deck"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Arquivos de Deck (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Deck já está aberto."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr ""
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "&Deletar"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr ""
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr ""
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr ""
 
@@ -1583,11 +1599,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "Determinando diferenças..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Diálogo"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Desa&bilitar"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Descartar campo"
 
@@ -1642,7 +1662,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "&Doar..."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1656,7 +1676,7 @@ msgstr "&Doar..."
 msgid "Downloads"
 msgstr ""
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Programado"
@@ -1670,7 +1690,7 @@ msgstr "Sai&r"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr ""
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Dificuldade"
 
@@ -1698,7 +1718,7 @@ msgstr ""
 msgid "Ena&ble"
 msgstr "Ha&bilitar"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1706,11 +1726,11 @@ msgstr ""
 msgid "English"
 msgstr "Inglês"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Tags para adicionar"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Tags a deletar"
 
@@ -1755,7 +1775,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1779,7 +1799,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "Criado"
@@ -1789,7 +1809,7 @@ msgstr "Criado"
 msgid "Facts"
 msgstr "F&ato"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Falha ao enviar mídia. Por favor execute 'check media db'."
 
@@ -1817,12 +1837,12 @@ msgstr "Campo %(num)d: %(name)s [%(cards)s non-empty]"
 msgid "Field %d"
 msgstr "Campo %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Campo <b>%d</b> do arquivo é:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Mapeamento de campo"
 
@@ -1839,7 +1859,7 @@ msgstr "&Arquivo"
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1860,17 +1880,17 @@ msgstr "&Doar..."
 msgid "Fonts & Colours"
 msgstr "Fontes & Cores"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "Mais>>"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "Mais>>"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1886,11 +1906,11 @@ msgstr ""
 msgid "General && Fields"
 msgstr "Geral && Campos"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Gerar Cards"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "Gerar &Cards..."
@@ -1948,8 +1968,8 @@ msgstr "Ignorar esta atualização"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Imagens (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importar"
 
@@ -1957,25 +1977,25 @@ msgstr "Importar"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "Importação falhou.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Opções de importação"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, fuzzy, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Importação completa. %(num)d cards importados de %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Importação falhou.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Importando..."
 
@@ -1992,11 +2012,11 @@ msgstr "Incluir informações de agendamento"
 msgid "Include tags"
 msgstr "Incluir tags"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervalo"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -2004,14 +2024,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2042,6 +2062,11 @@ msgstr ""
 msgid "Korean"
 msgstr "Coreano"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Dificuldades"
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2057,15 +2082,15 @@ msgstr "Equação Latex (Ctrl+l, e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Ambiente de Matemática Latex (Ctrl+l, m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 msgid "Leech"
 msgstr ""
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Carregando deck..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Carregando gráficos (pode levar um tempo)..."
 
@@ -2074,20 +2099,25 @@ msgstr "Carregando gráficos (pode levar um tempo)..."
 msgid "Loading..."
 msgstr "Carregando deck..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Log de importação:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Mapear para %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Mapear para Tags"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "Difícil"
@@ -2118,7 +2148,7 @@ msgstr "Propriedades do Modelo"
 msgid "Models && Priorities"
 msgstr "Modelos && Prioridades"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Modificado"
 
@@ -2126,7 +2156,7 @@ msgstr "Modificado"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "Mais>>"
@@ -2155,6 +2185,10 @@ msgstr "Mover campo selecionado para baixo"
 msgid "Move selected field up"
 msgstr "Mover campo selecionado para cima"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Nome"
@@ -2167,12 +2201,12 @@ msgstr "Nome no servidor: "
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "Re&visar antecipadamente"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "Re&visar antecipadamente"
@@ -2185,7 +2219,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Nenhum card com a tag informada."
 
@@ -2197,16 +2231,16 @@ msgstr "Nenhum card para preview"
 msgid "No changes found."
 msgstr "Nenhuma alteração encontrada"
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Não há card corrente ou último card."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "Sem tags"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "Coreano"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 #, fuzzy
 msgid "Nothing"
 msgstr "opção"
@@ -2224,12 +2258,12 @@ msgstr "opção"
 msgid "Nothing selected."
 msgstr ""
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "&Abrir..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "Abrir &Recente"
@@ -2239,7 +2273,7 @@ msgstr "Abrir &Recente"
 msgid "Open Recent..."
 msgstr "Abrir &Recente"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Abrir deck"
 
@@ -2248,7 +2282,7 @@ msgstr "Abrir deck"
 msgid "Open the bug tracker"
 msgstr "Abrir bug tracker"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "Abrir deck"
@@ -2257,7 +2291,7 @@ msgstr "Abrir deck"
 msgid "Optimize Database"
 msgstr "Otimizar Database"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "Carregando deck..."
@@ -2279,7 +2313,7 @@ msgstr ""
 msgid "Password"
 msgstr "Senha"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Senha:"
 
@@ -2309,6 +2343,10 @@ msgstr "Por favor adicione um novo campo primeiro."
 msgid "Please add another model first."
 msgstr "Por favor adicione outro modelo primeiro."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Por favor escolha um campo para ordenar"
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Por favor verifique seu nome de usuário/senha"
@@ -2318,7 +2356,7 @@ msgstr "Por favor verifique seu nome de usuário/senha"
 msgid "Please enable a different template first."
 msgstr "Por favor habilite um modelo diferente primeiro."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Por favor entre um valor válido de início e fim"
 
@@ -2330,11 +2368,11 @@ msgstr ""
 "Por favor instale<a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "para habilitar gravação."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Por favor instale python-matplotlib para acessar gráficos"
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2393,7 +2431,7 @@ msgstr ""
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2410,7 +2448,7 @@ msgstr "Processando..."
 msgid "Put space between question and answer"
 msgstr "Colocar espaço entre questão e resposta"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Questão"
 
@@ -2434,7 +2472,7 @@ msgstr "Tamanho da questão"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Randomizando..."
 
@@ -2455,12 +2493,12 @@ msgstr "Gravar áudio (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Gravando...<br>Tempo: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Refazer %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Atualizar"
 
@@ -2489,16 +2527,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "Repetir &Áudio"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "Conectando..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr ""
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Reagendar"
 
@@ -2522,7 +2560,7 @@ msgstr "Revisão"
 msgid "Review Time"
 msgstr "Tempo de Revisão"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "Re&visar antecipadamente"
@@ -2545,7 +2583,7 @@ msgstr "Amostrando silêncio...<br>Tempo: %0.1f"
 msgid "Save &As..."
 msgstr "Salvar &Como..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Salvar Deck Como"
 
@@ -2600,7 +2638,7 @@ msgstr "Selecionar &Tudo"
 msgid "Select None"
 msgstr "Selecionar &Tudo"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "&Estatísticas do Deck"
@@ -2627,7 +2665,7 @@ msgstr ""
 msgid "Shift+Alt+m"
 msgstr ""
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Mostrar Resposta"
 
@@ -2692,7 +2730,7 @@ msgstr "Mostrar ícone na bandeja"
 msgid "Show/Hide"
 msgstr "Mostrar/Esconder"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 #, fuzzy
 msgid ""
 "Since this can cause many problems with syncing,\n"
@@ -2704,7 +2742,7 @@ msgstr ""
 "Como isto pode causar vários problemas com sincronização,\n"
 "a sincronização ficará desabilitada até você arrumar o problema."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Alguns campos estão faltando ou não são únicos"
 
@@ -2713,7 +2751,7 @@ msgstr "Alguns campos estão faltando ou não são únicos"
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Breve"
 
@@ -2723,7 +2761,7 @@ msgstr "Ordenar como números"
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Sons (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2734,7 +2772,7 @@ msgstr ""
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "Iniciar &Revisão"
 
@@ -2746,7 +2784,7 @@ msgstr ""
 msgid "Startup"
 msgstr ""
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr ""
 
@@ -2755,14 +2793,14 @@ msgstr ""
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Parar de revisar este card até remover a suspensão no editor."
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Suspenso"
 
@@ -2770,7 +2808,7 @@ msgstr "Suspenso"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "Suspenso"
@@ -2779,7 +2817,7 @@ msgstr "Suspenso"
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2808,7 +2846,7 @@ msgstr "Sincronizar este deck"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Sincronizar este deck"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Sincronizando Mídia..."
 
@@ -2817,11 +2855,11 @@ msgstr "Sincronizando Mídia..."
 msgid "Syncing failed: %(a)s"
 msgstr "Sincronização falhou: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr ""
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr ""
 
@@ -2829,11 +2867,11 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Tags para cram"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr ""
 
@@ -2866,23 +2904,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr ""
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2890,7 +2928,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "O protocolo de sincronização mudou. Por favor atualize o Anki."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr ""
 
@@ -2977,7 +3015,7 @@ msgstr ""
 "%s\n"
 "Você precisa remover a fonte primeiro."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2995,7 +3033,7 @@ msgstr ""
 "<b>Esta operação não pode ser desfeita.</b><br>\n"
 "Prosseguir?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3034,7 +3072,7 @@ msgstr ""
 "\n"
 "Quer realmente deletar estes cards?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3043,7 +3081,7 @@ msgstr ""
 msgid "Title"
 msgstr "&Arquivo"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3055,7 +3093,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "As revisões de hoje foram terminadas"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr ""
 
@@ -3087,7 +3125,7 @@ msgid ""
 "\n"
 msgstr "Não foi possível encontrar o servidor"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3109,11 +3147,11 @@ msgstr ""
 "\n"
 "Para atualizar um deck antigo, faça o download do Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Não foi possível carregar o arquivo."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3124,7 +3162,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Incapaz de recuperar. Deck falhou"
 
@@ -3136,7 +3174,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "Sublinhado (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Desfazer %s"
@@ -3146,12 +3184,12 @@ msgstr "Desfazer %s"
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "Suspenso"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3161,7 +3199,7 @@ msgstr ""
 " - você pode continuar estudando\n"
 " - por favor não feche isto"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3187,7 +3225,7 @@ msgstr "Use tamanho"
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Nome de usuário:"
 
@@ -3230,16 +3268,16 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 #, fuzzy
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Já cramming. Por favor, feche este deck primeiro."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3260,7 +3298,7 @@ msgstr ""
 msgid "days"
 msgstr "dias"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "cedo"
 
@@ -3268,7 +3306,7 @@ msgstr "cedo"
 msgid "facts"
 msgstr "fatos"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "em %s"
@@ -3277,16 +3315,16 @@ msgstr "em %s"
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr ""
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "mapeado para <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "mapeado para <b>Tags</b>"
 
@@ -3599,9 +3637,6 @@ msgstr ""
 #~ msgid "Customize card layout, fields, etc"
 #~ msgstr "Customizar layout de card, campos, etc."
 
-#~ msgid "Dialog"
-#~ msgstr "Diálogo"
-
 #, fuzzy
 #~ msgid "Download Deck"
 #~ msgstr "&Doar..."
@@ -3663,9 +3698,6 @@ msgstr ""
 #~ msgid "Please add a new card first."
 #~ msgstr "Por favor adicione um novo card primeiro"
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Por favor escolha um campo para ordenar"
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Repetir &Áudio da Resposta"
 
diff --git a/ankiqt/locale/ankiqt_sv_SE.po b/ankiqt/locale/ankiqt_sv_SE.po
index 62df38773..bc460c38f 100644
--- a/ankiqt/locale/ankiqt_sv_SE.po
+++ b/ankiqt/locale/ankiqt_sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt 0.9.9.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-06-25 11:32+0100\n"
 "Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -40,17 +40,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "Stopp"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, python-format
 msgid " (Alt+%d)"
 msgstr " (Alt+%d)"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr " (Command+Option+%d)"
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr "(och proxyinställningar)"
 
@@ -77,11 +77,11 @@ msgstr " <b>Vid ändring (företräde framför ovan):</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr " <b>Vid repetition och ändring:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr "Det har åsidosatts."
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr "Ställ klockan rätt och starta sedan om Anki."
 
@@ -90,7 +90,7 @@ msgstr "Ställ klockan rätt och starta sedan om Anki."
 msgid " applied %d modified cards."
 msgstr "tillämpade %d ändrade kort."
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -110,7 +110,7 @@ msgstr[1] "%(name)s [%(facts)d faktauppgifter]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d av %(totalSum)d"
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d av %(cards)d är dags att repetera) - %(title)s"
@@ -127,40 +127,40 @@ msgstr[1] "%6d dagar sedan"
 msgid "%d exported."
 msgstr "%d exporterades."
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] "%d saknad fil har hittats.<br>"
 msgstr[1] "%d saknade filer har hittats.<br>"
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] "%d saknad referens"
 msgstr[1] "%d saknade referenser"
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d valt"
 msgstr[1] "%d valda"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr "%d har återställts."
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] "%d oanvänd fil borttagen."
 msgstr[1] "%d oanvända filer borttagna."
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s sedan"
@@ -287,7 +287,7 @@ msgstr "&Grafer..."
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "&Importera"
 
@@ -387,12 +387,12 @@ msgstr "Å&ngra"
 msgid "&Unsuspend Cards"
 msgstr "Åt&erställ kort"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(nytt kort)"
 
@@ -428,7 +428,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr "<Filter>"
 
@@ -444,7 +444,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Hj
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href='http://ichi2.net/anki/'>Besök webbplatsen</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<b>%s</b>... är ett <a href=\"http://ichi2.net/anki/wiki/Leeches\">utsugarkort</a>."
@@ -481,11 +481,11 @@ msgstr "<b>Svar</b>"
 msgid "<b>Cards</b>:"
 msgstr "<b>Kort</b>:"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 msgid "<b>Deck</b>"
 msgstr "<b>Kortlek</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>Tidsfrist utlöpt<br>idag</b>"
 
@@ -562,7 +562,7 @@ msgstr "<b>Nya kort per dag:</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>Ny dag börjar kl. </b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 msgid "<b>New<br>Today</b>"
 msgstr "<b>Nya<br>idag</b>"
 
@@ -602,7 +602,7 @@ msgstr "<b>Multipel för tidsfördelning</b>"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>Åsidosätt utsugarkort</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 msgid "<b>Tags to append</b>:"
 msgstr "<b>Etiketter att lägga till</b>:"
 
@@ -633,7 +633,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Mycket hög prioritet</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -690,7 +690,7 @@ msgstr "<h1>Säkerhetskopior</h1>Kortlekar säkerhetskopieras  när de öppnas,
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Kortmallar</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -704,7 +704,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Ackumulerat antal vars tidsfrist är slut</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Aktuellt kort</h1>"
 
@@ -744,11 +744,11 @@ msgstr "<h1>Intervall</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Språk</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Förra kortet</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Lär dig mer</h1>Klicka på klockan i verktygsraden för att avsluta."
 
@@ -756,7 +756,7 @@ msgstr "<h1>Lär dig mer</h1>Klicka på klockan i verktygsraden för att avsluta
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modeller</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr "<h1>Konto på nätet</h1>För att använda ditt fria <a href=\"http://anki.ichi2.net/\">konto på nätet</a>,<br>fyll i dina uppgifter här nedan.<br><br>Du kan ändra dina uppgifter senare med hjälp av<br>Inställningar->Inställningar->Synka<br>"
 
@@ -780,7 +780,7 @@ msgstr "<h1>Repetitioner</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>Repetitionstid</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr "<h1>Repetera tidigt</h1>Klicka på klockan i verktygsraden för att avsluta."
 
@@ -792,7 +792,7 @@ msgstr "<h1>Repeterar</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Välj målfält</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h1>Instuderingsalternativ</h1>"
 
@@ -808,7 +808,7 @@ msgstr "<h1>Synkronisering</h1><a href=\"http://anki.ichi2.net/\">Skapa ett grat
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>Synkronisera</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -830,11 +830,11 @@ msgstr ""
 "        ändringar. Vill du spara dem, förkasta\n"
 "        ändringarna eller avbryta?"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>Bra gjort!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<ignoreras>"
 
@@ -887,7 +887,7 @@ msgstr "Lägg till material"
 msgid "Add Model"
 msgstr "Lägg till modell"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "Lägg till etiketter"
 
@@ -937,7 +937,7 @@ msgstr "Avancerat"
 msgid "Again"
 msgstr "Igen"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr "Alla fält"
 
@@ -949,16 +949,16 @@ msgstr "Alla repetitioner"
 msgid "Allow the answer to be blank"
 msgstr "Tillåt tomma svar"
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "Håller redan på att plugga. Stäng denna kortlek först."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr "Alt+%d"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr "Alt+m"
 
@@ -975,7 +975,7 @@ msgstr "Öppna alltid sista kortlek vid start"
 msgid "An error occured while opening %s"
 msgstr "Ett fel uppstod när %s skulle öppnas"
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
@@ -983,7 +983,7 @@ msgstr ""
 "Ett fel inträffade i en insticksmodul. Kontakta insticksmodulens upphovsman.<br>\n"
 "Rapportera inte in felet till Anki.<br>"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
@@ -993,7 +993,7 @@ msgstr ""
 "Vill du köra en kortlekskontroll?\n"
 "Detta kan ta lite tid."
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1011,8 +1011,8 @@ msgstr ""
 "Om detta inte löser problemet, kopiera följande text<br>\n"
 "till en felrapport:<br>\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1020,7 +1020,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr "Anki är ett vänligt, intelligent tidsfördelat inlärningssystem. Det är fritt och med öppen källkod."
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 "Anki kunde inte spara din konfigurationsfil:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "Svar"
 
@@ -1057,6 +1057,15 @@ msgstr "Sätt etiketten 'markerad' på denna faktauppgift så att du kan hitta d
 msgid "Applying reply..."
 msgstr "Tillämpar svar..."
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "Genomsnittstid per svar: "
@@ -1100,7 +1109,7 @@ msgstr "Bläddra bland poster"
 msgid "Browse and edit all items"
 msgstr "Bläddra och redigera alla poster"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1111,14 +1120,21 @@ msgstr[1] "Bläddrare (%(cur)d av %(tot)d kort visas; %(sel)s)"
 msgid "Browser Font"
 msgstr "Typsnitt för bläddrare"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr "Konstruerar index..."
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr "Begrav"
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "&Råplugga"
@@ -1127,15 +1143,15 @@ msgstr "&Råplugga"
 msgid "Cache LaTeX"
 msgstr "Läs in Latex i cachen"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr "Du kan bara ändra en modell åt gången."
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr "Kan enbart arbeta med en modell åt gången."
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1174,19 +1190,19 @@ msgstr "Det finns kort som väntar"
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr "Kort som har någon av nedan valda etiketter kommer inte att visas."
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr "Kort/dag"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr "Kort/studiepass:"
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "Ändra"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr "Ändra %s till:"
@@ -1195,7 +1211,7 @@ msgstr "Ändra %s till:"
 msgid "Change &Model..."
 msgstr "Byt &modell..."
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Byt modell"
 
@@ -1207,7 +1223,7 @@ msgstr "Kontrollera mediadatabasen..."
 msgid "Check complete."
 msgstr "Kontroll klar."
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr "Beräkna tidsfrister igen (F5)"
 
@@ -1219,7 +1235,7 @@ msgstr "Undersök om databasen innehåller fel"
 msgid "Check the files in the media directory"
 msgstr "Kontrollera filerna i mediebiblioteket"
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr "Kontrollerar kortlek %(x)d av %(y)d..."
@@ -1289,7 +1305,7 @@ msgstr "Anpassa repetitionsalternativ"
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "&Fortsätt repetera"
 
@@ -1318,15 +1334,15 @@ msgstr "Rätta idag: "
 msgid "Correct under a month: "
 msgstr "Rätta yngre än en månad: "
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "Kunde inte spela ljud. Installera mplayer."
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "Råplugga"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr "Råplugga valda kort i en ny kortlek?"
 
@@ -1339,11 +1355,11 @@ msgstr "Skapa"
 msgid "Create '%s' on server"
 msgstr "Skapa '%s' på server"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "Skapad"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1488,7 +1504,7 @@ msgstr "Anpassa synkronisering, schemaläggning, prioritering och modeller."
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1505,32 +1521,32 @@ msgstr "Kortleksdiagram"
 msgid "Deck Properties"
 msgstr "Kortleksegenskaper"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Kortleksfiler (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "Kortleken är redan öppen."
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, python-format
 msgid "Delete %s?"
 msgstr "Ta bort  %s?"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "Ta bort kort"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "Ta bort referenser"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "Ta bort etiketter"
 
@@ -1546,11 +1562,15 @@ msgstr "Ta bort det kort som just nu visas"
 msgid "Determining differences..."
 msgstr "Fastställer skillnader..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr "Dialog"
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "Inakti&vera"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr "Kassera fält"
 
@@ -1603,7 +1623,7 @@ msgstr "Hämta hem en insticksmodul för att utöka eller ändra Ankis funktiona
 msgid "Downloaded %dKB"
 msgstr "Hämtade hem %dKB"
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr "Hämtade hem %dKB från servern..."
@@ -1616,7 +1636,7 @@ msgstr "Hämtar hem..."
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "Tidsfrist slut"
@@ -1630,7 +1650,7 @@ msgstr "&Avsluta"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Nedräkning:<b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "Inlärningsgrad"
 
@@ -1658,7 +1678,7 @@ msgstr "Redigera det kort som just nu visas"
 msgid "Ena&ble"
 msgstr "A&ktivera"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr "Aktivera synkning, välj ett namn och synka sedan igen."
 
@@ -1666,11 +1686,11 @@ msgstr "Aktivera synkning, välj ett namn och synka sedan igen."
 msgid "English"
 msgstr "Engelska"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr "Skriv in etiketter att lägga till:"
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "Skriv in vilka etiketter som skall tas bort"
 
@@ -1714,7 +1734,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr "F5"
 
@@ -1738,7 +1758,7 @@ msgstr "F7, F8"
 msgid "F9"
 msgstr "F9"
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr "Faktauppgift skapad"
 
@@ -1746,7 +1766,7 @@ msgstr "Faktauppgift skapad"
 msgid "Facts"
 msgstr "Faktauppgifter"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Misslyckades att skicka in media. Kör kommandot 'kontrollera mediadatabasen'."
 
@@ -1773,12 +1793,12 @@ msgstr "Fält %(num)d: %(name)s [%(cards)s inte tomma]"
 msgid "Field %d"
 msgstr "Fält %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr "Fält <b>%d</b> i fil är:"
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr "Fälthopparning"
 
@@ -1794,7 +1814,7 @@ msgstr "Fil&ter"
 msgid "Find and Re&place..."
 msgstr "Sök och &ersätt"
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Sök och ersätt"
 
@@ -1814,16 +1834,16 @@ msgstr "Typsnitt..."
 msgid "Fonts & Colours"
 msgstr "Typsnitt och färger"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 msgid "Forget"
 msgstr "Glöm"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, python-format
 msgid "Forget %s?"
 msgstr "Glöm %s?"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr "Glöm tar bort kortleken från listan utan att kasta den."
 
@@ -1839,11 +1859,11 @@ msgstr "Fullständig databaskontroll..."
 msgid "General && Fields"
 msgstr "Allmänt && Fält"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Skapa kort"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr "Skapar kort..."
 
@@ -1899,8 +1919,8 @@ msgstr "Hoppa över denna uppdatering"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "Bilder (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "Importera"
 
@@ -1908,24 +1928,24 @@ msgstr "Importera"
 msgid "Import cards from text files, Anki files and more"
 msgstr "Importera kort från textfiler, anki-filer med mera"
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 msgid "Import failed.\n"
 msgstr "Import misslyckades.\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "Importalternativ"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "Import genomförd. %(num)d faktauppgifter importerades från %(file)s.\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "Import misslyckades.\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr "Importerar..."
 
@@ -1941,11 +1961,11 @@ msgstr "Inkludera schemaläggningsinformation"
 msgid "Include tags"
 msgstr "Inkludera etiketter"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervall"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "Ogiltigt reguljärt uttryck."
 
@@ -1953,14 +1973,14 @@ msgstr "Ogiltigt reguljärt uttryck."
 msgid "Invert"
 msgstr "Växla"
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] "Den är %(sec)d sekund %(type)s.\n"
 msgstr[1] "Den är %(sec)d sekunder %(type)s.\n"
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -1995,6 +2015,11 @@ msgstr "Behåll"
 msgid "Korean"
 msgstr "Koreanska"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "Inlärningsgrader"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l därefter l)"
@@ -2007,15 +2032,15 @@ msgstr "Latexformel (Ctrl+l därefter e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Matematikmiljö för Latex (Ctrl+l därpå m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 msgid "Leech"
 msgstr "Utsugarkort"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "Läser in kortlek..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr "Läser in diagram (kan ta tid)..."
 
@@ -2023,20 +2048,25 @@ msgstr "Läser in diagram (kan ta tid)..."
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "Importlog:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr "Mappa till %s"
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr "Para ihop med etiketter"
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr "Märkt"
 
@@ -2066,7 +2096,7 @@ msgstr "Modellegenskaper"
 msgid "Models && Priorities"
 msgstr "Modeller && Prioriteter"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -2074,7 +2104,7 @@ msgstr "Ändrad"
 msgid "Mongolian"
 msgstr "mongoliska"
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr "Mer"
 
@@ -2102,6 +2132,10 @@ msgstr "Flytta valt fält nedåt"
 msgid "Move selected field up"
 msgstr "Flytta valt fält uppåt"
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "Namn"
@@ -2114,11 +2148,11 @@ msgstr "Namn på server: "
 msgid "Network"
 msgstr "Nätverk"
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr "Nya idag:"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr "Nya totalt:"
 
@@ -2130,7 +2164,7 @@ msgstr "Nästa färg (F7 därefter F8)"
 msgid "Next field must be blank."
 msgstr "Nästa fält måste vara tomt."
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "Inga kort är markerade med angivna etiketter."
 
@@ -2142,15 +2176,15 @@ msgstr "Det finns inte några kort att förhandsgranska"
 msgid "No changes found."
 msgstr "Inga ändringar funna."
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "Inget aktuellt eller senaste kort."
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr "Inga etiketter på faktauppgifter"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr "Inga media-URL:er definierade för denna kortlek."
 
@@ -2158,7 +2192,7 @@ msgstr "Inga media-URL:er definierade för denna kortlek."
 msgid "Norwegian"
 msgstr "Norska"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr "Ingenting"
 
@@ -2166,11 +2200,11 @@ msgstr "Ingenting"
 msgid "Nothing selected."
 msgstr "Inget valt."
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 msgid "Open"
 msgstr "Öppna"
 
-#: ui/main.py:784
+#: ui/main.py:763
 msgid "Open Recent Deck"
 msgstr "Öppna nyss använd kortlek"
 
@@ -2178,7 +2212,7 @@ msgstr "Öppna nyss använd kortlek"
 msgid "Open Recent..."
 msgstr "Öppna nyss använda..."
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "Öppna kortlek"
 
@@ -2186,7 +2220,7 @@ msgstr "Öppna kortlek"
 msgid "Open the bug tracker"
 msgstr "Öppna felspåraren"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, python-format
 msgid "Open this deck%s"
 msgstr "Öppna denna kortlek%s"
@@ -2195,7 +2229,7 @@ msgstr "Öppna denna kortlek%s"
 msgid "Optimize Database"
 msgstr "Optimera databas"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 msgid "Ordering..."
 msgstr "Ordningsföljd..."
 
@@ -2216,7 +2250,7 @@ msgstr "Paketerad ankikortlek (*.zip)"
 msgid "Password"
 msgstr "Lösenord"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -2244,6 +2278,10 @@ msgstr "Lägg först till en ny mall."
 msgid "Please add another model first."
 msgstr "Lägg först till en annan modell."
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "Välj ett fält att sortera efter"
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "Kontrollera ditt användarnamn och lösenord en gång till."
@@ -2252,7 +2290,7 @@ msgstr "Kontrollera ditt användarnamn och lösenord en gång till."
 msgid "Please enable a different template first."
 msgstr "Aktivera först en annan modell."
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr "Ange ett giltigt start- och slutintervall"
 
@@ -2264,11 +2302,11 @@ msgstr ""
 "Installera <a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "för att möjliggöra inspelning."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Installera python-matplotlib för att kunna använda diagram."
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr "Starta om Anki innan du kontrollerar databasen."
 
@@ -2324,7 +2362,7 @@ msgstr "Förhandsgranska kort"
 msgid "Previous colour (F7 then F6)"
 msgstr "Föregående färg (F7 därefter F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2341,7 +2379,7 @@ msgstr "Behandlar..."
 msgid "Put space between question and answer"
 msgstr "Skilj fråga och svar åt med mellanslag"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "Fråga"
 
@@ -2365,7 +2403,7 @@ msgstr "Frågestorlek"
 msgid "Quick Database Check"
 msgstr "Snabb databaskontroll"
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "Blandar om..."
 
@@ -2386,12 +2424,12 @@ msgstr "Spela in ljud (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Spelar in...<br>Tid: %0.1f"
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr "Gör om %s"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "Uppdatera"
 
@@ -2419,15 +2457,15 @@ msgstr "Ta bort oanvänt utrymme så att databasen blir mindre"
 msgid "Repeat &Audio"
 msgstr "&Upprepa ljud"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "Ersätter..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "Upprepningar"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Schemalägg igen"
 
@@ -2451,7 +2489,7 @@ msgstr "Repetera"
 msgid "Review Time"
 msgstr "Repetitionstid"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr "Dags att repetera:"
 
@@ -2472,7 +2510,7 @@ msgstr "Samplar tystnad...<br>Tid: %0.1f"
 msgid "Save &As..."
 msgstr "Spara s&om..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "Spara kortlek som"
 
@@ -2524,7 +2562,7 @@ msgstr "Markera alla"
 msgid "Select None"
 msgstr "Avmarkera alla"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr "Statistik för studiepass"
 
@@ -2548,7 +2586,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "Visa svar"
 
@@ -2612,7 +2650,7 @@ msgstr "Visa ikon i systembrickan"
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
@@ -2620,7 +2658,7 @@ msgstr ""
 "Då detta kan ställa till med många problem i samband\n"
 "med synkning, är synkning avaktiverad till problemet lösts."
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr "Några fält saknas eller är inte unika."
 
@@ -2629,7 +2667,7 @@ msgstr "Några fält saknas eller är inte unika."
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Vissa inställningar blir aktiva först efter att du startat om Anki."
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "Snart"
 
@@ -2638,7 +2676,8 @@ msgid "Sort as numbers"
 msgstr "Sortera som tal"
 
 #: ui/facteditor.py:874
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+#, fuzzy
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "Ljud/Film (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2649,7 +2688,7 @@ msgstr "Käll-ID:"
 msgid "Spanish"
 msgstr "Spanska"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "&Börja repetera"
 
@@ -2661,7 +2700,7 @@ msgstr "Börja lägga till ditt eget material."
 msgid "Startup"
 msgstr "Start"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "Status"
 
@@ -2669,14 +2708,14 @@ msgstr "Status"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "Repetera inte detta kort igen förrän du hävt åsidosättningen i bläddraren"
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] "Idag har du studerat <b>%(reps)d kort</b> i sammanlagt <b>%(time)s</b>."
 msgstr[1] "Idag har du studerat <b>%(reps)d kort</b> i sammanlagt <b>%(time)s</b>."
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr "Åsidosätt"
 
@@ -2684,7 +2723,7 @@ msgstr "Åsidosätt"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr "Åsidosätt aktuell faktauppgift till kortleken har stängts och öppnats igen."
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr "Åsidosatt"
 
@@ -2692,7 +2731,7 @@ msgstr "Åsidosatt"
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr "Synkronisering misslyckades. Kontrollera din internetuppkoppling."
 
@@ -2720,7 +2759,7 @@ msgstr "Synkronisera denna kortlek"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synkronisera denna kortlek med Anki Online"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "Synkroniserar media..."
 
@@ -2729,11 +2768,11 @@ msgstr "Synkroniserar media..."
 msgid "Syncing failed: %(a)s"
 msgstr "Synkronisering misslyckades: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "Sätt etikett på kort"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "Sätt etikett dubblettfält på faktauppgift i stället för att ta bort."
 
@@ -2741,11 +2780,11 @@ msgstr "Sätt etikett dubblettfält på faktauppgift i stället för att ta bort
 msgid "Tags"
 msgstr "Etiketter"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "Etiketter att råplugga:"
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr "Mål måste vara  unika."
 
@@ -2777,23 +2816,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr "Det största tillåtna antalet <b>nya kort som visas på en dag</b>. Förvalt värde är 20, som är valt för att garantera att du inte blir översvämmad av repetitioner efter några dagar."
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "Antalet kort som väntar på att repeteras idag"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "Antalet kort som du studerat i aktuellt studiepass (blå) och föregående studiepass (svart)"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "Antalet kort som du studerat idag (blå) och igår (svart)"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr "Antalet minuter som du studerat idag (blå) och igår (svart)"
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "Antalet nya kort som väntas på att läras in idag"
 
@@ -2801,7 +2840,7 @@ msgstr "Antalet nya kort som väntas på att läras in idag"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Synkningsprotokollet har ändrats. Du behöver uppgradera."
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr "Det sammanlagda antalet nya kort i kortleken"
 
@@ -2888,7 +2927,7 @@ msgstr ""
 "%s\n"
 "Du måste ta bort den källan först."
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2906,7 +2945,7 @@ msgstr ""
 "<b>Denna åtgärd kan inte ångras.</b><br>\n"
 "Fortsätt?"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2945,7 +2984,7 @@ msgstr ""
 "\n"
 "Verkligen ta bort dessa kort?"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr "Tid/dag:"
 
@@ -2953,7 +2992,7 @@ msgstr "Tid/dag:"
 msgid "Title"
 msgstr "Titel"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2965,7 +3004,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Dagens repetition är avslutad"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr "Visa eller dölj verktygsraden"
 
@@ -2997,7 +3036,7 @@ msgstr ""
 "Kan inte nå servern.\n"
 "\n"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3019,11 +3058,11 @@ msgstr ""
 "\n"
 "För att uppgradera en gammal kortlek, hämta hem Anki 0.9.8.7."
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "Kan inte läsa in filen."
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3034,7 +3073,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr "Kan inte fortsätta. Inläsning av kortlek misslyckades."
 
@@ -3046,7 +3085,7 @@ msgstr "Ta bort Latex från cachen"
 msgid "Underline text (Ctrl+u)"
 msgstr "Stryk under text (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr "Ångra %s"
@@ -3056,11 +3095,11 @@ msgstr "Ångra %s"
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 msgid "Unsuspend"
 msgstr "Återaktivera"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -3070,7 +3109,7 @@ msgstr ""
 " - du kan fortsätta studera\n"
 " - stäng inte det här"
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr "Skickade in %dKB till servern..."
@@ -3095,7 +3134,7 @@ msgstr "Använd anpassad storlek"
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr "Användarnamn:"
 
@@ -3138,15 +3177,15 @@ msgstr "Skrivet av Damien Elmes, med patchar, översättning, uttestning och utf
 msgid "X"
 msgstr "X"
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Du håller för närvarande på med att råplugga. Stäng denna kortlek först."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr "Din datorklocka går fel.\n"
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3167,7 +3206,7 @@ msgstr "kort"
 msgid "days"
 msgstr "dagar"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "tidigt"
 
@@ -3175,7 +3214,7 @@ msgstr "tidigt"
 msgid "facts"
 msgstr "faktauppgifter"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "om %s"
@@ -3184,16 +3223,16 @@ msgstr "om %s"
 msgid "label"
 msgstr "etikett"
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr "sent"
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "parades ihop med <b>%s</b>"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr "parade i hop med <b>etiketter</b>"
 
@@ -3631,9 +3670,6 @@ msgstr "toppetikett"
 #~ msgid "Del"
 #~ msgstr "Ta bort"
 
-#~ msgid "Dialog"
-#~ msgstr "Dialog"
-
 #~ msgid "Download Deck"
 #~ msgstr "Hämta kortlek"
 
@@ -3703,9 +3739,6 @@ msgstr "toppetikett"
 #~ msgid "Please check the proxy settings."
 #~ msgstr "Kontrollera proxyinställningar"
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Välj ett fält att sortera efter"
-
 #~ msgid "Repeat &Answer Audio"
 #~ msgstr "Upprepa &svarsljud"
 
diff --git a/ankiqt/locale/ankiqt_zh_CN.po b/ankiqt/locale/ankiqt_zh_CN.po
index f8803f132..640168da2 100644
--- a/ankiqt/locale/ankiqt_zh_CN.po
+++ b/ankiqt/locale/ankiqt_zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-04-03 13:49+0100\n"
 "Last-Translator: Alaya129 <alaya129@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,17 +38,17 @@ msgstr ""
 msgid "  Stop"
 msgstr "停止"
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Ctrl+1"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -75,11 +75,11 @@ msgstr "<b>编辑设置（将覆盖上面的编辑设置）:</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr "<b>复习和编辑时的设置:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr "更改%d张。"
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -108,7 +108,7 @@ msgstr[1] "%(name)s [包含%(facts)d个项目]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, fuzzy, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (项目%(facts)d个,卡片%(cards)d张) - %(title)s"
@@ -125,40 +125,40 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d个输出了。"
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d个输出了。"
 msgstr[1] "%d个输出了。"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
@@ -291,7 +291,7 @@ msgstr "统计图表(&G)..."
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "导入(&I)"
 
@@ -395,12 +395,12 @@ msgstr "还原(&U)"
 msgid "&Unsuspend Cards"
 msgstr "挂起此项目(&S)"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(新卡片)"
 
@@ -437,7 +437,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size: xx-large; font-weight:600;\"><span style=\" font-size:xx-large;\">ソース</span></p></body>< /html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "<标签过滤器>"
@@ -455,7 +455,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">帮助</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">帮助</a>"
@@ -492,12 +492,12 @@ msgstr "答案"
 msgid "<b>Cards</b>:"
 msgstr "<b>卡片</b>"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>名字</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>名字</b>"
@@ -582,7 +582,7 @@ msgstr "<b>每日学习上限 :</b>"
 msgid "<b>New day starts at</b>"
 msgstr "<b>新的一天起始于（24小时制）</b>"
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>名字</b>"
@@ -630,7 +630,7 @@ msgstr ""
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>挂起</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "加入标签:"
@@ -655,7 +655,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>最高优先级</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -703,7 +703,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr ""
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -714,7 +714,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h2>任务累计</h2>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h2>当前卡片</h2>"
 
@@ -755,11 +755,11 @@ msgstr "<h2>复习区间</h2>"
 msgid "<h1>Language</h1>"
 msgstr "<h2>语言</h2>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h2>上一张卡片</h2>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -767,7 +767,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h2>模型</h2>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -792,7 +792,7 @@ msgstr "<h2>回答次数</h2>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h2>复习时间</h2>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -804,7 +804,7 @@ msgstr "<h2>选项</h2>"
 msgid "<h1>Select Target Field</h1>"
 msgstr ""
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<h2>学习选项</h2>"
 
@@ -820,7 +820,7 @@ msgstr "<h2>网络同步</h2><a href=\"http://anki.ichi2.net/\">免费注册Anki
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>网络同步</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -835,11 +835,11 @@ msgid ""
 "        changes, or cancel?"
 msgstr ""
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr ""
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<忽略>"
 
@@ -892,7 +892,7 @@ msgstr ""
 msgid "Add Model"
 msgstr ""
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 #, fuzzy
 msgid "Add Tags"
 msgstr "タグを追加(&A)..."
@@ -944,7 +944,7 @@ msgstr "高级"
 msgid "Again"
 msgstr "1.完全忘记"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr ""
 
@@ -956,16 +956,16 @@ msgstr "所有复习"
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, fuzzy, python-format
 msgid "Alt+%d"
 msgstr "Ctrl+1"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Ctrl+1"
@@ -983,20 +983,20 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr ""
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -1007,8 +1007,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1016,14 +1016,14 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
 "%s"
 msgstr ""
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "答案"
 
@@ -1051,6 +1051,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr ""
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr "每次回答平均用时 :"
@@ -1092,7 +1101,7 @@ msgstr "浏览全部(&E)..."
 msgid "Browse and edit all items"
 msgstr "浏览全部项目并修改"
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1104,14 +1113,21 @@ msgstr[1] "浏览（显示了%(tot)d 中的 %(cur)d 张卡片；%(sel)s 张被
 msgid "Browser Font"
 msgstr "浏览全部(&E)..."
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "考前强记模式(&R)..."
@@ -1120,15 +1136,15 @@ msgstr "考前强记模式(&R)..."
 msgid "Cache LaTeX"
 msgstr "缓存 LaTeX 内容"
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "取消"
 
@@ -1167,20 +1183,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "卡片"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "更改"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr ""
@@ -1189,7 +1205,7 @@ msgstr ""
 msgid "Change &Model..."
 msgstr ""
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr ""
 
@@ -1201,7 +1217,7 @@ msgstr "检查媒体文件数据库..."
 msgid "Check complete."
 msgstr ""
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1213,7 +1229,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1283,7 +1299,7 @@ msgstr "配置学习选项"
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr "继续复习"
 
@@ -1312,15 +1328,15 @@ msgstr "今天的正确率 :"
 msgid "Correct under a month: "
 msgstr "不足一个月的正确率 :"
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "考前强记模式"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1334,11 +1350,11 @@ msgstr "加入日期"
 msgid "Create '%s' on server"
 msgstr ""
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr "加入日期"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1495,7 +1511,7 @@ msgstr ""
 msgid "Czech"
 msgstr "Ceština"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1512,32 +1528,32 @@ msgstr "卡片组统计图表"
 msgid "Deck Properties"
 msgstr "当前卡片组属性"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "卡片组文件 (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "卡片组已经打开。"
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "删除"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "删除关联"
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr "删除卡片"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr "删除关联"
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "删除标签"
 
@@ -1553,11 +1569,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr "将本地卡片组与远程卡片组进行比较..."
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr ""
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr ""
 
@@ -1612,7 +1632,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "Anki捐献(&A)..."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1627,7 +1647,7 @@ msgstr "下载(&D)..."
 msgid "Downloads"
 msgstr "Anki捐献(&A)..."
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "回答次数"
@@ -1641,7 +1661,7 @@ msgstr "退出(&X)"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr ""
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "难度系数"
 
@@ -1670,7 +1690,7 @@ msgstr "编辑当前项目"
 msgid "Ena&ble"
 msgstr ""
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1678,11 +1698,11 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr ""
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr ""
 
@@ -1726,7 +1746,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1750,7 +1770,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "加入日期"
@@ -1759,7 +1779,7 @@ msgstr "加入日期"
 msgid "Facts"
 msgstr ""
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1787,12 +1807,12 @@ msgstr ""
 msgid "Field %d"
 msgstr ""
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr ""
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr ""
 
@@ -1809,7 +1829,7 @@ msgstr "<标签过滤器>"
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1830,17 +1850,17 @@ msgstr "捐赠开发者(&D)..."
 msgid "Fonts & Colours"
 msgstr ""
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "详细设置"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "详细设置"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1857,12 +1877,12 @@ msgstr "检查数据库..."
 msgid "General && Fields"
 msgstr ""
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "削除"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "削除"
@@ -1920,8 +1940,8 @@ msgstr "跳过这次更新"
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr "图像文件 (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "导入"
 
@@ -1929,25 +1949,25 @@ msgstr "导入"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "导入失败 : %s\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "导入选项"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr ""
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr ""
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr ""
 
@@ -1964,11 +1984,11 @@ msgstr "包含复习时间安排信息"
 msgid "Include tags"
 msgstr ""
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "复习区间"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr "无效的正则表达式"
 
@@ -1976,14 +1996,14 @@ msgstr "无效的正则表达式"
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2014,6 +2034,11 @@ msgstr ""
 msgid "Korean"
 msgstr "한국어"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "难度系数"
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr "Latex (Ctrl+l 然后 i)"
@@ -2026,16 +2051,16 @@ msgstr "Latex方程式 (Ctrl+l 然后 e)"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Latex数学环境 (Ctrl+l 然后 m)"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "Ceština"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr "正在读取卡片组..."
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr ""
 
@@ -2043,20 +2068,25 @@ msgstr ""
 msgid "Loading..."
 msgstr "读取中..."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr ""
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr ""
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr ""
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "2.有些困难"
@@ -2087,7 +2117,7 @@ msgstr "模型属性"
 msgid "Models && Priorities"
 msgstr "模型和优先级"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr "更改日期"
 
@@ -2095,7 +2125,7 @@ msgstr "更改日期"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "详细设置"
@@ -2124,6 +2154,10 @@ msgstr ""
 msgid "Move selected field up"
 msgstr ""
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr "例"
@@ -2136,12 +2170,12 @@ msgstr "在服务器上的名称"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "今天的复习"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "今天的复习"
@@ -2154,7 +2188,7 @@ msgstr "下一个颜色 (F7 然后 F8)"
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2166,15 +2200,15 @@ msgstr ""
 msgid "No changes found."
 msgstr "未发现差别。"
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr ""
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr ""
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2183,7 +2217,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "한국어"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr ""
 
@@ -2191,12 +2225,12 @@ msgstr ""
 msgid "Nothing selected."
 msgstr ""
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "打开(&O)..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "打开近期词库(&R)"
@@ -2206,7 +2240,7 @@ msgstr "打开近期词库(&R)"
 msgid "Open Recent..."
 msgstr "打开近期词库(&R)"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "打开卡片组"
 
@@ -2214,7 +2248,7 @@ msgstr "打开卡片组"
 msgid "Open the bug tracker"
 msgstr ""
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "打开卡片组"
@@ -2223,7 +2257,7 @@ msgstr "打开卡片组"
 msgid "Optimize Database"
 msgstr "优化数据库"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "读取中..."
@@ -2245,7 +2279,7 @@ msgstr "压缩的Anki卡片组文件 (*.zip)"
 msgid "Password"
 msgstr "密码"
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr ""
 
@@ -2275,6 +2309,10 @@ msgstr "请先加入一张卡片"
 msgid "Please add another model first."
 msgstr ""
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr ""
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr ""
@@ -2284,7 +2322,7 @@ msgstr ""
 msgid "Please enable a different template first."
 msgstr "请先加入一张卡片"
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2294,11 +2332,11 @@ msgid ""
 "to enable recording."
 msgstr ""
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr ""
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2355,7 +2393,7 @@ msgstr "预览卡片"
 msgid "Previous colour (F7 then F6)"
 msgstr "上一个颜色 (F7 然后 F6)"
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2370,7 +2408,7 @@ msgstr "处理中..."
 msgid "Put space between question and answer"
 msgstr "在问题和答案之间显示额外的空白"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "问题"
 
@@ -2394,7 +2432,7 @@ msgstr "问题大小"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr "随机..."
 
@@ -2415,12 +2453,12 @@ msgstr "录制音频(F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, fuzzy, python-format
 msgid "Redo %s"
 msgstr "入力された日付"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr "刷新"
 
@@ -2448,15 +2486,15 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "重复发声(&A)"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr "替换中..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "回答次数"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr ""
 
@@ -2482,7 +2520,7 @@ msgstr "复习中"
 msgid "Review Time"
 msgstr "复习中"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "今天的复习"
@@ -2504,7 +2542,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr "将卡片组另存为"
 
@@ -2558,7 +2596,7 @@ msgstr ""
 msgid "Select None"
 msgstr ""
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "当前卡片组统计信息(&D)"
@@ -2586,7 +2624,7 @@ msgstr "Ctrl+A"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "显示答案"
 
@@ -2650,13 +2688,13 @@ msgstr "显示任务栏图标"
 msgid "Show/Hide"
 msgstr "显示/隐藏"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
 msgstr ""
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr ""
 
@@ -2665,7 +2703,7 @@ msgstr ""
 msgid "Some settings will take effect after you restart Anki."
 msgstr "某些设置将在Anki重新启动后生效"
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "稍后"
 
@@ -2675,7 +2713,7 @@ msgstr ""
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "音(*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2686,7 +2724,7 @@ msgstr "来源 ID"
 msgid "Spanish"
 msgstr "Español"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "开始复习"
 
@@ -2698,7 +2736,7 @@ msgstr ""
 msgid "Startup"
 msgstr "启动"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "状态窗口"
 
@@ -2706,14 +2744,14 @@ msgstr "状态窗口"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr ""
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr ""
 
@@ -2721,7 +2759,7 @@ msgstr ""
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "<b>挂起</b>"
@@ -2730,7 +2768,7 @@ msgstr "<b>挂起</b>"
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2758,7 +2796,7 @@ msgstr "和网络同步这个卡片组"
 msgid "Synchronize this deck with Anki Online"
 msgstr "和Anki网络同步这个卡片组"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr "同步媒体文件..."
 
@@ -2767,11 +2805,11 @@ msgstr "同步媒体文件..."
 msgid "Syncing failed: %(a)s"
 msgstr "同步失败 :  %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr "标记卡片"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr "将重复项目加以标签区分，而不删除它们"
 
@@ -2779,11 +2817,11 @@ msgstr "将重复项目加以标签区分，而不删除它们"
 msgid "Tags"
 msgstr "标签"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr ""
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr ""
 
@@ -2813,23 +2851,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr ""
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2837,7 +2875,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr ""
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr ""
 
@@ -2914,7 +2952,7 @@ msgid ""
 "You will need to remove the source first."
 msgstr ""
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2932,7 +2970,7 @@ msgstr ""
 "<b>此操作无法还原。</b><br>\n"
 "是否进行操作？"
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2964,7 +3002,7 @@ msgid ""
 "Really delete these cards?"
 msgstr ""
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -2973,7 +3011,7 @@ msgstr ""
 msgid "Title"
 msgstr "档案"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2983,7 +3021,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr ""
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr ""
 
@@ -3013,7 +3051,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3026,11 +3064,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr ""
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3038,7 +3076,7 @@ msgid ""
 "%(info)s"
 msgstr ""
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr ""
 
@@ -3050,7 +3088,7 @@ msgstr "取消 LaTeX 缓存"
 msgid "Underline text (Ctrl+u)"
 msgstr "下划线 (Ctrl+U)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, fuzzy, python-format
 msgid "Undo %s"
 msgstr "%s后"
@@ -3060,19 +3098,19 @@ msgstr "%s后"
 msgid "Unknown error: %s"
 msgstr ""
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "<b>挂起</b>"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3098,7 +3136,7 @@ msgstr "使用自定义字号"
 msgid "Username"
 msgstr "用户名"
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr ""
 
@@ -3141,15 +3179,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3168,7 +3206,7 @@ msgstr "张卡片"
 msgid "days"
 msgstr "天"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr ""
 
@@ -3176,7 +3214,7 @@ msgstr ""
 msgid "facts"
 msgstr "个项目"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "%s后"
@@ -3185,16 +3223,16 @@ msgstr "%s后"
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr ""
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr ""
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr ""
 
diff --git a/ankiqt/locale/ankiqt_zh_TW.po b/ankiqt/locale/ankiqt_zh_TW.po
index 7cff35661..de5a1d167 100644
--- a/ankiqt/locale/ankiqt_zh_TW.po
+++ b/ankiqt/locale/ankiqt_zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: 2009-04-07 15:53+0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,17 +37,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, fuzzy, python-format
 msgid " (Alt+%d)"
 msgstr "Ctrl+1"
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -76,11 +76,11 @@ msgstr "<b>當你在編輯時:</b>"
 msgid " <b>When reviewing and editing:</b>"
 msgstr "<b>當你在複習和編輯時:</b>"
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr " 更改%d張。"
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -109,7 +109,7 @@ msgstr[1] "%(name)s [項目　%(facts)d個]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr "%(path)s (%(due)d of %(cards)d 到期) - %(title)s"
@@ -126,40 +126,40 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr "%d個輸出了。"
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, fuzzy, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%(del)d個を削除しました。"
 msgstr[1] "%(del)d個を削除しました。"
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, fuzzy, python-format
 msgid "%d successfully retrieved."
 msgstr "エクスポートされました。"
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
@@ -295,7 +295,7 @@ msgstr "圖表(&G)..."
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr "書入(&I)"
 
@@ -406,12 +406,12 @@ msgstr "復原(&U)"
 msgid "&Unsuspend Cards"
 msgstr "保留(&S)"
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr "(新卡片)"
 
@@ -448,7 +448,7 @@ msgstr ""
 "</style></head><body style=\" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:xx-large; font-weight:600;\"><span style=\" font-size:xx-large;\">ソース</span></p></body></html>"
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 #, fuzzy
 msgid "<Filter>"
 msgstr "檔案"
@@ -466,7 +466,7 @@ msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">說明(英文)</a>"
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, fuzzy, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">說明(英文)</a>"
@@ -503,12 +503,12 @@ msgstr ""
 msgid "<b>Cards</b>:"
 msgstr "<b>卡片</b>"
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 #, fuzzy
 msgid "<b>Deck</b>"
 msgstr "<b>名字</b>"
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 #, fuzzy
 msgid "<b>Due<br>Today</b>"
 msgstr "<b>名字</b>"
@@ -595,7 +595,7 @@ msgstr "<b>每天新的卡片量: </b>"
 msgid "<b>New day starts at</b>"
 msgstr ""
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 #, fuzzy
 msgid "<b>New<br>Today</b>"
 msgstr "<b>名字</b>"
@@ -644,7 +644,7 @@ msgstr "<b>読み込みファイル</b>:"
 msgid "<b>Suspend leeches</b>"
 msgstr "<b>保留</b>"
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 #, fuzzy
 msgid "<b>Tags to append</b>:"
 msgstr "要添加的標誌："
@@ -669,7 +669,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr "<b>最優先</b>"
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -723,7 +723,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>カードの易しさ</h1>"
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -734,7 +734,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>累計到期的(假使停止複習)</h1>"
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr "<h1>現在のカード</h1>"
 
@@ -776,11 +776,11 @@ msgstr "<h1>到期期間</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>言語</h1>"
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr "<h1>先のカード</h1>"
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -788,7 +788,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr "<h1>モデル</h1>"
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -813,7 +813,7 @@ msgstr "<h1>次</h1>"
 msgid "<h1>Review Time</h1>"
 msgstr "<h1>複習時間</h1>"
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -826,7 +826,7 @@ msgstr "<h1>複習</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>入力されたカード</h1>"
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr "<b>學習選擇</b>"
 
@@ -843,7 +843,7 @@ msgstr "<h1>同期</h1>同期の機能でウェブや携帯でも利用するこ
 msgid "<h1>Synchronize</h1>"
 msgstr "<h1>同期</h1>"
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -858,11 +858,11 @@ msgid ""
 "        changes, or cancel?"
 msgstr "<h1>変更した内容</h1>保存されてない変更内容があります。閉じる前に保存しますか？"
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr "<h1>做得不錯!</h1>"
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr "<無視されています>"
 
@@ -918,7 +918,7 @@ msgstr "モデル"
 msgid "Add Model"
 msgstr "モデル"
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr "添加標誌(&A)..."
 
@@ -970,7 +970,7 @@ msgstr "進階"
 msgid "Again"
 msgstr "再一次"
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 #, fuzzy
 msgid "All Fields"
 msgstr "フィールド"
@@ -984,16 +984,16 @@ msgstr "復習中"
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr "已經在填鴨式複習.  請先把此牌組關閉."
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, fuzzy, python-format
 msgid "Alt+%d"
 msgstr "Ctrl+1"
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 #, fuzzy
 msgid "Alt+m"
 msgstr "Ctrl+1"
@@ -1011,7 +1011,7 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr ""
 
-#: ui/main.py:201
+#: ui/main.py:202
 #, fuzzy
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
@@ -1020,14 +1020,14 @@ msgstr ""
 "エラーが発生しました。下記の内容をバグ報告にコピーしてください。\n"
 "\n"
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 #, fuzzy
 msgid ""
 "An error occurred. Please:<p>\n"
@@ -1041,8 +1041,8 @@ msgstr ""
 "エラーが発生しました。下記の内容をバグ報告にコピーしてください。\n"
 "\n"
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
 
@@ -1050,7 +1050,7 @@ msgstr "Anki"
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
@@ -1059,7 +1059,7 @@ msgstr ""
 "設定ファイルを保存できませんでした。\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr "解答"
 
@@ -1087,6 +1087,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr ""
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr ""
@@ -1128,7 +1137,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1140,14 +1149,21 @@ msgstr[1] ""
 msgid "Browser Font"
 msgstr "解答フォント"
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr "填鴨式複習...(&r)"
@@ -1156,15 +1172,15 @@ msgstr "填鴨式複習...(&r)"
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr "取消"
 
@@ -1204,20 +1220,20 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 #, fuzzy
 msgid "Cards/day:"
 msgstr "卡片(&C)"
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr "変更"
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, fuzzy, python-format
 msgid "Change %s to:"
 msgstr "変更"
@@ -1227,7 +1243,7 @@ msgstr "変更"
 msgid "Change &Model..."
 msgstr "<h1>カードの易しさ</h1>"
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 #, fuzzy
 msgid "Change Model"
 msgstr "変更"
@@ -1240,7 +1256,7 @@ msgstr "メディアデータベースを検査..."
 msgid "Check complete."
 msgstr "検査を完了しました。"
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1252,7 +1268,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1324,7 +1340,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr "接続中..."
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr ""
 
@@ -1354,15 +1370,15 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr "填鴨式複習"
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1376,12 +1392,12 @@ msgstr "登録日"
 msgid "Create '%s' on server"
 msgstr "%sという単語帳をサーバーで作成"
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 #, fuzzy
 msgid "Created"
 msgstr "登録日"
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
@@ -1540,7 +1556,7 @@ msgstr "同期、スケジュール、カードの優先、モデルなどをカ
 msgid "Czech"
 msgstr "捷克文"
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1555,34 +1571,34 @@ msgstr "牌組圖表"
 msgid "Deck Properties"
 msgstr "牌組特性"
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr "Ankiの単語帳 (*.anki)"
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr "単語帳は既に開いています。"
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr "削除"
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, fuzzy, python-format
 msgid "Delete %s?"
 msgstr "カードタグを削除(&D)..."
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 #, fuzzy
 msgid "Delete Cards"
 msgstr "削除"
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 #, fuzzy
 msgid "Delete Refs"
 msgstr "カードタグを削除(&D)..."
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr "標誌刪除(&D)..."
 
@@ -1598,11 +1614,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr ""
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr "無効にする(&b)"
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr ""
 
@@ -1657,7 +1677,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr "捐獻給Anki(&D)..."
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1671,7 +1691,7 @@ msgstr "捐獻給Anki(&D)..."
 msgid "Downloads"
 msgstr ""
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr "到期的"
@@ -1685,7 +1705,7 @@ msgstr "結束(&x)"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr ""
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr "易しさ"
 
@@ -1716,7 +1736,7 @@ msgstr "現在のモデルを編集"
 msgid "Ena&ble"
 msgstr "有効にする(&b)"
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1724,12 +1744,12 @@ msgstr ""
 msgid "English"
 msgstr "英語"
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 #, fuzzy
 msgid "Enter tags to add:"
 msgstr "このタグを付け加える："
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr "輸入要刪除的標誌:"
 
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1800,7 +1820,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 #, fuzzy
 msgid "Fact Created"
 msgstr "登録日"
@@ -1810,7 +1830,7 @@ msgstr "登録日"
 msgid "Facts"
 msgstr "ファクト毎に保存する"
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1839,12 +1859,12 @@ msgstr ""
 msgid "Field %d"
 msgstr "フィールド %d"
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr ""
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr ""
 
@@ -1861,7 +1881,7 @@ msgstr "檔案"
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1883,17 +1903,17 @@ msgstr "捐獻給Anki(&D)..."
 msgid "Fonts & Colours"
 msgstr "フォントと色"
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 #, fuzzy
 msgid "Forget"
 msgstr "モデル"
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, fuzzy, python-format
 msgid "Forget %s?"
 msgstr "モデル"
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1911,12 +1931,12 @@ msgstr "データベースを検査..."
 msgid "General && Fields"
 msgstr "フィールド"
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 #, fuzzy
 msgid "Generate Cards"
 msgstr "削除"
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 #, fuzzy
 msgid "Generating Cards..."
 msgstr "削除"
@@ -1974,8 +1994,8 @@ msgstr ""
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr ""
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr "インポート"
 
@@ -1983,25 +2003,25 @@ msgstr "インポート"
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 #, fuzzy
 msgid "Import failed.\n"
 msgstr "インポートは失敗しました。\n"
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr "インポートオプション"
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, fuzzy, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr "インポート完了しました。%(file)sから、カードを%(num)d個インポートしました。\n"
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr "インポートは失敗しました。\n"
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 #, fuzzy
 msgid "Importing..."
 msgstr "インポート(&I)..."
@@ -2019,11 +2039,11 @@ msgstr ""
 msgid "Include tags"
 msgstr "包含標誌"
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr "期間"
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -2031,14 +2051,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -2069,6 +2089,11 @@ msgstr ""
 msgid "Korean"
 msgstr "韓文"
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+#, fuzzy
+msgid "Lapses"
+msgstr "易しさ"
+
 #: ui/facteditor.py:304
 #, fuzzy
 msgid "Latex (Ctrl+l then l)"
@@ -2084,16 +2109,16 @@ msgstr "Latex方程式"
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr "Latex数学環境"
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 #, fuzzy
 msgid "Leech"
 msgstr "捷克文"
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr ""
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 #, fuzzy
 msgid "Loading graphs (may take time)..."
 msgstr "グラフを集計中。しばらくお待ちください"
@@ -2103,20 +2128,25 @@ msgstr "グラフを集計中。しばらくお待ちください"
 msgid "Loading..."
 msgstr "保存中.."
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr "インポートログ:\n"
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr ""
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr ""
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 #, fuzzy
 msgid "Marked"
 msgstr "難:"
@@ -2148,7 +2178,7 @@ msgstr "モデルプロパティ"
 msgid "Models && Priorities"
 msgstr "モデルプロパティ"
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 #, fuzzy
 msgid "Modified"
 msgstr "更新日時"
@@ -2157,7 +2187,7 @@ msgstr "更新日時"
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 #, fuzzy
 msgid "More"
 msgstr "モデル"
@@ -2186,6 +2216,10 @@ msgstr ""
 msgid "Move selected field up"
 msgstr ""
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 #, fuzzy
 msgid "Name"
@@ -2200,12 +2234,12 @@ msgstr "%sという単語帳をサーバーで作成"
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 #, fuzzy
 msgid "New today:"
 msgstr "早一點複習 (&V)"
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 #, fuzzy
 msgid "New total:"
 msgstr "早一點複習 (&V)"
@@ -2218,7 +2252,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr "沒有卡片有此標誌"
 
@@ -2230,16 +2264,16 @@ msgstr "沒有卡片預習"
 msgid "No changes found."
 msgstr ""
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr "現在のカードも先のカードもありません。"
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 #, fuzzy
 msgid "No fact tags"
 msgstr "沒有標誌"
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2248,7 +2282,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr "韓文"
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 #, fuzzy
 msgid "Nothing"
 msgstr "選擇"
@@ -2257,12 +2291,12 @@ msgstr "選擇"
 msgid "Nothing selected."
 msgstr ""
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 #, fuzzy
 msgid "Open"
 msgstr "打開(&O)..."
 
-#: ui/main.py:784
+#: ui/main.py:763
 #, fuzzy
 msgid "Open Recent Deck"
 msgstr "最近用的 (R)"
@@ -2272,7 +2306,7 @@ msgstr "最近用的 (R)"
 msgid "Open Recent..."
 msgstr "最近用的 (R)"
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr "ファイルを開く"
 
@@ -2281,7 +2315,7 @@ msgstr "ファイルを開く"
 msgid "Open the bug tracker"
 msgstr "バグトラッカーを開く"
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, fuzzy, python-format
 msgid "Open this deck%s"
 msgstr "ファイルを開く"
@@ -2290,7 +2324,7 @@ msgstr "ファイルを開く"
 msgid "Optimize Database"
 msgstr "データベースを最適化"
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 #, fuzzy
 msgid "Ordering..."
 msgstr "保存中.."
@@ -2313,7 +2347,7 @@ msgstr ""
 msgid "Password"
 msgstr "パスワード:"
 
-#: ui/main.py:910
+#: ui/main.py:889
 #, fuzzy
 msgid "Password:"
 msgstr "パスワード:"
@@ -2344,6 +2378,10 @@ msgstr "まず新しいフィールドを作成してください。"
 msgid "Please add another model first."
 msgstr "まずもう一つのモデルを作成してください。"
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr "フィールドの整列を選んでください。"
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr "ユーザー名とパスワードを確認してください。"
@@ -2353,7 +2391,7 @@ msgstr "ユーザー名とパスワードを確認してください。"
 msgid "Please enable a different template first."
 msgstr "まず他のモデルを有効してください。"
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2365,11 +2403,11 @@ msgstr ""
 "請安裝<a href=\"http://www.thalictrum.com/software/lame-3.97.dmg.gz\">lame</a>\n"
 "才可以錄音."
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr "python-matplotlabが必要です。python-matplotlibをインストールしてください。"
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2431,7 +2469,7 @@ msgstr "プレビュー"
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2448,7 +2486,7 @@ msgstr "接続中.."
 msgid "Put space between question and answer"
 msgstr "解答を表示する時に、質問を隠す"
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr "質問"
 
@@ -2472,7 +2510,7 @@ msgstr "質問サイズ"
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 #, fuzzy
 msgid "Randomizing..."
 msgstr "保存中.."
@@ -2495,12 +2533,12 @@ msgstr "音声を追加 (F4)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, fuzzy, python-format
 msgid "Redo %s"
 msgstr "入力された日付"
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr ""
 
@@ -2530,16 +2568,16 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr "音声を再生(&T)"
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 #, fuzzy
 msgid "Replacing..."
 msgstr "接続中..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr "次"
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 #, fuzzy
 msgid "Reschedule"
 msgstr "スケジューリング"
@@ -2567,7 +2605,7 @@ msgstr "復習中"
 msgid "Review Time"
 msgstr "復習中"
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 #, fuzzy
 msgid "Reviews due:"
 msgstr "早一點複習 (&V)"
@@ -2590,7 +2628,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr "另存新檔(&A)..."
 
-#: ui/main.py:1015
+#: ui/main.py:994
 #, fuzzy
 msgid "Save Deck As"
 msgstr "単語帳を保存する"
@@ -2650,7 +2688,7 @@ msgstr "全選(&A)"
 msgid "Select None"
 msgstr "全選(&A)"
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 #, fuzzy
 msgid "Session Statistics"
 msgstr "牌組總計(&D)"
@@ -2679,7 +2717,7 @@ msgstr "Ctrl+A"
 msgid "Shift+Alt+m"
 msgstr "Ctrl+A"
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr "顯示答案"
 
@@ -2746,13 +2784,13 @@ msgstr ""
 msgid "Show/Hide"
 msgstr "表示/隠し"
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
 msgstr ""
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr ""
 
@@ -2761,7 +2799,7 @@ msgstr ""
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr "不久"
 
@@ -2771,7 +2809,7 @@ msgstr ""
 
 #: ui/facteditor.py:874
 #, fuzzy
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr "音 (*.mp3 *.ogg *.wav)"
 
 #: ui/deckproperties.py:189
@@ -2782,7 +2820,7 @@ msgstr ""
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr "開始&複習"
 
@@ -2795,7 +2833,7 @@ msgstr ""
 msgid "Startup"
 msgstr "ステイタス"
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr "ステイタス"
 
@@ -2804,14 +2842,14 @@ msgstr "ステイタス"
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr "このカードは、保留を削除するまで、表示しません。"
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 #, fuzzy
 msgid "Suspend"
 msgstr "ファクトを保留(&S)"
@@ -2820,7 +2858,7 @@ msgstr "ファクトを保留(&S)"
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 #, fuzzy
 msgid "Suspended"
 msgstr "ファクトを保留(&S)"
@@ -2829,7 +2867,7 @@ msgstr "ファクトを保留(&S)"
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2861,7 +2899,7 @@ msgstr "この名前を使って単語帳を同期します。"
 msgid "Synchronize this deck with Anki Online"
 msgstr "この名前を使って単語帳を同期します。"
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 #, fuzzy
 msgid "Syncing Media..."
 msgstr "ファクトを同期中.."
@@ -2871,12 +2909,12 @@ msgstr "ファクトを同期中.."
 msgid "Syncing failed: %(a)s"
 msgstr "同期が出来ませんでした: %(a)s"
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 #, fuzzy
 msgid "Tag Cards"
 msgstr "カード"
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr ""
 "インポートするファクトのフィールドは、単語帳の中のファクトのフィールドと二重ある場合は、タグを付ける。\n"
@@ -2886,11 +2924,11 @@ msgstr ""
 msgid "Tags"
 msgstr "標誌"
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr "標誌要填鴨式複習："
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 #, fuzzy
 msgid "Targets must be unique."
 msgstr "'%s'は一意項目です"
@@ -2922,26 +2960,26 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 #, fuzzy
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr "当日に作成されたカードの枚数"
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 #, fuzzy
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr "当日に作成されたカードの枚数"
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 #, fuzzy
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr "当日に作成されたカードの枚数"
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 #, fuzzy
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr "当日に作成されたカードの枚数"
@@ -2950,7 +2988,7 @@ msgstr "当日に作成されたカードの枚数"
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "同期するプロトコルがかわりました。新しいバージョンをダウンロードしてください。"
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 #, fuzzy
 msgid "The total number of new cards in the deck"
 msgstr "当日に作成されたカードの枚数"
@@ -3036,7 +3074,7 @@ msgid ""
 "You will need to remove the source first."
 msgstr ""
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -3047,7 +3085,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -3076,7 +3114,7 @@ msgstr ""
 "\n"
 "本当にモデルとカードを削除しますか？"
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -3085,7 +3123,7 @@ msgstr ""
 msgid "Title"
 msgstr "檔案"
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -3097,7 +3135,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "今天複習完了"
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 #, fuzzy
 msgid "Toggle Toolbar"
 msgstr "簡単ツールバー"
@@ -3130,7 +3168,7 @@ msgid ""
 "\n"
 msgstr "サーバーの接続ができませんでした。"
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -3143,11 +3181,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr "ファイルを開けませんでした。"
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -3158,7 +3196,7 @@ msgstr ""
 "\n"
 "%(info)s"
 
-#: ui/main.py:741
+#: ui/main.py:720
 #, fuzzy
 msgid "Unable to recover. Deck load failed."
 msgstr "ファイルを開けませんでした。"
@@ -3171,7 +3209,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr "下線 (Ctrl+u)"
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, fuzzy, python-format
 msgid "Undo %s"
 msgstr "%s後"
@@ -3181,19 +3219,19 @@ msgstr "%s後"
 msgid "Unknown error: %s"
 msgstr "一般エラー: %s"
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 #, fuzzy
 msgid "Unsuspend"
 msgstr "ファクトを保留(&S)"
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -3219,7 +3257,7 @@ msgstr "カスタムサイズ"
 msgid "Username"
 msgstr ""
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr ""
 
@@ -3262,16 +3300,16 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 #, fuzzy
 msgid "You are currently cramming. Please close this deck first."
 msgstr "已經在填鴨式複習.  請先把此牌組關閉."
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 #, fuzzy
 msgid ""
 "Your version of Matplotlib is broken.\n"
@@ -3293,7 +3331,7 @@ msgstr "カード毎に保存する"
 msgid "days"
 msgstr "天"
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr "早"
 
@@ -3301,7 +3339,7 @@ msgstr "早"
 msgid "facts"
 msgstr "ファクト毎に保存する"
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr "%s後"
@@ -3310,16 +3348,16 @@ msgstr "%s後"
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr ""
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr "<b>%s</b>へ写像しました"
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 #, fuzzy
 msgid "mapped to <b>Tags</b>"
 msgstr "<b>%s</b>へ写像しました"
@@ -4346,9 +4384,6 @@ msgstr ""
 #~ msgid "Please add a new card first."
 #~ msgstr "まず新しいカードを入力してください。"
 
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "フィールドの整列を選んでください。"
-
 #~ msgid "Please double-check your username."
 #~ msgstr "ユーザー名を確認してください。"
 
diff --git a/ankiqt/locale/messages.pot b/ankiqt/locale/messages.pot
index 7c48b6bee..db3311fb7 100644
--- a/ankiqt/locale/messages.pot
+++ b/ankiqt/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt 0.9.9.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:33+0200\n"
+"POT-Creation-Date: 2009-06-26 09:49+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,17 +32,17 @@ msgstr ""
 msgid "  Stop"
 msgstr ""
 
-#: ui/main.py:1211
+#: ui/main.py:1190
 #, python-format
 msgid " (Alt+%d)"
 msgstr ""
 
-#: ui/main.py:1208
+#: ui/main.py:1187
 #, python-format
 msgid " (Command+Option+%d)"
 msgstr ""
 
-#: ui/main.py:2141
+#: ui/main.py:2120
 msgid " (and proxy settings)"
 msgstr ""
 
@@ -69,11 +69,11 @@ msgstr ""
 msgid " <b>When reviewing and editing:</b>"
 msgstr ""
 
-#: ui/main.py:479
+#: ui/main.py:459
 msgid " It has been suspended."
 msgstr ""
 
-#: ui/main.py:2371
+#: ui/main.py:2350
 msgid " Please ensure it is set correctly and then restart Anki."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid " applied %d modified cards."
 msgstr ""
 
-#: ui/cardlist.py:1025
+#: ui/cardlist.py:1038
 #, python-format
 msgid "%(a)d of %(b)d fact updated"
 msgid_plural "%(a)d of %(b)d facts updated"
@@ -102,7 +102,7 @@ msgstr[1] ""
 msgid "%(partOf)d of %(totalSum)d"
 msgstr ""
 
-#: ui/main.py:2285
+#: ui/main.py:2264
 #, python-format
 msgid "%(path)s (%(due)d of %(cards)d due) - %(title)s"
 msgstr ""
@@ -119,40 +119,40 @@ msgstr[1] ""
 msgid "%d exported."
 msgstr ""
 
-#: ui/main.py:2704
+#: ui/main.py:2683
 #, python-format
 msgid "%d missing file found.<br>"
 msgid_plural "%d missing files found.<br>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2693
+#: ui/main.py:2672
 #, python-format
 msgid "%d missing reference."
 msgid_plural "%d missing references."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:521
+#: ui/cardlist.py:534
 #, python-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2707
+#: ui/main.py:2686
 #, python-format
 msgid "%d successfully retrieved."
 msgstr ""
 
-#: ui/main.py:2695
+#: ui/main.py:2674
 #, python-format
 msgid "%d unused file removed."
 msgid_plural "%d unused files removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:209 ui/main.py:1180
+#: ui/cardlist.py:212 ui/main.py:1159
 #, python-format
 msgid "%s ago"
 msgstr ""
@@ -279,7 +279,7 @@ msgstr ""
 msgid "&Help"
 msgstr ""
 
-#: forms/importing.py:100
+#: forms/importing.py:105
 msgid "&Import"
 msgstr ""
 
@@ -379,12 +379,12 @@ msgstr ""
 msgid "&Unsuspend Cards"
 msgstr ""
 
-#: ui/cardlist.py:433
+#: ui/cardlist.py:444
 #, python-format
 msgid "'%s'"
 msgstr ""
 
-#: ui/cardlist.py:207
+#: ui/cardlist.py:210
 msgid "(new card)"
 msgstr ""
 
@@ -410,7 +410,7 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial';\"></p></body></html>"
 msgstr ""
 
-#: ui/cardlist.py:375
+#: ui/cardlist.py:385
 msgid "<Filter>"
 msgstr ""
 
@@ -426,7 +426,7 @@ msgstr ""
 msgid "<a href='http://ichi2.net/anki/'>Visit website</a>"
 msgstr ""
 
-#: ui/main.py:473
+#: ui/main.py:454
 #, python-format
 msgid "<b>%s</b>... is a <a href=\"http://ichi2.net/anki/wiki/Leeches\">leech</a>."
 msgstr ""
@@ -463,11 +463,11 @@ msgstr ""
 msgid "<b>Cards</b>:"
 msgstr ""
 
-#: ui/main.py:1164
+#: ui/main.py:1143
 msgid "<b>Deck</b>"
 msgstr ""
 
-#: ui/main.py:1166
+#: ui/main.py:1145
 msgid "<b>Due<br>Today</b>"
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "<b>New day starts at</b>"
 msgstr ""
 
-#: ui/main.py:1170
+#: ui/main.py:1149
 msgid "<b>New<br>Today</b>"
 msgstr ""
 
@@ -584,7 +584,7 @@ msgstr ""
 msgid "<b>Suspend leeches</b>"
 msgstr ""
 
-#: forms/importing.py:97
+#: forms/importing.py:101
 msgid "<b>Tags to append</b>:"
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 msgid "<b>Very High Priority</b>"
 msgstr ""
 
-#: ui/main.py:1262
+#: ui/main.py:1241
 msgid ""
 "<br>\n"
 "<font size=+1>\n"
@@ -655,7 +655,7 @@ msgstr ""
 msgid "<h1>Card Templates</h1>"
 msgstr ""
 
-#: ui/main.py:1763
+#: ui/main.py:1742
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -666,7 +666,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr ""
 
-#: ui/main.py:1663
+#: ui/main.py:1642
 msgid "<h1>Current card</h1>"
 msgstr ""
 
@@ -706,11 +706,11 @@ msgstr ""
 msgid "<h1>Language</h1>"
 msgstr ""
 
-#: ui/main.py:1666
+#: ui/main.py:1645
 msgid "<h1>Last card</h1>"
 msgstr ""
 
-#: ui/main.py:1964
+#: ui/main.py:1943
 msgid "<h1>Learning More</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -718,7 +718,7 @@ msgstr ""
 msgid "<h1>Models</h1>"
 msgstr ""
 
-#: ui/main.py:898
+#: ui/main.py:877
 msgid "<h1>Online Account</h1>To use your free <a href=\"http://anki.ichi2.net/\">online account</a>,<br>please enter your details below.<br><br>You can change your details later with<br>Settings->Preferences->Sync<br>"
 msgstr ""
 
@@ -742,7 +742,7 @@ msgstr ""
 msgid "<h1>Review Time</h1>"
 msgstr ""
 
-#: ui/main.py:1970
+#: ui/main.py:1949
 msgid "<h1>Reviewing Early</h1>Click the clock in the toolbar to finish."
 msgstr ""
 
@@ -754,7 +754,7 @@ msgstr ""
 msgid "<h1>Select Target Field</h1>"
 msgstr ""
 
-#: ui/main.py:1439
+#: ui/main.py:1418
 msgid "<h1>Study Options</h1>"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr ""
 msgid "<h1>Synchronize</h1>"
 msgstr ""
 
-#: ui/main.py:998
+#: ui/main.py:977
 msgid ""
 "<h1>Unsaved Deck</h1>\n"
 "Careful. You're editing an unsaved Deck.<br>\n"
@@ -785,11 +785,11 @@ msgid ""
 "        changes, or cancel?"
 msgstr ""
 
-#: ui/main.py:1441
+#: ui/main.py:1420
 msgid "<h1>Well done!</h1>"
 msgstr ""
 
-#: ui/importing.py:206
+#: ui/importing.py:254
 msgid "<ignored>"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Add Model"
 msgstr ""
 
-#: ui/cardlist.py:774
+#: ui/cardlist.py:787
 msgid "Add Tags"
 msgstr ""
 
@@ -892,7 +892,7 @@ msgstr ""
 msgid "Again"
 msgstr ""
 
-#: ui/cardlist.py:993
+#: ui/cardlist.py:1006
 msgid "All Fields"
 msgstr ""
 
@@ -904,16 +904,16 @@ msgstr ""
 msgid "Allow the answer to be blank"
 msgstr ""
 
-#: ui/main.py:1836
+#: ui/main.py:1815
 msgid "Already cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:1212
+#: ui/main.py:1191
 #, python-format
 msgid "Alt+%d"
 msgstr ""
 
-#: ui/main.py:2728
+#: ui/main.py:2707
 msgid "Alt+m"
 msgstr ""
 
@@ -930,20 +930,20 @@ msgstr ""
 msgid "An error occured while opening %s"
 msgstr ""
 
-#: ui/main.py:201
+#: ui/main.py:202
 msgid ""
 "An error occurred in a plugin. Please contact the plugin author.<br>\n"
 "Please do not file a bug report with Anki.<br>"
 msgstr ""
 
-#: ui/main.py:732
+#: ui/main.py:711
 msgid ""
 "An error occurred while trying to build the queue.\n"
 "Would you like to try check the deck for errors?\n"
 "This may take some time."
 msgstr ""
 
-#: ui/main.py:192
+#: ui/main.py:193
 msgid ""
 "An error occurred. Please:<p>\n"
 "<ol>\n"
@@ -954,8 +954,8 @@ msgid ""
 "into a bug report:<br>\n"
 msgstr ""
 
-#: ui/deckproperties.py:188 ui/main.py:2668 forms/main.py:1378
-#: forms/syncdeck.py:42
+#: ui/deckproperties.py:188 ui/main.py:2647 forms/main.py:1378
+#: forms/sort.py:45 forms/syncdeck.py:42
 msgid "Anki"
 msgstr ""
 
@@ -963,14 +963,14 @@ msgstr ""
 msgid "Anki is a friendly, intelligent spaced learning system. It's free and open source."
 msgstr ""
 
-#: ui/main.py:1309
+#: ui/main.py:1288
 #, python-format
 msgid ""
 "Anki was unable to save your configuration file:\n"
 "%s"
 msgstr ""
 
-#: ui/cardlist.py:48 ui/cardlist.py:423
+#: ui/cardlist.py:49 ui/cardlist.py:433
 msgid "Answer"
 msgstr ""
 
@@ -998,6 +998,15 @@ msgstr ""
 msgid "Applying reply..."
 msgstr ""
 
+#: forms/importing.py:103
+msgid "Auto-detect file format"
+msgstr ""
+
+#: ui/importing.py:159
+#, python-format
+msgid "Auto-detected &delimiter: %s"
+msgstr ""
+
 #: ui/status.py:234 ui/status.py:239
 msgid "Average time per answer: "
 msgstr ""
@@ -1038,7 +1047,7 @@ msgstr ""
 msgid "Browse and edit all items"
 msgstr ""
 
-#: ui/cardlist.py:515
+#: ui/cardlist.py:528
 #, python-format
 msgid "Browser (%(cur)d of %(tot)d card shown; %(sel)s)"
 msgid_plural "Browser (%(cur)d of %(tot)d cards shown; %(sel)s)"
@@ -1049,14 +1058,21 @@ msgstr[1] ""
 msgid "Browser Font"
 msgstr ""
 
-#: ui/cardlist.py:483
+#: ui/cardlist.py:496
 msgid "Building Index..."
 msgstr ""
 
-#: ui/main.py:1733
+#: ui/main.py:1712
 msgid "Bury"
 msgstr ""
 
+#: ui/importing.py:124
+msgid ""
+"By default, Anki will detect the character between fields, such as\n"
+"a tab, comma, and so on. If Anki is detecting the character incorrectly,\n"
+"you can enter it here. Use \\t to represent tab."
+msgstr ""
+
 #: forms/main.py:1479
 msgid "C&ram..."
 msgstr ""
@@ -1065,15 +1081,15 @@ msgstr ""
 msgid "Cache LaTeX"
 msgstr ""
 
-#: ui/cardlist.py:891
+#: ui/cardlist.py:904
 msgid "Can only change one model at a time."
 msgstr ""
 
-#: ui/cardlist.py:847 ui/cardlist.py:985
+#: ui/cardlist.py:860 ui/cardlist.py:998
 msgid "Can only operate on one model at a time."
 msgstr ""
 
-#: ui/main.py:2683
+#: ui/main.py:2662
 msgid "Cancel"
 msgstr ""
 
@@ -1112,19 +1128,19 @@ msgstr ""
 msgid "Cards with any of the selected tags below will not be shown."
 msgstr ""
 
-#: ui/main.py:1477
+#: ui/main.py:1456
 msgid "Cards/day:"
 msgstr ""
 
-#: ui/main.py:1476
+#: ui/main.py:1455
 msgid "Cards/session:"
 msgstr ""
 
-#: ui/importing.py:208
+#: ui/importing.py:256
 msgid "Change"
 msgstr ""
 
-#: ui/cardlist.py:1198
+#: ui/cardlist.py:1211
 #, python-format
 msgid "Change %s to:"
 msgstr ""
@@ -1133,7 +1149,7 @@ msgstr ""
 msgid "Change &Model..."
 msgstr ""
 
-#: ui/cardlist.py:898 forms/changemodel.py:74
+#: ui/cardlist.py:911 forms/changemodel.py:74
 msgid "Change Model"
 msgstr ""
 
@@ -1145,7 +1161,7 @@ msgstr ""
 msgid "Check complete."
 msgstr ""
 
-#: ui/main.py:1238
+#: ui/main.py:1217
 msgid "Check due counts again (F5)"
 msgstr ""
 
@@ -1157,7 +1173,7 @@ msgstr ""
 msgid "Check the files in the media directory"
 msgstr ""
 
-#: ui/main.py:1084
+#: ui/main.py:1063
 #, python-format
 msgid "Checking deck %(x)d of %(y)d..."
 msgstr ""
@@ -1227,7 +1243,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: ui/main.py:1541
+#: ui/main.py:1520
 msgid "Continue &Reviewing"
 msgstr ""
 
@@ -1256,15 +1272,15 @@ msgstr ""
 msgid "Correct under a month: "
 msgstr ""
 
-#: ui/main.py:190
+#: ui/main.py:191
 msgid "Couldn't play sound. Please install mplayer."
 msgstr ""
 
-#: ui/main.py:1857
+#: ui/main.py:1836
 msgid "Cram"
 msgstr ""
 
-#: ui/cardlist.py:878
+#: ui/cardlist.py:891
 msgid "Cram selected cards in new deck?"
 msgstr ""
 
@@ -1277,11 +1293,11 @@ msgstr ""
 msgid "Create '%s' on server"
 msgstr ""
 
-#: ui/cardlist.py:229 ui/cardlist.py:424
+#: ui/cardlist.py:234 ui/cardlist.py:434
 msgid "Created"
 msgstr ""
 
-#: ui/main.py:1209
+#: ui/main.py:1188
 #, python-format
 msgid "Ctrl+Alt+%d"
 msgstr ""
@@ -1426,7 +1442,7 @@ msgstr ""
 msgid "Czech"
 msgstr ""
 
-#: ui/main.py:2660
+#: ui/main.py:2639
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1441,32 +1457,32 @@ msgstr ""
 msgid "Deck Properties"
 msgstr ""
 
-#: ui/main.py:956 ui/main.py:1022
+#: ui/main.py:935 ui/main.py:1001
 msgid "Deck files (*.anki)"
 msgstr ""
 
-#: ui/main.py:700
+#: ui/main.py:679
 msgid "Deck is already open."
 msgstr ""
 
-#: ui/main.py:1231 ui/main.py:1723 forms/cardlist.py:266
+#: ui/main.py:1210 ui/main.py:1702 forms/cardlist.py:266
 msgid "Delete"
 msgstr ""
 
-#: ui/main.py:1290
+#: ui/main.py:1269
 #, python-format
 msgid "Delete %s?"
 msgstr ""
 
-#: ui/cardlist.py:760
+#: ui/cardlist.py:773
 msgid "Delete Cards"
 msgstr ""
 
-#: ui/main.py:2681
+#: ui/main.py:2660
 msgid "Delete Refs"
 msgstr ""
 
-#: ui/cardlist.py:785
+#: ui/cardlist.py:798
 msgid "Delete Tags"
 msgstr ""
 
@@ -1482,11 +1498,15 @@ msgstr ""
 msgid "Determining differences..."
 msgstr ""
 
+#: forms/infodialog.py:36
+msgid "Dialog"
+msgstr ""
+
 #: ui/modelproperties.py:326
 msgid "Disa&ble"
 msgstr ""
 
-#: ui/importing.py:30
+#: ui/importing.py:31
 msgid "Discard field"
 msgstr ""
 
@@ -1539,7 +1559,7 @@ msgstr ""
 msgid "Downloaded %dKB"
 msgstr ""
 
-#: ui/main.py:2180
+#: ui/main.py:2159
 #, python-format
 msgid "Downloaded %dKB from server..."
 msgstr ""
@@ -1552,7 +1572,7 @@ msgstr ""
 msgid "Downloads"
 msgstr ""
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:381 ui/cardlist.py:426
+#: ui/cardlist.py:50 ui/cardlist.py:246 ui/cardlist.py:391 ui/cardlist.py:436
 #: ui/graphs.py:148
 msgid "Due"
 msgstr ""
@@ -1566,7 +1586,7 @@ msgstr ""
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr ""
 
-#: ui/cardlist.py:237 ui/cardlist.py:429
+#: ui/cardlist.py:242 ui/cardlist.py:439
 msgid "Ease"
 msgstr ""
 
@@ -1594,7 +1614,7 @@ msgstr ""
 msgid "Ena&ble"
 msgstr ""
 
-#: ui/main.py:2021
+#: ui/main.py:2000
 msgid "Enable syncing, choose a name, then sync again."
 msgstr ""
 
@@ -1602,11 +1622,11 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: ui/cardlist.py:772
+#: ui/cardlist.py:785
 msgid "Enter tags to add:"
 msgstr ""
 
-#: ui/cardlist.py:783
+#: ui/cardlist.py:796
 msgid "Enter tags to delete:"
 msgstr ""
 
@@ -1650,7 +1670,7 @@ msgstr ""
 msgid "F4"
 msgstr ""
 
-#: ui/facteditor.py:252 ui/main.py:1239 forms/main.py:1467
+#: ui/facteditor.py:252 ui/main.py:1218 forms/main.py:1467
 msgid "F5"
 msgstr ""
 
@@ -1674,7 +1694,7 @@ msgstr ""
 msgid "F9"
 msgstr ""
 
-#: ui/cardlist.py:430
+#: ui/cardlist.py:440
 msgid "Fact Created"
 msgstr ""
 
@@ -1682,7 +1702,7 @@ msgstr ""
 msgid "Facts"
 msgstr ""
 
-#: ui/main.py:2167
+#: ui/main.py:2146
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr ""
 
@@ -1709,12 +1729,12 @@ msgstr ""
 msgid "Field %d"
 msgstr ""
 
-#: ui/importing.py:199
+#: ui/importing.py:247
 #, python-format
 msgid "Field <b>%d</b> of file is:"
 msgstr ""
 
-#: forms/importing.py:99
+#: forms/importing.py:104
 msgid "Field mapping"
 msgstr ""
 
@@ -1730,7 +1750,7 @@ msgstr ""
 msgid "Find and Re&place..."
 msgstr ""
 
-#: ui/cardlist.py:998 forms/findreplace.py:60
+#: ui/cardlist.py:1011 forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr ""
 
@@ -1750,16 +1770,16 @@ msgstr ""
 msgid "Fonts & Colours"
 msgstr ""
 
-#: ui/main.py:1230
+#: ui/main.py:1209
 msgid "Forget"
 msgstr ""
 
-#: ui/main.py:1283
+#: ui/main.py:1262
 #, python-format
 msgid "Forget %s?"
 msgstr ""
 
-#: ui/main.py:1233
+#: ui/main.py:1212
 msgid "Forget removes the deck from the list without deleting."
 msgstr ""
 
@@ -1775,11 +1795,11 @@ msgstr ""
 msgid "General && Fields"
 msgstr ""
 
-#: ui/cardlist.py:857 forms/addcardmodels.py:34
+#: ui/cardlist.py:870 forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr ""
 
-#: ui/cardlist.py:863
+#: ui/cardlist.py:876
 msgid "Generating Cards..."
 msgstr ""
 
@@ -1835,8 +1855,8 @@ msgstr ""
 msgid "Images (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgstr ""
 
-#: ui/importing.py:83 ui/importing.py:123 forms/changemap.py:39
-#: forms/importing.py:95 forms/main.py:1396
+#: ui/importing.py:89 ui/importing.py:169 forms/changemap.py:39
+#: forms/importing.py:99 forms/main.py:1396
 msgid "Import"
 msgstr ""
 
@@ -1844,24 +1864,24 @@ msgstr ""
 msgid "Import cards from text files, Anki files and more"
 msgstr ""
 
-#: ui/importing.py:133
+#: ui/importing.py:179
 msgid "Import failed.\n"
 msgstr ""
 
-#: forms/importing.py:96
+#: forms/importing.py:100
 msgid "Import options"
 msgstr ""
 
-#: ui/importing.py:141
+#: ui/importing.py:187
 #, python-format
 msgid "Importing complete. %(num)d facts imported from %(file)s.\n"
 msgstr ""
 
-#: ui/importing.py:128
+#: ui/importing.py:174
 msgid "Importing failed.\n"
 msgstr ""
 
-#: ui/importing.py:117
+#: ui/importing.py:163
 msgid "Importing..."
 msgstr ""
 
@@ -1877,11 +1897,11 @@ msgstr ""
 msgid "Include tags"
 msgstr ""
 
-#: ui/cardlist.py:233 ui/cardlist.py:427 ui/graphs.py:150
+#: ui/cardlist.py:238 ui/cardlist.py:437 ui/graphs.py:150
 msgid "Interval"
 msgstr ""
 
-#: ui/cardlist.py:1016
+#: ui/cardlist.py:1029
 msgid "Invalid regular expression."
 msgstr ""
 
@@ -1889,14 +1909,14 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: ui/main.py:2368
+#: ui/main.py:2347
 #, python-format
 msgid "It is %(sec)d second %(type)s.\n"
 msgid_plural "It is %(sec)d seconds %(type)s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/main.py:2123
+#: ui/main.py:2102
 #, python-format
 msgid ""
 "It is off by %d second.\n"
@@ -1927,6 +1947,10 @@ msgstr ""
 msgid "Korean"
 msgstr ""
 
+#: ui/cardlist.py:244 ui/cardlist.py:441
+msgid "Lapses"
+msgstr ""
+
 #: ui/facteditor.py:304
 msgid "Latex (Ctrl+l then l)"
 msgstr ""
@@ -1939,15 +1963,15 @@ msgstr ""
 msgid "Latex math environment (Ctrl+l then m)"
 msgstr ""
 
-#: ui/cardlist.py:383
+#: ui/cardlist.py:393
 msgid "Leech"
 msgstr ""
 
-#: ui/main.py:1858
+#: ui/main.py:1837
 msgid "Loading deck..."
 msgstr ""
 
-#: ui/main.py:1677
+#: ui/main.py:1656
 msgid "Loading graphs (may take time)..."
 msgstr ""
 
@@ -1955,20 +1979,25 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: ui/importing.py:146
+#: ui/importing.py:192
 msgid "Log of import:\n"
 msgstr ""
 
-#: ui/importing.py:23
+#: ui/importing.py:157
+#, python-format
+msgid "Manual &delimiter: %s"
+msgstr ""
+
+#: ui/importing.py:24
 #, python-format
 msgid "Map to %s"
 msgstr ""
 
-#: ui/importing.py:29
+#: ui/importing.py:30
 msgid "Map to Tags"
 msgstr ""
 
-#: ui/cardlist.py:377
+#: ui/cardlist.py:387
 msgid "Marked"
 msgstr ""
 
@@ -1998,7 +2027,7 @@ msgstr ""
 msgid "Models && Priorities"
 msgstr ""
 
-#: ui/cardlist.py:231 ui/cardlist.py:425 ui/getshared.py:146
+#: ui/cardlist.py:236 ui/cardlist.py:435 ui/getshared.py:146
 msgid "Modified"
 msgstr ""
 
@@ -2006,7 +2035,7 @@ msgstr ""
 msgid "Mongolian"
 msgstr ""
 
-#: ui/main.py:1229 forms/main.py:1388
+#: ui/main.py:1208 forms/main.py:1388
 msgid "More"
 msgstr ""
 
@@ -2034,6 +2063,10 @@ msgstr ""
 msgid "Move selected field up"
 msgstr ""
 
+#: ui/cardlist.py:1292
+msgid "Must map at least one template."
+msgstr ""
+
 #: ui/deckproperties.py:85
 msgid "Name"
 msgstr ""
@@ -2046,11 +2079,11 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ui/main.py:1480
+#: ui/main.py:1459
 msgid "New today:"
 msgstr ""
 
-#: ui/main.py:1481
+#: ui/main.py:1460
 msgid "New total:"
 msgstr ""
 
@@ -2062,7 +2095,7 @@ msgstr ""
 msgid "Next field must be blank."
 msgstr ""
 
-#: ui/main.py:1851 ui/main.py:1888
+#: ui/main.py:1830 ui/main.py:1867
 msgid "No cards matched the provided tags."
 msgstr ""
 
@@ -2074,15 +2107,15 @@ msgstr ""
 msgid "No changes found."
 msgstr ""
 
-#: ui/main.py:1669
+#: ui/main.py:1648
 msgid "No current card or last card."
 msgstr ""
 
-#: ui/cardlist.py:385
+#: ui/cardlist.py:395
 msgid "No fact tags"
 msgstr ""
 
-#: ui/main.py:2701
+#: ui/main.py:2680
 msgid "No media URLs defined for this deck."
 msgstr ""
 
@@ -2090,7 +2123,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr ""
 
-#: ui/cardlist.py:1194
+#: ui/cardlist.py:1207
 msgid "Nothing"
 msgstr ""
 
@@ -2098,11 +2131,11 @@ msgstr ""
 msgid "Nothing selected."
 msgstr ""
 
-#: ui/main.py:1205
+#: ui/main.py:1184
 msgid "Open"
 msgstr ""
 
-#: ui/main.py:784
+#: ui/main.py:763
 msgid "Open Recent Deck"
 msgstr ""
 
@@ -2110,7 +2143,7 @@ msgstr ""
 msgid "Open Recent..."
 msgstr ""
 
-#: ui/main.py:958
+#: ui/main.py:937
 msgid "Open deck"
 msgstr ""
 
@@ -2118,7 +2151,7 @@ msgstr ""
 msgid "Open the bug tracker"
 msgstr ""
 
-#: ui/main.py:1215
+#: ui/main.py:1194
 #, python-format
 msgid "Open this deck%s"
 msgstr ""
@@ -2127,7 +2160,7 @@ msgstr ""
 msgid "Optimize Database"
 msgstr ""
 
-#: ui/main.py:1591
+#: ui/main.py:1570
 msgid "Ordering..."
 msgstr ""
 
@@ -2148,7 +2181,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ui/main.py:910
+#: ui/main.py:889
 msgid "Password:"
 msgstr ""
 
@@ -2176,6 +2209,10 @@ msgstr ""
 msgid "Please add another model first."
 msgstr ""
 
+#: forms/sort.py:46
+msgid "Please choose a field to sort by."
+msgstr ""
+
 #: ui/sync.py:70
 msgid "Please double-check your username/password."
 msgstr ""
@@ -2184,7 +2221,7 @@ msgstr ""
 msgid "Please enable a different template first."
 msgstr ""
 
-#: ui/cardlist.py:828
+#: ui/cardlist.py:841
 msgid "Please enter a valid start and end range."
 msgstr ""
 
@@ -2194,11 +2231,11 @@ msgid ""
 "to enable recording."
 msgstr ""
 
-#: ui/main.py:1695
+#: ui/main.py:1674
 msgid "Please install python-matplotlib to access graphs."
 msgstr ""
 
-#: ui/main.py:2626
+#: ui/main.py:2605
 msgid "Please restart Anki before checking the DB."
 msgstr ""
 
@@ -2254,7 +2291,7 @@ msgstr ""
 msgid "Previous colour (F7 then F6)"
 msgstr ""
 
-#: ui/main.py:2641
+#: ui/main.py:2620
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2269,7 +2306,7 @@ msgstr ""
 msgid "Put space between question and answer"
 msgstr ""
 
-#: ui/cardlist.py:47 ui/cardlist.py:422
+#: ui/cardlist.py:48 ui/cardlist.py:432
 msgid "Question"
 msgstr ""
 
@@ -2293,7 +2330,7 @@ msgstr ""
 msgid "Quick Database Check"
 msgstr ""
 
-#: ui/main.py:1597 ui/main.py:1878
+#: ui/main.py:1576 ui/main.py:1857
 msgid "Randomizing..."
 msgstr ""
 
@@ -2314,12 +2351,12 @@ msgstr ""
 msgid "Recording...<br>Time: %0.1f"
 msgstr ""
 
-#: ui/cardlist.py:532 ui/main.py:2342
+#: ui/cardlist.py:545 ui/main.py:2321
 #, python-format
 msgid "Redo %s"
 msgstr ""
 
-#: ui/graphs.py:236 ui/main.py:1237
+#: ui/graphs.py:236 ui/main.py:1216
 msgid "Refresh"
 msgstr ""
 
@@ -2347,15 +2384,15 @@ msgstr ""
 msgid "Repeat &Audio"
 msgstr ""
 
-#: ui/cardlist.py:1001
+#: ui/cardlist.py:1014
 msgid "Replacing..."
 msgstr ""
 
-#: ui/cardlist.py:235 ui/cardlist.py:428 ui/graphs.py:154
+#: ui/cardlist.py:240 ui/cardlist.py:438 ui/graphs.py:154
 msgid "Reps"
 msgstr ""
 
-#: ui/cardlist.py:812 forms/reschedule.py:79
+#: ui/cardlist.py:825 forms/reschedule.py:79
 msgid "Reschedule"
 msgstr ""
 
@@ -2379,7 +2416,7 @@ msgstr ""
 msgid "Review Time"
 msgstr ""
 
-#: ui/main.py:1479
+#: ui/main.py:1458
 msgid "Reviews due:"
 msgstr ""
 
@@ -2400,7 +2437,7 @@ msgstr ""
 msgid "Save &As..."
 msgstr ""
 
-#: ui/main.py:1015
+#: ui/main.py:994
 msgid "Save Deck As"
 msgstr ""
 
@@ -2452,7 +2489,7 @@ msgstr ""
 msgid "Select None"
 msgstr ""
 
-#: ui/main.py:1509
+#: ui/main.py:1488
 msgid "Session Statistics"
 msgstr ""
 
@@ -2476,7 +2513,7 @@ msgstr ""
 msgid "Shift+Alt+m"
 msgstr ""
 
-#: ui/main.py:621 forms/main.py:1398
+#: ui/main.py:600 forms/main.py:1398
 msgid "Show Answer"
 msgstr ""
 
@@ -2540,13 +2577,13 @@ msgstr ""
 msgid "Show/Hide"
 msgstr ""
 
-#: ui/main.py:2125
+#: ui/main.py:2104
 msgid ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
 msgstr ""
 
-#: ui/addcards.py:134 ui/cardlist.py:647
+#: ui/addcards.py:134 ui/cardlist.py:660
 msgid "Some fields are missing or not unique."
 msgstr ""
 
@@ -2555,7 +2592,7 @@ msgstr ""
 msgid "Some settings will take effect after you restart Anki."
 msgstr ""
 
-#: ui/main.py:669
+#: ui/main.py:648
 msgid "Soon"
 msgstr ""
 
@@ -2564,7 +2601,7 @@ msgid "Sort as numbers"
 msgstr ""
 
 #: ui/facteditor.py:874
-msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)"
+msgid "Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)"
 msgstr ""
 
 #: ui/deckproperties.py:189
@@ -2575,7 +2612,7 @@ msgstr ""
 msgid "Spanish"
 msgstr ""
 
-#: ui/main.py:1543
+#: ui/main.py:1522
 msgid "Start &Reviewing"
 msgstr ""
 
@@ -2587,7 +2624,7 @@ msgstr ""
 msgid "Startup"
 msgstr ""
 
-#: forms/importing.py:101
+#: forms/importing.py:106
 msgid "Status"
 msgstr ""
 
@@ -2595,14 +2632,14 @@ msgstr ""
 msgid "Stop reviewing this card until it's unsuspended in the browser"
 msgstr ""
 
-#: ui/main.py:1255
+#: ui/main.py:1234
 #, python-format
 msgid "Studied <b>%(reps)d card</b> in <b>%(time)s</b> today."
 msgid_plural "Studied <b>%(reps)d cards</b> in <b>%(time)s</b> today."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ui/cardlist.py:794 ui/main.py:1714
+#: ui/cardlist.py:807 ui/main.py:1693
 msgid "Suspend"
 msgstr ""
 
@@ -2610,7 +2647,7 @@ msgstr ""
 msgid "Suspend the current fact until the deck is closed and opened again"
 msgstr ""
 
-#: ui/cardlist.py:379
+#: ui/cardlist.py:389
 msgid "Suspended"
 msgstr ""
 
@@ -2618,7 +2655,7 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
-#: ui/main.py:2139
+#: ui/main.py:2118
 msgid "Sync Failed. Please check your internet connection."
 msgstr ""
 
@@ -2646,7 +2683,7 @@ msgstr ""
 msgid "Synchronize this deck with Anki Online"
 msgstr ""
 
-#: ui/main.py:2145 ui/main.py:2147
+#: ui/main.py:2124 ui/main.py:2126
 msgid "Syncing Media..."
 msgstr ""
 
@@ -2655,11 +2692,11 @@ msgstr ""
 msgid "Syncing failed: %(a)s"
 msgstr ""
 
-#: ui/main.py:2679
+#: ui/main.py:2658
 msgid "Tag Cards"
 msgstr ""
 
-#: forms/importing.py:98
+#: forms/importing.py:102
 msgid "Tag facts with duplicate fields instead of deleting"
 msgstr ""
 
@@ -2667,11 +2704,11 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: ui/main.py:1841
+#: ui/main.py:1820
 msgid "Tags to cram:"
 msgstr ""
 
-#: ui/cardlist.py:1276
+#: ui/cardlist.py:1289
 msgid "Targets must be unique."
 msgstr ""
 
@@ -2701,23 +2738,23 @@ msgstr ""
 msgid "The maximum number of <b>new cards shown per day</b>. The default is 20, to ensure you don't get overwhelmed with reviews after a few days."
 msgstr ""
 
-#: ui/main.py:1516
+#: ui/main.py:1495
 msgid "The number of cards that are waiting to be reviewed today"
 msgstr ""
 
-#: ui/main.py:1510
+#: ui/main.py:1489
 msgid "The number of cards you studied in the current session (blue) and previous session (black)"
 msgstr ""
 
-#: ui/main.py:1512
+#: ui/main.py:1491
 msgid "The number of cards you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1514
+#: ui/main.py:1493
 msgid "The number of minutes you studied today (blue) and yesterday (black)"
 msgstr ""
 
-#: ui/main.py:1518
+#: ui/main.py:1497
 msgid "The number of new cards that are waiting to be learnt today"
 msgstr ""
 
@@ -2725,7 +2762,7 @@ msgstr ""
 msgid "The sync protocol has changed. Please upgrade."
 msgstr ""
 
-#: ui/main.py:1520
+#: ui/main.py:1499
 msgid "The total number of new cards in the deck"
 msgstr ""
 
@@ -2802,7 +2839,7 @@ msgid ""
 "You will need to remove the source first."
 msgstr ""
 
-#: ui/main.py:2628
+#: ui/main.py:2607
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2813,7 +2850,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ui/main.py:2670
+#: ui/main.py:2649
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2837,7 +2874,7 @@ msgid ""
 "Really delete these cards?"
 msgstr ""
 
-#: ui/main.py:1478
+#: ui/main.py:1457
 msgid "Time/day:"
 msgstr ""
 
@@ -2845,7 +2882,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ui/main.py:1687
+#: ui/main.py:1666
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2855,7 +2892,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr ""
 
-#: ui/main.py:1642
+#: ui/main.py:1621
 msgid "Toggle Toolbar"
 msgstr ""
 
@@ -2885,7 +2922,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ui/main.py:705
+#: ui/main.py:684
 msgid ""
 "Unable to load deck.\n"
 "\n"
@@ -2898,11 +2935,11 @@ msgid ""
 "To upgrade an old deck, download Anki 0.9.8.7."
 msgstr ""
 
-#: ui/main.py:966
+#: ui/main.py:945
 msgid "Unable to load file."
 msgstr ""
 
-#: ui/importing.py:174
+#: ui/importing.py:222
 #, python-format
 msgid ""
 "Unable to read file.\n"
@@ -2910,7 +2947,7 @@ msgid ""
 "%(info)s"
 msgstr ""
 
-#: ui/main.py:741
+#: ui/main.py:720
 msgid "Unable to recover. Deck load failed."
 msgstr ""
 
@@ -2922,7 +2959,7 @@ msgstr ""
 msgid "Underline text (Ctrl+u)"
 msgstr ""
 
-#: ui/cardlist.py:526 ui/main.py:2336
+#: ui/cardlist.py:539 ui/main.py:2315
 #, python-format
 msgid "Undo %s"
 msgstr ""
@@ -2932,18 +2969,18 @@ msgstr ""
 msgid "Unknown error: %s"
 msgstr ""
 
-#: ui/cardlist.py:803
+#: ui/cardlist.py:816
 msgid "Unsuspend"
 msgstr ""
 
-#: ui/main.py:2376
+#: ui/main.py:2355
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
 " - please don't close this"
 msgstr ""
 
-#: ui/main.py:2177
+#: ui/main.py:2156
 #, python-format
 msgid "Uploaded %dKB to server..."
 msgstr ""
@@ -2968,7 +3005,7 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: ui/main.py:906
+#: ui/main.py:885
 msgid "Username:"
 msgstr ""
 
@@ -3011,15 +3048,15 @@ msgstr ""
 msgid "X"
 msgstr ""
 
-#: ui/main.py:1755 ui/main.py:1803 ui/main.py:2664
+#: ui/main.py:1734 ui/main.py:1782 ui/main.py:2643
 msgid "You are currently cramming. Please close this deck first."
 msgstr ""
 
-#: ui/main.py:2122 ui/main.py:2367
+#: ui/main.py:2101 ui/main.py:2346
 msgid "Your computer clock is not set to the correct time.\n"
 msgstr ""
 
-#: ui/main.py:1692
+#: ui/main.py:1671
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3038,7 +3075,7 @@ msgstr ""
 msgid "days"
 msgstr ""
 
-#: ui/main.py:2365
+#: ui/main.py:2344
 msgid "early"
 msgstr ""
 
@@ -3046,7 +3083,7 @@ msgstr ""
 msgid "facts"
 msgstr ""
 
-#: ui/cardlist.py:211
+#: ui/cardlist.py:214
 #, python-format
 msgid "in %s"
 msgstr ""
@@ -3055,16 +3092,16 @@ msgstr ""
 msgid "label"
 msgstr ""
 
-#: ui/main.py:2363
+#: ui/main.py:2342
 msgid "late"
 msgstr ""
 
-#: ui/importing.py:202
+#: ui/importing.py:250
 #, python-format
 msgid "mapped to <b>%s</b>"
 msgstr ""
 
-#: ui/importing.py:204
+#: ui/importing.py:252
 msgid "mapped to <b>Tags</b>"
 msgstr ""
 
diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index 24009b56c..9793c2284 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -871,7 +871,7 @@ class FactEditor(object):
     def onAddSound(self):
         # get this before we open the dialog
         w = self.focusedEdit()
-        key = _("Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg)")
+        key = _("Sounds/Videos (*.mp3 *.ogg *.wav *.avi *.ogv *.mpg *.mpeg *.mov)")
         file = ui.utils.getFile(self.parent, _("Add audio"), "audio", key)
         if not file:
             return