diff --git a/ankiqt/locale/ankiqt_cs_CZ.po b/ankiqt/locale/ankiqt_cs_CZ.po
index 276e28403..6c0076c9f 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2179,16 +2179,16 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-#, fuzzy
-msgid "Please add a new card first."
-msgstr "Prosím zodpovězte ještě několik kartiček."
-
 #: ui/modelproperties.py:164
 #, fuzzy
 msgid "Please add a new field first."
 msgstr "Prosím zodpovězte ještě několik kartiček."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Prosím zodpovězte ještě několik kartiček."
+
 #: ui/deckproperties.py:143
 #, fuzzy
 msgid "Please add another model first."
@@ -3991,6 +3991,10 @@ msgstr ""
 #~ msgid "Open On&line..."
 #~ msgstr "Otevřít vzorový soubor..."
 
+#, fuzzy
+#~ 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í"
 
diff --git a/ankiqt/locale/ankiqt_de_DE.po b/ankiqt/locale/ankiqt_de_DE.po
index 6109fa336..97fafe5fd 100644
--- a/ankiqt/locale/ankiqt_de_DE.po
+++ b/ankiqt/locale/ankiqt_de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
 "PO-Revision-Date: 2009-03-28 15:50+0100\n"
 "Last-Translator: Michael Keppler <bananeweizen@gmx.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2079,14 +2079,15 @@ msgstr "Persönlicher Stapel"
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Bitte füge zuerst eine neue Karte hinzu."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Bitte füge zuerst ein neues Feld hinzu."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Bitte füge zuerst ein neues Feld hinzu."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Bitte füge zuerst ein anderes Modell hinzu."
@@ -4051,6 +4052,9 @@ msgstr "Label"
 #~ msgid "Period"
 #~ msgstr "Zeitraum"
 
+#~ msgid "Please add a new card first."
+#~ msgstr "Bitte füge zuerst eine neue Karte hinzu."
+
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "Bitte wähle ein Feld, nach dem sortiert werden soll."
 
diff --git a/ankiqt/locale/ankiqt_ee_EE.po b/ankiqt/locale/ankiqt_ee_EE.po
index 0086227fc..ef28c8c82 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
 "PO-Revision-Date: 2009-03-17 18:43+0200\n"
 "Last-Translator: Meelis Vasser <meelis.vasser@gmail.com>\n"
 "Language-Team: Estonian <>\n"
@@ -2085,14 +2085,15 @@ msgstr "Isiklik kaardipakk"
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Lisa kõigepealt uus kaart."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Lisa kõigepealt uus väli."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Lisa kõigepealt uus väli."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Lisa kõigepealt teine mudel."
@@ -3295,6 +3296,9 @@ msgstr "üleminesedel"
 #~ msgid "Import file"
 #~ msgstr "Impordi fail"
 
+#~ 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."
 
diff --git a/ankiqt/locale/ankiqt_es_ES.po b/ankiqt/locale/ankiqt_es_ES.po
index d339fb524..ce7b261f3 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
 "PO-Revision-Date: 2009-02-02 07:46+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <pcsl88@gmail.com>\n"
@@ -2094,14 +2094,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Por favor, añada una nueva tarjeta primero."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Por favor, añada una nuevo campo primero."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Por favor, añada una nuevo campo primero."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Por favor, añada otro modelo antes."
@@ -3386,6 +3387,9 @@ msgstr "toplabel"
 #~ msgid "Open On&line..."
 #~ msgstr "Abrir On&line..."
 
+#~ msgid "Please add a new card first."
+#~ msgstr "Por favor, añada una nueva tarjeta primero."
+
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "Elija un campo por el que ordenar las tarjetas."
 
diff --git a/ankiqt/locale/ankiqt_fi_FI.po b/ankiqt/locale/ankiqt_fi_FI.po
index d6de561de..859026379 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2089,14 +2089,15 @@ msgstr "Henkilökohtainen pakka"
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Lisää ensin kortteja."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Lisää ensin kenttä."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Lisää ensin kenttä."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Lisää toinen malli ensin."
@@ -3358,6 +3359,9 @@ msgstr ""
 #~ msgid "Open On&line..."
 #~ msgstr "Avaa &verkosta..."
 
+#~ msgid "Please add a new card first."
+#~ msgstr "Lisää ensin kortteja."
+
 #, fuzzy
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "Lisää ensin kenttä."
diff --git a/ankiqt/locale/ankiqt_fr_FR.po b/ankiqt/locale/ankiqt_fr_FR.po
index 9e82ded0e..1e1d4eb5e 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2207,14 +2207,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Veuillez d'abord ajouter une autre carte."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Veuillez d'abord ajouter un autre champ."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Veuillez d'abord ajouter un autre champ."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Veuillez d'abord ajouter un autre modèle."
@@ -4406,6 +4407,9 @@ msgstr "tard"
 #~ msgid "Period"
 #~ msgstr "Période"
 
+#~ 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."
 
diff --git a/ankiqt/locale/ankiqt_it_IT.po b/ankiqt/locale/ankiqt_it_IT.po
index a7d1bf3f2..2e121a2c6 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2176,14 +2176,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Aggiungere una nuova carta prima di procedere."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Aggiungere un nuovo campo prima di procedere."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Aggiungere un nuovo campo prima di procedere."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Aggiungere un altro modello prima di procedere."
@@ -3678,6 +3679,9 @@ msgstr "etichetta"
 #~ msgid "Period"
 #~ msgstr "Periodo"
 
+#~ 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."
 
diff --git a/ankiqt/locale/ankiqt_ja_JP.po b/ankiqt/locale/ankiqt_ja_JP.po
index 486b132d9..07c6df480 100644
--- a/ankiqt/locale/ankiqt_ja_JP.po
+++ b/ankiqt/locale/ankiqt_ja_JP.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
 "PO-Revision-Date: 2008-03-28 17:07+0900\n"
 "Last-Translator: Andrew Wright <guswright80@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2158,14 +2158,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "まず新しいカードを入力してください。"
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "まず新しいフィールドを作成してください。"
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "まず新しいフィールドを作成してください。"
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "まずもう一つのモデルを作成してください。"
@@ -4040,6 +4041,9 @@ msgstr ""
 #~ msgid "Percentage of minimum interval"
 #~ msgstr "最小期間のパーセンテージ"
 
+#~ msgid "Please add a new card first."
+#~ msgstr "まず新しいカードを入力してください。"
+
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "フィールドの整列を選んでください。"
 
diff --git a/ankiqt/locale/ankiqt_ko_KR.po b/ankiqt/locale/ankiqt_ko_KR.po
index d2ef5ed25..66fe4f219 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2184,14 +2184,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "먼저 새 카드를 추가해 주세요."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "먼저 새 필드를 추가해 주세요."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "먼저 새 필드를 추가해 주세요."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "먼저 새 모델을 추가해 주세요."
@@ -4003,6 +4004,9 @@ msgstr "Latex"
 #~ msgid "Percentage of minimum interval"
 #~ msgstr "최소 복습 간격 비율"
 
+#~ msgid "Please add a new card first."
+#~ msgstr "먼저 새 카드를 추가해 주세요."
+
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "정렬 기준이 될 필드를 선택해 주세요."
 
diff --git a/ankiqt/locale/ankiqt_mn_MN.po b/ankiqt/locale/ankiqt_mn_MN.po
index e66760543..a1753f575 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
 "PO-Revision-Date: 2009-04-19 00:56+0600\n"
 "Last-Translator: Charlene <charlener@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2083,14 +2083,15 @@ msgstr "Өөрийнхөө Цуглуулга"
 msgid "Play the last-played audio again"
 msgstr "Сүүлд тоглосон дуу дахиад тоглох"
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Эхлээд шинэ картыг нэмнэ уу?"
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Эхлээд шинэ талбарыг нэмнэ уу?"
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Эхлээд шинэ талбарыг нэмнэ уу?"
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Дахин зүйл нэмнэ уу?"
@@ -3132,6 +3133,9 @@ msgstr "toplabel"
 #~ msgid "Import file"
 #~ msgstr "Файлыг импортлох"
 
+#~ msgid "Please add a new card first."
+#~ msgstr "Эхлээд шинэ картыг нэмнэ уу?"
+
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "Талбараас эрэмбэлэхээр нь сонго."
 
diff --git a/ankiqt/locale/ankiqt_pl_PL.po b/ankiqt/locale/ankiqt_pl_PL.po
index e56da8b3e..85ea72f52 100644
--- a/ankiqt/locale/ankiqt_pl_PL.po
+++ b/ankiqt/locale/ankiqt_pl_PL.po
@@ -7,13 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt_pl_PL\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
 "POT-Creation-Date: 2009-04-29 22:44+0200\n"
 "PO-Revision-Date: 2009-04-29 22:39+0200\n"
-=======
-"POT-Creation-Date: 2009-04-30 11:35+0200\n"
-"PO-Revision-Date: 2009-04-29 20:32+0200\n"
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
 "Last-Translator: Piotr Kubowicz <derbeth-fora@wp.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -104,7 +99,7 @@ msgstr " <b>Przy przeglądaniu i edycji:</b>"
 msgid " applied %d modified cards."
 msgstr " zastosowano %d zmodyfikowanych kart."
 
-#: ui/main.py:2338
+#: ui/main.py:2337
 #, python-format
 msgid ""
 "%(a)d missing references.\n"
@@ -135,7 +130,7 @@ msgstr[2] "%(name)s [%(facts)d faktów]"
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d z %(totalSum)d"
 
-#: ui/main.py:1946
+#: ui/main.py:1945
 #, 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"
@@ -158,133 +153,133 @@ msgstr[2] "%d wybranych"
 msgid "%s ago"
 msgstr "%s temu"
 
-#: forms/main.py:944
+#: forms/main.py:942
 msgid "&About..."
 msgstr "&O programie..."
 
-#: forms/cardlist.py:239
+#: forms/cardlist.py:237
 msgid "&Actions"
 msgstr "&Działania"
 
-#: forms/deckproperties.py:334 forms/modelproperties.py:291
+#: forms/deckproperties.py:336 forms/modelproperties.py:291
 #: forms/modelproperties.py:304
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: forms/main.py:919
+#: forms/main.py:917
 msgid "&Add Items..."
 msgstr "&Dodaj elementy..."
 
-#: forms/deckproperties.py:346
+#: forms/deckproperties.py:348
 msgid "&Add Source"
 msgstr "&Dodaj źródło"
 
-#: forms/cardlist.py:244
+#: forms/cardlist.py:242
 msgid "&Add Tag..."
 msgstr "&Dodaj etykietę..."
 
-#: forms/main.py:1018
+#: forms/main.py:1016
 msgid "&Bury Fact"
 msgstr "Za&kop fakt"
 
-#: forms/main.py:945
+#: forms/main.py:943
 msgid "&Card Statistics"
 msgstr "Statystyki &karty"
 
-#: forms/main.py:911
+#: forms/main.py:909
 msgid "&Close"
 msgstr "Zam&knij"
 
-#: forms/cardlist.py:269
+#: forms/cardlist.py:267
 msgid "&Cram..."
 msgstr "&Sprawdzian..."
 
-#: forms/main.py:947
+#: forms/main.py:945
 msgid "&Deck Properties..."
 msgstr "&Właściwości talii..."
 
-#: forms/main.py:939
+#: forms/main.py:937
 msgid "&Deck Statistics"
 msgstr "Statystyki &talii"
 
-#: forms/deckproperties.py:336 forms/modelproperties.py:294
+#: forms/deckproperties.py:338 forms/modelproperties.py:294
 #: forms/modelproperties.py:309
 msgid "&Delete"
 msgstr "&Usuń"
 
-#: forms/main.py:996
+#: forms/main.py:994
 msgid "&Delete Card"
 msgstr "&Usuń kartę"
 
-#: forms/main.py:999
+#: forms/main.py:997
 msgid "&Delete Fact"
 msgstr "&Usuń fakt"
 
-#: forms/deckproperties.py:347
+#: forms/deckproperties.py:349
 msgid "&Delete Source"
 msgstr "&Usuń źródło"
 
-#: forms/cardlist.py:245
+#: forms/cardlist.py:243
 msgid "&Delete Tag..."
 msgstr "&Usuń etykietę..."
 
-#: forms/main.py:988
+#: forms/main.py:986
 msgid "&Disable All Plugins"
 msgstr "&Wyłącz wszystkie dodatki"
 
-#: forms/main.py:1006
+#: forms/main.py:1004
 msgid "&Donate..."
 msgstr "&Dary pieniężne..."
 
-#: forms/main.py:898
+#: forms/main.py:896
 msgid "&Download..."
 msgstr "Ścią&gnij..."
 
-#: forms/cardlist.py:238 forms/deckproperties.py:335 forms/main.py:895
+#: forms/cardlist.py:236 forms/deckproperties.py:337 forms/main.py:893
 msgid "&Edit"
 msgstr "&Edytuj"
 
-#: forms/main.py:987
+#: forms/main.py:985
 msgid "&Enable All Plugins"
 msgstr "&Włącz wszystkie dodatki"
 
-#: forms/main.py:896
+#: forms/main.py:894
 msgid "&File"
 msgstr "&Plik"
 
-#: forms/cardlist.py:252
+#: forms/cardlist.py:250
 msgid "&Find"
 msgstr "&Szukaj"
 
-#: forms/main.py:955
+#: forms/main.py:953
 msgid "&Fonts and Colours..."
 msgstr "&Czcionki i kolory..."
 
-#: forms/main.py:973
+#: forms/main.py:971
 msgid "&Forum..."
 msgstr "&Forum..."
 
-#: forms/cardlist.py:246
+#: forms/cardlist.py:244
 msgid "&Generate Cards..."
 msgstr "Generowanie &kart..."
 
-#: forms/main.py:985
+#: forms/main.py:983
 msgid "&Get Plugins..."
 msgstr "&Pobierz dodatki..."
 
-#: forms/cardlist.py:240
+#: forms/cardlist.py:238
 msgid "&Go"
 msgstr "&Idź"
 
-#: forms/main.py:951
+#: forms/main.py:949
 msgid "&Graphs..."
 msgstr "&Wykresy..."
 
-#: forms/cardlist.py:265
+#: forms/cardlist.py:263
 msgid "&Guide..."
 msgstr "&Przewodnik..."
 
-#: forms/cardlist.py:241 forms/main.py:894
+#: forms/cardlist.py:239 forms/main.py:892
 msgid "&Help"
 msgstr "Pomo&c"
 
@@ -292,95 +287,95 @@ msgstr "Pomo&c"
 msgid "&Import"
 msgstr "I&mport"
 
-#: forms/main.py:949
+#: forms/main.py:947
 msgid "&Import..."
 msgstr "I&mport..."
 
-#: forms/cardlist.py:251
+#: forms/cardlist.py:249
 msgid "&Invert Selection"
 msgstr "&Odwróć zaznaczenie"
 
-#: forms/main.py:938
+#: forms/main.py:936
 msgid "&Kanji Statistics"
 msgstr "Statystyki &kanji"
 
-#: forms/cardlist.py:262
+#: forms/cardlist.py:260
 msgid "&Last Card"
 msgstr "&Ostatnia karta"
 
-#: forms/main.py:892
+#: forms/main.py:890
 msgid "&Learn More"
 msgstr "Nauka &kolejnych"
 
-#: forms/main.py:900
+#: forms/main.py:898
 msgid "&Lookup"
 msgstr "&Sprawdzenie"
 
-#: forms/main.py:958
+#: forms/main.py:956
 msgid "&Mark Fact"
 msgstr "&Zaznacz fakt"
 
-#: forms/main.py:907
+#: forms/main.py:905
 msgid "&New"
 msgstr "&Nowy..."
 
-#: forms/cardlist.py:256
+#: forms/cardlist.py:254
 msgid "&Next Card"
 msgstr "&Następna karta"
 
-#: forms/main.py:986
+#: forms/main.py:984
 msgid "&Open Plugin Folder..."
 msgstr "&Otwórz nowy katalog dodatków..."
 
-#: forms/main.py:909
+#: forms/main.py:907
 msgid "&Open..."
 msgstr "&Otwórz..."
 
-#: forms/main.py:925
+#: forms/main.py:923
 msgid "&Preferences"
 msgstr "&Preferencje"
 
-#: forms/cardlist.py:258
+#: forms/cardlist.py:256
 msgid "&Previous Card"
 msgstr "&Poprzednia karta"
 
-#: forms/main.py:1007
+#: forms/main.py:1005
 msgid "&Record Noise Profile..."
 msgstr "&Nagraj profil szumu..."
 
-#: forms/cardlist.py:250 forms/main.py:995
+#: forms/cardlist.py:248 forms/main.py:993
 msgid "&Redo"
 msgstr "&Powtórz"
 
-#: forms/main.py:942
+#: forms/main.py:940
 msgid "&Report Bug..."
 msgstr "Zgłoś &błąd..."
 
-#: forms/cardlist.py:247
+#: forms/cardlist.py:245
 msgid "&Reschedule..."
 msgstr "Zmień &planowanie..."
 
-#: forms/main.py:913
+#: forms/main.py:911
 msgid "&Save"
 msgstr "&Zapisz"
 
-#: forms/main.py:902
+#: forms/main.py:900
 msgid "&Settings"
 msgstr "&Ustawienia"
 
-#: forms/main.py:1004
+#: forms/main.py:1002
 msgid "&Study Options..."
 msgstr "Opcje &nauki..."
 
-#: forms/main.py:961
+#: forms/main.py:959
 msgid "&Suspend Fact"
 msgstr "Za&wieś fakt"
 
-#: forms/main.py:899
+#: forms/main.py:897
 msgid "&Tools"
 msgstr "&Narzędzia"
 
-#: forms/cardlist.py:249 forms/main.py:971
+#: forms/cardlist.py:247 forms/main.py:969
 msgid "&Undo"
 msgstr "&Cofnij"
 
@@ -393,23 +388,23 @@ msgstr "'%s'"
 msgid "(new card)"
 msgstr "(nowa karta)"
 
-#: forms/main.py:928
+#: forms/main.py:926
 msgid "...&expression on ALC"
 msgstr "...&wyrażenie w ALC"
 
-#: forms/main.py:936
+#: forms/main.py:934
 msgid "...&kanji selection on Edict"
 msgstr "...&wybór kanji w Edict"
 
-#: forms/main.py:930
+#: forms/main.py:928
 msgid "...&meaning on ALC"
 msgstr "...&znaczenie w ALC"
 
-#: forms/main.py:932
+#: forms/main.py:930
 msgid "...&selection on ALC"
 msgstr "...&wybór w ALC"
 
-#: forms/main.py:934
+#: forms/main.py:932
 msgid "...&word selection on Edict"
 msgstr "...&wybór słowa w Edict"
 
@@ -417,7 +412,7 @@ msgstr "...&wybór słowa w Edict"
 msgid "; disabled"
 msgstr "; wyłączona"
 
-#: forms/deckproperties.py:341
+#: forms/deckproperties.py:343
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
@@ -449,43 +444,43 @@ msgstr ""
 msgid "<Filter>"
 msgstr "<Filtr>"
 
-#: forms/deckproperties.py:327
+#: forms/deckproperties.py:329
 msgid "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Help</a>"
 msgstr "<a href=\"http://ichi2.net/anki/wiki/DeckProperties#Synchronization\">Pomoc</a>"
 
-#: ui/main.py:1315
+#: ui/main.py:1314
 msgid "<a href=py:miss>Missing</a><br>"
 msgstr "<a href=py:miss>Brakujące</a><br>"
 
-#: ui/main.py:1317
+#: ui/main.py:1316
 msgid "<a href=py:non>Non-jouyou</a><br>"
 msgstr "<a href=py:non>Nie-jouyou</a><br>"
 
-#: ui/main.py:1316
+#: ui/main.py:1315
 msgid "<a href=py:seen>Seen</a><br>"
 msgstr "<a href=py:seen>Widziane</a><br>"
 
-#: forms/deckproperties.py:364
+#: forms/deckproperties.py:363
 msgid "<b>1: Again (Mature)</b>"
 msgstr "<b>1: Znowu (stara)</b>"
 
-#: forms/deckproperties.py:366
+#: forms/deckproperties.py:365
 msgid "<b>1: Again (Young)</b>"
 msgstr "<b>1: Znowu (nowa)</b>"
 
-#: forms/deckproperties.py:365
+#: forms/deckproperties.py:364
 msgid "<b>1: Failure Multiplier</b>"
 msgstr "<b>1: Mnożnik błędu</b>"
 
-#: forms/deckproperties.py:363
+#: forms/deckproperties.py:362
 msgid "<b>2: Initial Hard Interval</b>"
 msgstr "<b>2: Pocz. przerwa dla trudnych</b>"
 
-#: forms/deckproperties.py:358
+#: forms/deckproperties.py:357
 msgid "<b>3: Initial Good Interval</b>"
 msgstr "<b>3: Pocz. przerwa dla dobrych</b>"
 
-#: forms/deckproperties.py:357
+#: forms/deckproperties.py:356
 msgid "<b>4: Initial Easy Interval</b>"
 msgstr "<b>4: Pocz. przerwa dla łatwych</b>"
 
@@ -513,7 +508,7 @@ msgstr "<b>Rozmiar czcionki</b>:"
 msgid "<b>Font</b>:"
 msgstr "<b>Czcionka</b>:"
 
-#: forms/deckproperties.py:330
+#: forms/deckproperties.py:332
 msgid "<b>High Priority</b>"
 msgstr "<b>Wysoki priorytet</b>"
 
@@ -529,11 +524,11 @@ msgstr "<b>Ograniczenie do etykiet</b>:"
 msgid "<b>Line Size</b>:"
 msgstr "<b>Rozmiar linii</b>:"
 
-#: forms/deckproperties.py:331
+#: forms/deckproperties.py:333
 msgid "<b>Low Priority</b>"
 msgstr "<b>Niski priorytet</b>"
 
-#: forms/deckproperties.py:372
+#: forms/deckproperties.py:371
 msgid "<b>Maximum failed cards</b>"
 msgstr "<b>Maksymalnie nierozwiązanych kart</b>"
 
@@ -554,11 +549,11 @@ msgstr "<b>Nazwa</b>"
 msgid "<b>New Model</b>:"
 msgstr "<b>Nowy model</b>:"
 
-#: forms/main.py:886
+#: forms/main.py:884
 msgid "<b>New cards per day:</b>"
 msgstr "<b>Nowych kart dziennie:</b>"
 
-#: forms/deckproperties.py:373
+#: forms/deckproperties.py:372
 msgid "<b>New day starts at</b>"
 msgstr "<b>Nowy dzień od godziny</b>"
 
@@ -578,15 +573,15 @@ msgstr "<b>Pytanie</b>"
 msgid "<b>Replace With</b>:"
 msgstr "<b>Zastąp przez</b>:"
 
-#: forms/main.py:884
+#: forms/main.py:882
 msgid "<b>Session limit (minutes):</b>"
 msgstr "<b>Limit sesji (minuty):</b>"
 
-#: forms/main.py:888
+#: forms/main.py:886
 msgid "<b>Session limit (questions):"
 msgstr "<b>Limit sesji (pytania):"
 
-#: forms/deckproperties.py:374
+#: forms/deckproperties.py:373
 msgid "<b>Show failed cards early</b>"
 msgstr "<b>Wcześnie pokazuj nierozwiązane karty</b>"
 
@@ -594,7 +589,7 @@ msgstr "<b>Wcześnie pokazuj nierozwiązane karty</b>"
 msgid "<b>Spacing multipler</b>"
 msgstr "<b>Mnożnik odstępu</b>"
 
-#: forms/deckproperties.py:332
+#: forms/deckproperties.py:334
 msgid "<b>Suspended</b>"
 msgstr "<b>Zawieszona</b>"
 
@@ -623,7 +618,7 @@ msgstr ""
 "<b>Liczba pobrań</b>: %(count)s<br>\n"
 "<b>Opis</b>:<br>%(description)s"
 
-#: forms/deckproperties.py:329
+#: forms/deckproperties.py:331
 msgid "<b>Very High Priority</b>"
 msgstr "<b>Bardzo wysoki priorytet</b>"
 
@@ -635,7 +630,7 @@ msgstr "<br><br>Sprawdzanie subskrypcji talii..."
 msgid "<h1>Added</h1>"
 msgstr "<h1>Dodane</h1>"
 
-#: forms/deckproperties.py:354
+#: forms/deckproperties.py:353
 msgid "<h1>Advanced Scheduling</h1>"
 msgstr "<h1>Zaawansowane planowanie</h1>"
 
@@ -664,7 +659,7 @@ msgstr "<h1>Autozapis</h1>"
 msgid "<h1>Card Templates</h1>"
 msgstr "<h1>Szablony kart</h1>"
 
-#: ui/main.py:1450
+#: ui/main.py:1449
 msgid ""
 "<h1>Cramming</h1>\n"
 "You are currently cramming. Any edits you make to this deck\n"
@@ -678,7 +673,7 @@ msgstr ""
 msgid "<h1>Cumulative Due</h1>"
 msgstr "<h1>Kumulatywny czas przyjścia</h1>"
 
-#: ui/main.py:1347
+#: ui/main.py:1346
 msgid "<h1>Current card</h1>"
 msgstr "<h1>Aktualna karta</h1>"
 
@@ -714,11 +709,11 @@ msgstr "<h1>Przerwy</h1>"
 msgid "<h1>Language</h1>"
 msgstr "<h1>Język</h1>"
 
-#: ui/main.py:1350
+#: ui/main.py:1349
 msgid "<h1>Last card</h1>"
 msgstr "<h1>Ostatnia karta</h1>"
 
-#: forms/deckproperties.py:333
+#: forms/deckproperties.py:335
 msgid "<h1>Models</h1>"
 msgstr "<h1>Modele</h1>"
 
@@ -730,7 +725,7 @@ msgstr "<h1>Konto online</h1>Aby wykorzystać swoje darmowe <a href=\"http://ank
 msgid "<h1>Open Online Deck</h1>"
 msgstr "<h1>Otwórz talię z Internetu</h1>"
 
-#: forms/deckproperties.py:328
+#: forms/deckproperties.py:330
 msgid "<h1>Priorities</h1>"
 msgstr "<h1>Priorytety</h1>"
 
@@ -750,11 +745,66 @@ msgstr "<h1>Powtarzanie</h1>"
 msgid "<h1>Select Target Field</h1>"
 msgstr "<h1>Wybierz pole docelowe</h1>"
 
+#: ui/main.py:1130
+msgid ""
+"<h1>Session Statistics</h1>\n"
+"<dl>\n"
+"<dt><b>Cards/session</b></dt>\n"
+"<dd>The number of cards you studied in the current session (blue) and previous\n"
+"session (black)</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Cards/day</b></dt>\n"
+"<dd>The number of cards you studied today (blue) and yesterday (black)</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Time/day</b></dt>\n"
+"<dd>The number of minutes you studied today (blue) and yesterday (black)</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Reviews due</b></dt>\n"
+"<dd>The number of cards that are waiting to be reviewed today</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>New today</b></dt>\n"
+"<dd>The number of new cards that are waiting to be learnt today</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>New total</b></dt>\n"
+"<dd>The total number of new cards in the deck</dd>\n"
+"</dl>"
+msgstr ""
+"<h1>Statystyki sesji</h1>\n"
+"<dl>\n"
+"<dt><b>Kart na sesję</b></dt>\n"
+"<dd>Liczba kart powtarzanych w aktualnej (na niebiesko) i poprzedniej sesji (na czarno)</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Kart dziennie</b></dt>\n"
+"<dd>Liczba kart powtarzanych dzisiaj (na niebiesko) i wczoraj (na czarno)</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Czas dziennie</b></dt>\n"
+"<dd>Liczba minut w trakcie powtórki dzisiaj (na niebiesko) i wczoraj (na czarno)</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Do przeglądnięcia</b></dt>\n"
+"<dd>Liczba kart będących dzisiaj do przeglądnięcia</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Nowe dzisiaj</b></dt>\n"
+"<dd>Liczba nowych kart oczekujących dzisiaj</dd>\n"
+"</dl>\n"
+"<dl>\n"
+"<dt><b>Nowych ogólnie</b></dt>\n"
+"<dd>Ogólna liczba nowych kart w talii</dd>\n"
+"</dl>"
+
 #: ui/main.py:1069
 msgid "<h1>Study Options</h1>"
 msgstr "<b>Opcje nauki</b>"
 
-#: ui/main.py:1809
+#: ui/main.py:1808
 msgid ""
 "<h1>Sync Failed</h1>\n"
 "Couldn't contact Anki Online. Please check your internet connection."
@@ -762,7 +812,7 @@ msgstr ""
 "<h1>Synchronizacja nie powiodła się</h1>\n"
 "Nie udało się połączyć z Anki Online. Sprawdź swoje połączenie internetowe."
 
-#: forms/deckproperties.py:339
+#: forms/deckproperties.py:341
 msgid "<h1>Synchronisation</h1>"
 msgstr "<h1>Synchronizacja</h1>"
 
@@ -808,11 +858,47 @@ msgstr "<zignorowane>"
 msgid "<p><a href=hide:>Hide this</a>"
 msgstr "<p><a href=hide:>Schowaj</a>"
 
+#: ui/main.py:1115
+#, python-format
+msgid ""
+"<table>\n"
+"<tr><td width=100>Reviews due:</td><td align=right><b>%(ret)s</b></td></tr>\n"
+"<tr><td>New today:</td><td align=right><b>%(new)s</b></td></tr>\n"
+"<tr><td>New total:</td><td align=right>%(newof)s</td></tr>\n"
+"</table>"
+msgstr ""
+"<table>\n"
+"<tr><td width=100>Do przeglądnięcia:</td><td align=right><b>%(ret)s</b></td></tr>\n"
+"<tr><td>Nowe dzisiaj:</td><td align=right><b>%(new)s</b></td></tr>\n"
+"<tr><td>Nowych ogólnie:</td><td align=right>%(newof)s</td></tr>\n"
+"</table>"
+
+#: ui/main.py:1106
+#, python-format
+msgid ""
+"<table>\n"
+"<tr><td width=80>Cards/session:</td><td width=50><b>%(repsInSesChg)s</b></td>\n"
+"<td><b>%(repsInSes)s</b></td></tr>\n"
+"<tr><td>Cards/day:</td><td><b>%(repsTodayChg)s</b></td>\n"
+"<td><b>%(repsToday)s</b></td></tr>\n"
+"<tr><td>Time/day:</td><td><b>%(timeTodayChg)s</b></td>\n"
+"<td><b>%(timeToday)s</b></td></tr>\n"
+"</table>"
+msgstr ""
+"<table>\n"
+"<tr><td width=80>Kart na sesję:</td><td width=50><b>%(repsInSesChg)s</b></td>\n"
+"<td>%(repsInSes)s</td></tr>\n"
+"<tr><td>Kart dziennie:</td><td><b>%(repsTodayChg)s</b></td>\n"
+"<td>%(repsToday)s</td></tr>\n"
+"<tr><td>Czas dziennie:</td><td><b>%(timeTodayChg)s</b></td>\n"
+"<td>%(timeToday)s</td></tr>\n"
+"</table>"
+
 #: forms/about.py:41
 msgid "About Anki"
 msgstr "O Anki"
 
-#: forms/main.py:990
+#: forms/main.py:988
 msgid "Active &Tags..."
 msgstr "Aktywne &etykiety..."
 
@@ -820,7 +906,7 @@ msgstr "Aktywne &etykiety..."
 msgid "Active Tags"
 msgstr "Aktywne etykiety"
 
-#: forms/main.py:901
+#: forms/main.py:899
 msgid "Ad&vanced"
 msgstr "&Zaawansowane"
 
@@ -872,7 +958,7 @@ msgstr "Dodaj ukryty znak do tekstu (naprawia tajski na OSX)"
 msgid "Add material"
 msgstr "Dodaj materiał"
 
-#: forms/main.py:920
+#: forms/main.py:918
 msgid "Add new items to Anki by typing them in"
 msgstr "Dodaj nowe elementy do Anki"
 
@@ -890,11 +976,11 @@ msgstr "Dodana"
 msgid "Added %(num)d card(s) for '%(str)s'."
 msgstr "Dodano %(num)d kartę(-y) '%(str)s'."
 
-#: forms/deckproperties.py:375 forms/preferences.py:249
+#: forms/deckproperties.py:374 forms/preferences.py:249
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: forms/main.py:875
+#: forms/main.py:873
 msgid "Again"
 msgstr "Znowu"
 
@@ -910,7 +996,7 @@ msgstr "Wszystkie powtórki"
 msgid "Allow the answer to be blank"
 msgstr "Pozwól na pustą odpowiedź"
 
-#: ui/main.py:1522
+#: ui/main.py:1521
 msgid "Already cramming. Please close this deck first."
 msgstr "Jesteś już w trybie sprawdzianu. Musisz zamknąć tę talię."
 
@@ -964,11 +1050,7 @@ 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"
 
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
 #: ui/deckproperties.py:182 ui/main.py:2312 forms/main.py:869
-=======
-#: ui/deckproperties.py:182 ui/main.py:2313 forms/main.py:871
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
 #: forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
@@ -1002,7 +1084,7 @@ msgstr "Czcionka odpowiedzi"
 msgid "Answer size"
 msgstr "Rozmiar odpowiedzi"
 
-#: forms/main.py:959
+#: forms/main.py:957
 msgid "Apply the 'marked' tag to this fact, so you find it later in the browser"
 msgstr "Dodaj do tego faktu etykietę 'zaznaczony', żeby potem można było go łatwiej odnaleźć w przeglądarce"
 
@@ -1037,15 +1119,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: forms/main.py:922
+#: forms/main.py:920
 msgid "Brows&e Items..."
 msgstr "Prze&glądaj elementy..."
 
-#: forms/cardlist.py:236
+#: forms/cardlist.py:234
 msgid "Browse Items"
 msgstr "Przeglądarka elementów"
 
-#: forms/main.py:923
+#: forms/main.py:921
 msgid "Browse and edit all items"
 msgstr "Przeglądaj i edytuj wszystkie elementy"
 
@@ -1065,15 +1147,15 @@ msgstr "Czcionka przeglądarki"
 msgid "Building Index..."
 msgstr "Budowanie indeksu..."
 
-#: ui/main.py:1420
+#: ui/main.py:1419
 msgid "Bury"
 msgstr "Zakop"
 
-#: forms/main.py:982
+#: forms/main.py:980
 msgid "C&ram..."
 msgstr "&Sprawdzian..."
 
-#: forms/main.py:1000
+#: forms/main.py:998
 msgid "Cache LaTeX"
 msgstr "Przechowuj LaTeX w pamięci podręcznej"
 
@@ -1089,7 +1171,7 @@ msgstr "Można działać tylko na jednym modelu jednocześnie."
 msgid "Can't look up a selection with a newline."
 msgstr "Nie można wyszukiwać tekstu ze znakiem nowej linii"
 
-#: ui/main.py:2328
+#: ui/main.py:2327
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1119,15 +1201,6 @@ msgstr "Karty"
 msgid "Cards are waiting"
 msgstr "Są karty do przejrzenia"
 
-#: ui/main.py:1107
-#, fuzzy
-msgid "Cards/day:"
-msgstr "Karty"
-
-#: ui/main.py:1106
-msgid "Cards/session:"
-msgstr ""
-
 #: ui/importing.py:201
 msgid "Change"
 msgstr "Zmień"
@@ -1137,7 +1210,7 @@ msgstr "Zmień"
 msgid "Change %s to:"
 msgstr "Zmień %s na:"
 
-#: forms/cardlist.py:266
+#: forms/cardlist.py:264
 msgid "Change &Model..."
 msgstr "Zmień &model..."
 
@@ -1145,11 +1218,11 @@ msgstr "Zmień &model..."
 msgid "Change Model"
 msgstr "Zmiana modelu"
 
-#: forms/main.py:976
+#: forms/main.py:974
 msgid "Check Database..."
 msgstr "Sprawdź bazę danych..."
 
-#: forms/main.py:980
+#: forms/main.py:978
 msgid "Check Media Database..."
 msgstr "Sprawdź bazę plików..."
 
@@ -1157,11 +1230,11 @@ msgstr "Sprawdź bazę plików..."
 msgid "Check complete."
 msgstr "Zakończono sprawdzanie."
 
-#: forms/main.py:977
+#: forms/main.py:975
 msgid "Check the database for errors"
 msgstr "Przeszukaj bazę danych w poszukiwaniu błędów"
 
-#: forms/main.py:981
+#: forms/main.py:979
 msgid "Check the files in the media directory"
 msgstr "Sprawdź pliki w katalogu plików"
 
@@ -1181,7 +1254,7 @@ msgstr "Zmień kolor (F7, następnie F5)"
 msgid "Choose file to export to"
 msgstr "Wybierz plik, do którego ma nastąpić eksport"
 
-#: forms/main.py:991
+#: forms/main.py:989
 msgid "Choose the categories to show during review"
 msgstr "Wybierz kategorie wyświetlane podczas powtórki"
 
@@ -1210,11 +1283,11 @@ msgstr "Luki (F9)"
 msgid "Compare with field '%s'"
 msgstr "Porównaj z polem '%s'"
 
-#: forms/main.py:926
+#: forms/main.py:924
 msgid "Configure interface language and options"
 msgstr "Konfiguracja języka interfejsu i opcji"
 
-#: forms/main.py:1005
+#: forms/main.py:1003
 msgid "Configure review options"
 msgstr "Konfiguruj opcje powtórki"
 
@@ -1222,11 +1295,11 @@ msgstr "Konfiguruj opcje powtórki"
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: ui/main.py:1167
+#: ui/main.py:1166
 msgid "Continue &Reviewing"
 msgstr "&Kontynuuj powtórkę"
 
-#: forms/main.py:882
+#: forms/main.py:880
 msgid "Continue Reviewing"
 msgstr "Kontynuuj powtórkę"
 
@@ -1255,7 +1328,7 @@ msgstr "Poprawne w ciągu miesiąca: "
 msgid "Couldn't play sound. Please install mplayer."
 msgstr "Nie można odtworzyć dźwięku. Zainstaluj mplayer."
 
-#: ui/main.py:1543
+#: ui/main.py:1542
 msgid "Cram"
 msgstr "Sprawdzian"
 
@@ -1272,23 +1345,23 @@ msgstr "Tworzenie '%s' na serwerze"
 msgid "Created"
 msgstr "Utworzona"
 
-#: forms/main.py:929
+#: forms/main.py:927
 msgid "Ctrl+1"
 msgstr "Ctrl+1"
 
-#: forms/main.py:931
+#: forms/main.py:929
 msgid "Ctrl+2"
 msgstr "Ctrl+2"
 
-#: forms/main.py:933
+#: forms/main.py:931
 msgid "Ctrl+3"
 msgstr "Ctrl+3"
 
-#: forms/main.py:935
+#: forms/main.py:933
 msgid "Ctrl+4"
 msgstr "Ctrl+4"
 
-#: forms/main.py:937
+#: forms/main.py:935
 msgid "Ctrl+5"
 msgstr "Ctrl+5"
 
@@ -1297,19 +1370,19 @@ msgstr "Ctrl+5"
 msgid "Ctrl+Alt+%d"
 msgstr "Ctrl+Alt+%d"
 
-#: forms/main.py:921
+#: forms/main.py:919
 msgid "Ctrl+D"
 msgstr "Ctrl+D"
 
-#: forms/cardlist.py:243 forms/main.py:998
+#: forms/cardlist.py:241 forms/main.py:996
 msgid "Ctrl+Del"
 msgstr "Ctrl+Del"
 
-#: forms/main.py:994
+#: forms/main.py:992
 msgid "Ctrl+E"
 msgstr "Ctrl+E"
 
-#: forms/cardlist.py:263
+#: forms/cardlist.py:261
 msgid "Ctrl+End"
 msgstr "Ctrl+End"
 
@@ -1317,7 +1390,7 @@ msgstr "Ctrl+End"
 msgid "Ctrl+Enter"
 msgstr "Ctrl+Enter"
 
-#: forms/cardlist.py:253 forms/main.py:924
+#: forms/cardlist.py:251 forms/main.py:922
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
@@ -1325,27 +1398,27 @@ msgstr "Ctrl+F"
 msgid "Ctrl+F9"
 msgstr "Ctrl+F9"
 
-#: forms/cardlist.py:261
+#: forms/cardlist.py:259
 msgid "Ctrl+Home"
 msgstr "Ctrl+Home"
 
-#: forms/main.py:960
+#: forms/main.py:958
 msgid "Ctrl+M"
 msgstr "Ctrl+M"
 
-#: forms/cardlist.py:257 forms/main.py:908
+#: forms/cardlist.py:255 forms/main.py:906
 msgid "Ctrl+N"
 msgstr "Ctrl+N"
 
-#: forms/main.py:910
+#: forms/main.py:908
 msgid "Ctrl+O"
 msgstr "Ctrl+O"
 
-#: forms/cardlist.py:259 forms/main.py:927
+#: forms/cardlist.py:257 forms/main.py:925
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
-#: forms/main.py:906
+#: forms/main.py:904
 msgid "Ctrl+Q"
 msgstr "Ctrl+Q"
 
@@ -1353,31 +1426,31 @@ msgstr "Ctrl+Q"
 msgid "Ctrl+Return"
 msgstr "Ctrl+Return"
 
-#: forms/main.py:915
+#: forms/main.py:913
 msgid "Ctrl+S"
 msgstr "Ctrl+S"
 
-#: forms/main.py:1020
+#: forms/main.py:1018
 msgid "Ctrl+Shift+B"
 msgstr "Ctrl+Shift+B"
 
-#: forms/cardlist.py:255
+#: forms/cardlist.py:253
 msgid "Ctrl+Shift+F"
 msgstr "Ctrl+Shift+F"
 
-#: forms/main.py:963
+#: forms/main.py:961
 msgid "Ctrl+Shift+S"
 msgstr "Ctrl+Shift+S"
 
-#: forms/main.py:912
+#: forms/main.py:910
 msgid "Ctrl+W"
 msgstr "Ctrl+W"
 
-#: forms/main.py:918
+#: forms/main.py:916
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"
 
-#: forms/main.py:972
+#: forms/main.py:970
 msgid "Ctrl+Z"
 msgstr "Ctrl+Z"
 
@@ -1409,11 +1482,11 @@ msgstr "Ctrl+u"
 msgid "Cumulative"
 msgstr "Skumulowane"
 
-#: forms/main.py:964
+#: forms/main.py:962
 msgid "Current &Model..."
 msgstr "Aktualny &model..."
 
-#: forms/cardlist.py:237
+#: forms/cardlist.py:235
 msgid "Current Card"
 msgstr "Aktualna karta"
 
@@ -1421,15 +1494,15 @@ msgstr "Aktualna karta"
 msgid "Customize Models"
 msgstr "Zmień modele"
 
-#: forms/main.py:965
+#: forms/main.py:963
 msgid "Customize card layout, fields, etc"
 msgstr "Ustawianie układu kart, pól itp."
 
-#: forms/main.py:956
+#: forms/main.py:954
 msgid "Customize fonts, colours and alignment"
 msgstr "Ustawianie czcionki, kolorów i układu"
 
-#: forms/main.py:948
+#: forms/main.py:946
 msgid "Customize syncing, scheduling, priorities and models"
 msgstr "Ustawianie synchronizacji, planowania, priorytetów i modeli"
 
@@ -1437,7 +1510,7 @@ msgstr "Ustawianie synchronizacji, planowania, priorytetów i modeli"
 msgid "Czech"
 msgstr "Czeski"
 
-#: ui/main.py:2309
+#: ui/main.py:2308
 #, python-format
 msgid ""
 "Database optimized.\n"
@@ -1450,7 +1523,7 @@ msgstr ""
 msgid "Deck Graphs"
 msgstr "Wykresy talii"
 
-#: ui/deckproperties.py:205 forms/deckproperties.py:326
+#: ui/deckproperties.py:205 forms/deckproperties.py:328
 msgid "Deck Properties"
 msgstr "Właściwości talii"
 
@@ -1462,7 +1535,7 @@ msgstr "Pliki talii (*.anki)"
 msgid "Deck is already open."
 msgstr "Talia jest już otwarta."
 
-#: ui/main.py:1410 forms/cardlist.py:242
+#: ui/main.py:1409 forms/cardlist.py:240
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1470,7 +1543,7 @@ msgstr "Usuń"
 msgid "Delete Cards"
 msgstr "Usuń karty"
 
-#: ui/main.py:2326
+#: ui/main.py:2325
 msgid "Delete Refs"
 msgstr "Usuń odwołania"
 
@@ -1478,7 +1551,7 @@ msgstr "Usuń odwołania"
 msgid "Delete Tags"
 msgstr "Usuń etykiety"
 
-#: forms/main.py:997
+#: forms/main.py:995
 msgid "Delete the currently displayed card"
 msgstr "Usuń aktualnie wyświetlaną kartę"
 
@@ -1498,11 +1571,11 @@ msgstr "Odrzuć pole"
 msgid "Display"
 msgstr "Wygląd"
 
-#: forms/main.py:983
+#: forms/main.py:981
 msgid "Do an extra review of specified cards before a test"
 msgstr "Wykonaj dodatkowy sprawdzian wybranych kart przed testem"
 
-#: forms/main.py:941
+#: forms/main.py:939
 msgid "Documentation"
 msgstr "Dokumentacja"
 
@@ -1522,15 +1595,15 @@ msgstr "Pobierz udostępnioną talię"
 msgid "Download Shared Plugin"
 msgstr "Pobieranie udostępnionego dodatku"
 
-#: forms/main.py:1015
+#: forms/main.py:1013
 msgid "Download a deck that people have shared publicly"
 msgstr "Pobierz talię, którą inni udostępnili publicznie"
 
-#: forms/main.py:1013
+#: forms/main.py:1011
 msgid "Download a deck that you synced from another computer"
 msgstr "Pobierz talię synchronizowaną przez ciebie z innego komputera"
 
-#: forms/main.py:1017
+#: forms/main.py:1015
 msgid "Download a plugin to add new features or change Anki's behaviour"
 msgstr "Pobierz dodatek, by dodać nowe funkcje lub zmienić zachowanie Anki"
 
@@ -1542,7 +1615,7 @@ msgstr "Transfery"
 msgid "Due"
 msgstr "Pojawienie się"
 
-#: forms/main.py:905
+#: forms/main.py:903
 msgid "E&xit"
 msgstr "Zakoń&cz"
 
@@ -1559,7 +1632,7 @@ msgstr "Łatwość"
 msgid "Eases"
 msgstr "Łatwość"
 
-#: forms/main.py:881
+#: forms/main.py:879
 msgid "Easy"
 msgstr "Łatwa"
 
@@ -1567,11 +1640,11 @@ msgstr "Łatwa"
 msgid "Edit"
 msgstr "Edycja"
 
-#: forms/main.py:992
+#: forms/main.py:990
 msgid "Edit &Current..."
 msgstr "Edytuj &wyświetlany..."
 
-#: forms/main.py:993
+#: forms/main.py:991
 msgid "Edit the currently displayed item"
 msgstr "Edytuj aktualnie wyświetlany element"
 
@@ -1599,7 +1672,7 @@ msgstr "Wpisz etykiety do usunięcia:"
 msgid "Estonian"
 msgstr "Estoński"
 
-#: forms/main.py:953
+#: forms/main.py:951
 msgid "Expor&t..."
 msgstr "&Eksport..."
 
@@ -1611,11 +1684,11 @@ msgstr "Eksport"
 msgid "Export..."
 msgstr "Eksport..."
 
-#: forms/cardlist.py:254
+#: forms/cardlist.py:252
 msgid "F&act"
 msgstr "F&akt"
 
-#: forms/cardlist.py:260
+#: forms/cardlist.py:258
 msgid "F&irst Card"
 msgstr "P&ierwsza karta"
 
@@ -1631,7 +1704,7 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:250 forms/main.py:970
+#: ui/facteditor.py:250 forms/main.py:968
 msgid "F5"
 msgstr "F5"
 
@@ -1663,7 +1736,7 @@ msgstr "Utworzenie faktu"
 msgid "Facts"
 msgstr "Fakty"
 
-#: ui/main.py:1836
+#: ui/main.py:1835
 msgid "Failed to upload media. Please run 'check media db'."
 msgstr "Nie udało się przesłać pliku. Uruchom sprawdzanie bazy plików."
 
@@ -1699,7 +1772,7 @@ msgstr "Odwzorowanie pól"
 msgid "Fields"
 msgstr "Pola"
 
-#: forms/cardlist.py:268
+#: forms/cardlist.py:266
 msgid "Find and Re&place..."
 msgstr "Znajdź i za&mień..."
 
@@ -1715,7 +1788,7 @@ msgstr "Fiński"
 msgid "First Answered"
 msgstr "Rozwiązywane po raz pierwszy"
 
-#: forms/cardlist.py:270
+#: forms/cardlist.py:268
 msgid "Font..."
 msgstr "Czcionki..."
 
@@ -1743,15 +1816,15 @@ msgstr "Generowanie kart..."
 msgid "German"
 msgstr "Niemiecki"
 
-#: forms/share.py:70
+#: forms/share.py:73
 msgid "Get Shared Decks/Plugins"
 msgstr "Pobieranie udostępnionych talii i dodatków"
 
-#: forms/main.py:1009
+#: forms/main.py:1007
 msgid "Get Shared..."
 msgstr "Pobierz udostępniony..."
 
-#: forms/main.py:879
+#: forms/main.py:877
 msgid "Good"
 msgstr "Dobra"
 
@@ -1763,11 +1836,11 @@ msgstr "Edytor HTML"
 msgid "HTML Editor (Ctrl+F9)"
 msgstr "Edytor HTML (Ctrl+F9)"
 
-#: forms/main.py:877
+#: forms/main.py:875
 msgid "Hard"
 msgstr "Trudna"
 
-#: ui/addcards.py:77 forms/displayproperties.py:374 forms/main.py:891
+#: ui/addcards.py:77 forms/displayproperties.py:374 forms/main.py:889
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1792,7 +1865,7 @@ msgstr "Grafiki (*.jpg *.png *.gif *.tiff *.svg *.tif *.jpeg)"
 msgid "Import"
 msgstr "Import"
 
-#: forms/main.py:950
+#: forms/main.py:948
 msgid "Import cards from text files, Anki files and more"
 msgstr "Importuj karty z plików tekstowych, plików Anki i innych"
 
@@ -1866,11 +1939,11 @@ 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/main.py:1544
+#: ui/main.py:1543
 msgid "Loading deck..."
 msgstr "Ładowanie talii..."
 
-#: ui/main.py:1361
+#: ui/main.py:1360
 msgid "Loading graphs (may take time)..."
 msgstr "Ładowanie wykresów (może to chwilę potrwać)..."
 
@@ -1895,8 +1968,8 @@ msgstr "Odwzorowanie na etykiety"
 msgid "Marked"
 msgstr "Zaznaczone"
 
-#: forms/deckproperties.py:359 forms/deckproperties.py:360
-#: forms/deckproperties.py:362 forms/reschedule.py:84
+#: forms/deckproperties.py:358 forms/deckproperties.py:359
+#: forms/deckproperties.py:361 forms/reschedule.py:84
 msgid "Max"
 msgstr "Maks."
 
@@ -1905,8 +1978,8 @@ msgstr "Maks."
 msgid "Merge with '%s' on server"
 msgstr "Łączenie z '%s' na serwerze"
 
-#: forms/deckproperties.py:355 forms/deckproperties.py:356
-#: forms/deckproperties.py:361 forms/reschedule.py:82
+#: forms/deckproperties.py:354 forms/deckproperties.py:355
+#: forms/deckproperties.py:360 forms/reschedule.py:82
 msgid "Min"
 msgstr "Min."
 
@@ -1918,7 +1991,7 @@ msgstr "Model"
 msgid "Model Properties"
 msgstr "Właściwości modelu"
 
-#: forms/deckproperties.py:337
+#: forms/deckproperties.py:339
 msgid "Models && Priorities"
 msgstr "Modele i priorytety"
 
@@ -1930,7 +2003,7 @@ msgstr "Zmodyfikowana"
 msgid "Mongolian"
 msgstr "Mongolski"
 
-#: forms/main.py:890
+#: forms/main.py:888
 msgid "More"
 msgstr "Więcej"
 
@@ -1962,20 +2035,10 @@ msgstr "Przesuń wybrane pole wyżej"
 msgid "Name"
 msgstr "Nazwa"
 
-#: forms/deckproperties.py:351
+#: forms/deckproperties.py:350
 msgid "Name on server: "
 msgstr "Nazwa na serwerze:"
 
-#: ui/main.py:1110
-#, fuzzy
-msgid "New today:"
-msgstr "Powtórki dzisiaj"
-
-#: ui/main.py:1111
-#, fuzzy
-msgid "New total:"
-msgstr "Powtórki dzisiaj"
-
 #: ui/facteditor.py:202
 msgid "Next colour (F7 then F8)"
 msgstr "Następny kolor (F7, następnie F8)"
@@ -1984,7 +2047,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:1537 ui/main.py:1573
+#: ui/main.py:1536 ui/main.py:1572
 msgid "No cards matched the provided tags."
 msgstr "Żadne karty nie pasują do podanych etykiet."
 
@@ -1996,11 +2059,11 @@ msgstr "Nie ma kart do podglądu."
 msgid "No changes found."
 msgstr "Nie znaleziono zmian."
 
-#: ui/main.py:1353
+#: ui/main.py:1352
 msgid "No current card or last card."
 msgstr "Brak aktualnej karty lub ostatnia karta."
 
-#: ui/main.py:1289
+#: ui/main.py:1288
 msgid "No expression in current card."
 msgstr "Brak wyrażenia w aktualnej karcie."
 
@@ -2008,7 +2071,7 @@ msgstr "Brak wyrażenia w aktualnej karcie."
 msgid "No fact tags"
 msgstr "Bez etykiet faktu"
 
-#: ui/main.py:1296
+#: ui/main.py:1295
 msgid "No meaning in current card."
 msgstr "Brak znaczenia w aktualnej karcie."
 
@@ -2020,7 +2083,7 @@ msgstr "Nic"
 msgid "Nothing selected."
 msgstr "Nic nie wybrano."
 
-#: forms/main.py:897
+#: forms/main.py:895
 msgid "Open &Recent"
 msgstr "Otwórz o&statnio używany"
 
@@ -2028,11 +2091,11 @@ msgstr "Otwórz o&statnio używany"
 msgid "Open Local Deck"
 msgstr "Otwórz talię z dysku"
 
-#: forms/main.py:957
+#: forms/main.py:955
 msgid "Open Sa&mple..."
 msgstr "Otwórz &przykładowe..."
 
-#: forms/main.py:1010
+#: forms/main.py:1008
 msgid "Open a pre-made deck or plugin"
 msgstr "Otwórz przygotowaną talię lub dodatek"
 
@@ -2040,19 +2103,19 @@ msgstr "Otwórz przygotowaną talię lub dodatek"
 msgid "Open deck"
 msgstr "Otwórz talię"
 
-#: forms/main.py:943
+#: forms/main.py:941
 msgid "Open the bug tracker"
 msgstr "Otwórz zgłaszanie błędów"
 
-#: forms/main.py:978
+#: forms/main.py:976
 msgid "Optimize Database"
 msgstr "Optymalizacja bazy danych"
 
-#: ui/main.py:1217
+#: ui/main.py:1216
 msgid "Ordering..."
 msgstr "Sortowanie..."
 
-#: forms/main.py:903
+#: forms/main.py:901
 msgid "P&lugins"
 msgstr "&Dodatki"
 
@@ -2072,11 +2135,11 @@ msgstr "Hasło:"
 msgid "Performance"
 msgstr "Forma"
 
-#: forms/main.py:1012
+#: forms/main.py:1010
 msgid "Personal Deck"
 msgstr "Własną talię"
 
-#: forms/main.py:969
+#: forms/main.py:967
 msgid "Play the last-played audio again"
 msgstr "Odtwórz ponownie ostatni plik audio"
 
@@ -2097,14 +2160,8 @@ msgid "Please double-check your username/password."
 msgstr "Sprawdź ponownie swoją nazwę użytkownika/hasło."
 
 #: ui/modelproperties.py:410
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
 msgid "Please enable a different template first."
 msgstr "Włącz najpierw inny szabon."
-=======
-#, fuzzy
-msgid "Please enable a different template first."
-msgstr "Włącz najpierw inny model."
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
 
 #: ui/cardlist.py:782
 msgid "Please enter a valid start and end range."
@@ -2118,11 +2175,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:1379
+#: ui/main.py:1378
 msgid "Please install python-matplotlib to access graphs."
 msgstr "Zainstaluj python-mathplotlib, aby mieć dostęp do wykresów."
 
-#: ui/main.py:2286
+#: ui/main.py:2285
 msgid "Please restart Anki before checking the DB."
 msgstr "Uruchom ponownie Anki przed sprawdzaniem bazy danych."
 
@@ -2134,7 +2191,7 @@ msgstr "Pobrano dodatek. Zrestartuj Anki."
 msgid "Polish"
 msgstr "Polski"
 
-#: forms/main.py:1001
+#: forms/main.py:999
 msgid "Pre-generate PNG images of LaTeX cards"
 msgstr "Wygeneruj wcześniej obrazki PNG dla kart Latexa"
 
@@ -2170,7 +2227,7 @@ msgstr "Podgląd kart"
 msgid "Previous colour (F7 then F6)"
 msgstr "Poprzednie kolory (F7, następnie F6)"
 
-#: ui/main.py:2301
+#: ui/main.py:2300
 #, python-format
 msgid ""
 "Problems found:\n"
@@ -2207,15 +2264,15 @@ msgstr "Czcionka pytania"
 msgid "Question size"
 msgstr "Rozmiar pytania"
 
-#: ui/main.py:1223 ui/main.py:1563
+#: ui/main.py:1222 ui/main.py:1562
 msgid "Randomizing..."
 msgstr "Losowanie..."
 
-#: forms/main.py:893
+#: forms/main.py:891
 msgid "Re&view Early"
 msgstr "&Wczesna powtórka"
 
-#: forms/main.py:1008
+#: forms/main.py:1006
 msgid "Record 10 seconds of silence so that the record function can cancel noise"
 msgstr "Nagraj 10 sekund ciszy, żeby funkcja nagrywania mogła usunąć szum"
 
@@ -2228,7 +2285,7 @@ msgstr "Nagraj dźwięk (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Nagrywanie...<br>Czas: %0.1f"
 
-#: ui/cardlist.py:520 ui/main.py:2033
+#: ui/cardlist.py:520 ui/main.py:2032
 #, python-format
 msgid "Redo %s"
 msgstr "Powtórz %s"
@@ -2237,7 +2294,7 @@ msgstr "Powtórz %s"
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: forms/main.py:984
+#: forms/main.py:982
 msgid "Release Notes..."
 msgstr "Informacje o wydaniu..."
 
@@ -2249,23 +2306,23 @@ msgstr "Pozostałe karty"
 msgid "Remaining: "
 msgstr "Pozostało: "
 
-#: forms/main.py:1003
+#: forms/main.py:1001
 msgid "Remove generated PNG images of LaTeX cards"
 msgstr "Usuń pliki PNG wygenerowane z kart Latexa"
 
-#: forms/main.py:979
+#: forms/main.py:977
 msgid "Remove unused space, making the database file smaller"
 msgstr "Usuń niewykorzystane miejsce, zmniejszając plik z bazą danych"
 
-#: forms/main.py:967
+#: forms/main.py:965
 msgid "Repeat &Answer Audio"
 msgstr "Powtórz &nagranie odpowiedzi"
 
-#: forms/main.py:968
+#: forms/main.py:966
 msgid "Repeat &Audio"
 msgstr "Powtórz &nagranie"
 
-#: forms/main.py:966
+#: forms/main.py:964
 msgid "Repeat &Question Audio"
 msgstr "Powtórz nagranie &pytania"
 
@@ -2289,11 +2346,11 @@ msgstr "Przyporządkuj jako nowe karty"
 msgid "Reschedule with initial interval in range:"
 msgstr "Przyporządkuj z początkową przerwą w zakresie:"
 
-#: forms/cardlist.py:264
+#: forms/cardlist.py:262
 msgid "Reverse &Order"
 msgstr "Od&wróć porządek"
 
-#: forms/main.py:889
+#: forms/main.py:887
 msgid "Review"
 msgstr "Powtórka"
 
@@ -2301,16 +2358,11 @@ msgstr "Powtórka"
 msgid "Review Time"
 msgstr "Czas powtórki"
 
-#: ui/main.py:1109
-#, fuzzy
-msgid "Reviews due:"
-msgstr "Powtórki dzisiaj"
-
 #: ui/status.py:216
 msgid "Reviews today"
 msgstr "Powtórki dzisiaj"
 
-#: forms/main.py:916
+#: forms/main.py:914
 msgid "S&ync"
 msgstr "S&ynchronizacja"
 
@@ -2323,7 +2375,7 @@ msgstr "Próbkowanie ciszy...<br>Czas: %0.1f"
 msgid "Save && Sync"
 msgstr "Zapis i synchronizacja"
 
-#: forms/main.py:974
+#: forms/main.py:972
 msgid "Save &As..."
 msgstr "Zapisz &jako..."
 
@@ -2339,15 +2391,15 @@ msgstr "Zapis po dodaniu"
 msgid "Save after answering"
 msgstr "Zapis po odpowiedzi na"
 
-#: forms/main.py:954
+#: forms/main.py:952
 msgid "Save cards in a new deck or text file for sharing with others"
 msgstr "Zapisz karty w nowej talii lub pliku tekstowym, by udostępnić go innym"
 
-#: forms/main.py:914
+#: forms/main.py:912
 msgid "Save this deck now"
 msgstr "Zapisz teraz talię"
 
-#: forms/main.py:975
+#: forms/main.py:973
 msgid "Save this deck, giving it a new name"
 msgstr "Zapisz tę talię, nadając jej nową nazwę"
 
@@ -2355,15 +2407,15 @@ msgstr "Zapisz tę talię, nadając jej nową nazwę"
 msgid "Save when closing"
 msgstr "Zapis przy zamykaniu"
 
-#: forms/getshared.py:82 forms/share.py:71
+#: forms/getshared.py:85 forms/share.py:74
 msgid "Search:"
 msgstr "Znajdź:"
 
-#: forms/cardlist.py:248
+#: forms/cardlist.py:246
 msgid "Select &All"
 msgstr "Zaznacz &wszystko"
 
-#: forms/cardlist.py:267
+#: forms/cardlist.py:265
 msgid "Select &Facts"
 msgstr "Zaznacz &fakty"
 
@@ -2379,24 +2431,19 @@ msgstr "Wyczyść zaznaczenie"
 msgid "Select tags to suspend. Deselect to unsuspend."
 msgstr "Wybierz etykiety do zawieszenia. Usuń zaznaczenie by usunąć zawieszenie."
 
-#: ui/main.py:1137
-#, fuzzy
-msgid "Session Statistics"
-msgstr "Statystyki &talii"
-
 #: ui/facteditor.py:168
 msgid "Set colour (F7 then F7)"
 msgstr "Ustaw kolor (F7, następnie F7)"
 
-#: forms/main.py:1011
+#: forms/main.py:1009
 msgid "Share..."
 msgstr "Udostępnij..."
 
-#: forms/main.py:1014
+#: forms/main.py:1012
 msgid "Shared Deck"
 msgstr "Udostępnioną talię"
 
-#: forms/main.py:1016
+#: forms/main.py:1014
 msgid "Shared Plugin"
 msgstr "Udostępniony dodatek"
 
@@ -2408,7 +2455,7 @@ msgstr "Shift+Alt+e"
 msgid "Shift+Alt+m"
 msgstr "Shift+Alt+m"
 
-#: forms/main.py:873
+#: forms/main.py:871
 msgid "Show Answer"
 msgstr "Pokaż odpowiedź"
 
@@ -2424,7 +2471,7 @@ msgstr "Pokaż separator między pytaniem a odpowiedzią"
 msgid "Show due count and progress during review"
 msgstr "Pokaż podczas powtórki liczbę czekających i postęp"
 
-#: forms/main.py:952
+#: forms/main.py:950
 msgid "Show graphical statistics about your deck"
 msgstr "Pokaż graficzne statystyki twojej talii"
 
@@ -2436,11 +2483,11 @@ msgstr "Pokazuj przy odpowiedzi czas kolejnego pojawienia się "
 msgid "Show preview"
 msgstr "Pokaż podgląd"
 
-#: forms/main.py:940
+#: forms/main.py:938
 msgid "Show some textual statistics about your deck"
 msgstr "Pokaż tekstowe statystyki twojej talii"
 
-#: forms/main.py:946
+#: forms/main.py:944
 msgid "Show statistics about the current card and last card"
 msgstr "Pokaż statystyki aktualnej karty i ostatniej karty"
 
@@ -2448,11 +2495,11 @@ msgstr "Pokaż statystyki aktualnej karty i ostatniej karty"
 msgid "Show study options on deck load"
 msgstr "Pokaż opcje nauki przy załadowaniu talii"
 
-#: forms/main.py:872
+#: forms/main.py:870
 msgid "Show the answer (shortcut key: space or enter)"
 msgstr "Pokaż odpowiedź (skrót: spacja lub enter)"
 
-#: forms/main.py:874
+#: forms/main.py:872
 msgid "Show this card again soon (shortcut key: 1)"
 msgstr "Pokaż tę kartę wkrótce (skrót: 1)"
 
@@ -2496,7 +2543,7 @@ msgstr "ID źródła:"
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ui/main.py:1169
+#: ui/main.py:1168
 msgid "Start &Reviewing"
 msgstr "&Zacznij powtórkę"
 
@@ -2504,7 +2551,7 @@ msgstr "&Zacznij powtórkę"
 msgid "Start adding your own material."
 msgstr "Zacznij dodawanie swojego materiału."
 
-#: forms/main.py:904
+#: forms/main.py:902
 msgid "Startup"
 msgstr "Przy starcie"
 
@@ -2512,15 +2559,15 @@ msgstr "Przy starcie"
 msgid "Status"
 msgstr "Stan"
 
-#: forms/main.py:962
+#: forms/main.py:960
 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:1396
+#: ui/main.py:1395
 msgid "Suspend"
 msgstr "Zawieś"
 
-#: forms/main.py:1019
+#: forms/main.py:1017
 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"
 
@@ -2544,19 +2591,19 @@ msgstr "Synchronizuj przy zamykaniu"
 msgid "Sync on open"
 msgstr "Synchronizuj przy otwieraniu"
 
-#: forms/deckproperties.py:353
+#: forms/deckproperties.py:352
 msgid "Synchronisation"
 msgstr "Synchronizacja"
 
-#: forms/deckproperties.py:340
+#: forms/deckproperties.py:342
 msgid "Synchronize this deck"
 msgstr "Synchronizuj tę talię"
 
-#: forms/main.py:917
+#: forms/main.py:915
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synchronizuj tę talię z Anki Online"
 
-#: ui/main.py:1814 ui/main.py:1816
+#: ui/main.py:1813 ui/main.py:1815
 msgid "Syncing Media..."
 msgstr "Synchronizacja plików"
 
@@ -2565,7 +2612,7 @@ msgstr "Synchronizacja plików"
 msgid "Syncing failed: %(a)s"
 msgstr "Synchronizacja nie powiodła się: %(a)s"
 
-#: ui/main.py:2324
+#: ui/main.py:2323
 msgid "Tag Cards"
 msgstr "Nadaj etykietę"
 
@@ -2577,7 +2624,7 @@ msgstr "Nadaj etykiety faktom ze zduplikowanymi polami zamiast usuwać je"
 msgid "Tags"
 msgstr "Etykiety"
 
-#: ui/main.py:1527
+#: ui/main.py:1526
 msgid "Tags to cram:"
 msgstr "Etykiety wykorzystane w sprawdzianie:"
 
@@ -2593,11 +2640,11 @@ msgstr "Szablony"
 msgid "TextLabel"
 msgstr "TextLabel"
 
-#: forms/main.py:883
+#: forms/main.py:881
 msgid "The <b>number of minutes in a session</b>. When a session is finished, this screen will be shown again, allowing you to start another session. Choose 0 for no limit."
 msgstr "Liczba <b>minut na sesję</b>. Kiedy sesja zakończy się, ten ekran będzie pokazany ponownie, pozwalając ci na rozpoczęcie kolejnej sesji. Wpisz 0, by znieść limit."
 
-#: forms/main.py:887
+#: forms/main.py:885
 msgid "The <b>number of questions in a session</b>. When a session is finished, this screen will be shown again, allowing you to start another session. Choose 0 for no limit."
 msgstr "Liczba <b>pytań w trakcie sesji</b>. Kiedy sesja zakończy się, ten ekran będzie pokazany ponownie, pozwalając ci na rozpoczęcie kolejnej sesji. Wpisz 0, by znieść limit."
 
@@ -2609,30 +2656,10 @@ msgstr ""
 "Wprowadzone przez ciebie dane spowodowałyby, że\n"
 "pytania lub odpowiedzi byłyby wszędzie puste."
 
-#: forms/main.py:885
+#: forms/main.py:883
 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:1144
-msgid "The number of cards that are waiting to be reviewed today"
-msgstr ""
-
-#: ui/main.py:1138
-msgid "The number of cards you studied in the current session (blue) and previous session (black)"
-msgstr ""
-
-#: ui/main.py:1140
-msgid "The number of cards you studied today (blue) and yesterday (black)"
-msgstr ""
-
-#: ui/main.py:1142
-msgid "The number of minutes you studied today (blue) and yesterday (black)"
-msgstr ""
-
-#: ui/main.py:1146
-msgid "The number of new cards that are waiting to be learnt today"
-msgstr ""
-
 #: ui/sync.py:54
 msgid "The sync protocol has changed. Please upgrade."
 msgstr "Zmienił się protokół synchronizacji. Zaktualizuj Anki."
@@ -2650,10 +2677,6 @@ msgstr ""
 "generalnie być między 80 a 95% - gdy jest poniżej, zapominasz zbyt<br>\n"
 "często stare karty, gdy jest powyżej - zbyt dużo czasu poświęcasz powtórkom."
 
-#: ui/main.py:1148
-msgid "The total number of new cards in the deck"
-msgstr ""
-
 #: ui/status.py:187
 #, python-format
 msgid "There is <b>%d</b> card awaiting review."
@@ -2742,7 +2765,7 @@ msgstr ""
 "%s\n"
 "Musisz najpierw usunąć źródło."
 
-#: ui/main.py:2288
+#: ui/main.py:2287
 msgid ""
 "This operation will find and fix some common problems.<br>\n"
 "<br>\n"
@@ -2760,7 +2783,7 @@ msgstr ""
 "<b>Tej operacji nie można cofnąć.</b><br>\n"
 "Kontynuować?"
 
-#: ui/main.py:2315
+#: ui/main.py:2314
 msgid ""
 "This operation:<br>\n"
 " - deletes files not referenced by cards<br>\n"
@@ -2781,11 +2804,7 @@ msgstr ""
 "Pomyśl o wykonaniu wcześniej kopii katalogu z plikami."
 
 #: ui/modelproperties.py:389
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
 #, python-format
-=======
-#, fuzzy, python-format
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
 msgid ""
 "This template is used by %d cards. If you delete it,\n"
 "all the cards will be deleted too. If you just\n"
@@ -2795,33 +2814,19 @@ msgid ""
 "\n"
 "Really delete these cards?"
 msgstr ""
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
 "Ten szablon jest używany przez %d kart. Jeśli go\n"
 "usuniesz, wszystkie te karty zostaną również\n"
 "usunięte. Jeśli chcesz jedynie zapobiec tworzeniu\n"
 "nowych kart w tym szablonie, użyj przycisku\n"
-=======
-"Ten model jest używany przez %d kart. Jeśli go\n"
-"usuniesz, wszystkie te karty zostaną również\n"
-"usunięte. Jeśli chcesz jedynie zapobiec tworzeniu\n"
-"nowych kart w tym modelu, użyj przycisku\n"
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
 "'wyłącz'.\n"
 "\n"
 "Na pewno chcesz usunąć te karty?"
 
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
-=======
-#: ui/main.py:1108
-msgid "Time/day:"
-msgstr ""
-
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
 #: ui/getshared.py:147 ui/getshared.py:151
 msgid "Title"
 msgstr "Tytuł"
 
-#: ui/main.py:1371
+#: ui/main.py:1370
 msgid ""
 "To display graphs, Anki needs a .dll file which\n"
 "you don't have. Please install:\n"
@@ -2833,7 +2838,7 @@ msgstr ""
 msgid "Today's reviews are finished"
 msgstr "Zakończono dzisiejsze powtórki"
 
-#: ui/main.py:1267
+#: ui/main.py:1266
 msgid "Toggle Toolbar"
 msgstr "Pokaż/ukryj pasek narzędzi"
 
@@ -2857,7 +2862,7 @@ msgstr "Traktuj wejście jako wyrażenie regularne"
 msgid "Type in the answer and hit enter"
 msgstr "Wpisz odpowiedź i wciśnij enter"
 
-#: forms/share.py:72
+#: forms/share.py:75
 msgid "Type:"
 msgstr "Typ:"
 
@@ -2914,7 +2919,7 @@ msgstr ""
 msgid "Unable to recover. Deck load failed."
 msgstr "Nie można przeprowadzić odzyskiwania. Nie powiodło się ładowanie talii."
 
-#: forms/main.py:1002
+#: forms/main.py:1000
 msgid "Uncache LaTeX"
 msgstr "Nie przechowuj LaTeXa"
 
@@ -2922,7 +2927,7 @@ msgstr "Nie przechowuj LaTeXa"
 msgid "Underline text (Ctrl+u)"
 msgstr "Tekst podkreślony (Ctrl+u)"
 
-#: ui/cardlist.py:514 ui/main.py:2027
+#: ui/cardlist.py:514 ui/main.py:2026
 #, python-format
 msgid "Undo %s"
 msgstr "Cofnij %s"
@@ -2936,7 +2941,7 @@ msgstr "Nieznany błąd: %s"
 msgid "Update complete. Please restart Anki."
 msgstr "Aktualizacja zakończona. Zrestartuj Anki."
 
-#: ui/main.py:2067
+#: ui/main.py:2066
 msgid ""
 "Updating Anki...\n"
 " - you can keep studying\n"
@@ -2966,15 +2971,15 @@ msgstr "Nazwa użytkownika"
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: forms/main.py:876
+#: forms/main.py:874
 msgid "Wait a little longer next time (shortcut key: 2)"
 msgstr "Następnym razem poczekaj nieco dłużej (skrót: 2)"
 
-#: forms/main.py:880
+#: forms/main.py:878
 msgid "Wait a lot longer next time (shortcut key: 4)"
 msgstr "Następnym razem poczekaj o wiele dłużej (skrót: 4)"
 
-#: forms/main.py:878
+#: forms/main.py:876
 msgid "Wait longer next time (shortcut key: 3)"
 msgstr "Następnym razem poczekaj dłużej (skrót: 3)"
 
@@ -2991,11 +2996,11 @@ msgstr "Brawo! Ta karta pojawi się ponownie za <b>%(next)s</b>."
 msgid "Would you like to download it now?"
 msgstr "Czy chcesz ściągnąć ją teraz?"
 
-#: ui/main.py:1442 ui/main.py:1490
+#: ui/main.py:1441 ui/main.py:1489
 msgid "You are currently cramming. Please close this deck first."
 msgstr "Jesteś już w trybie sprawdzianu. Musisz zamknąć tę talię."
 
-#: ui/main.py:2058
+#: ui/main.py:2057
 #, python-format
 msgid ""
 "Your computer clock is not set to the correct time.\n"
@@ -3006,7 +3011,7 @@ msgstr ""
 "%(type)s %(sec)d sekund.\n"
 "Upewnij się, że jest ustawiony poprawnie i uruchom Anki ponownie."
 
-#: ui/main.py:1797
+#: ui/main.py:1796
 #, python-format
 msgid ""
 "Your computer clock is not set to the correct time.\n"
@@ -3021,7 +3026,7 @@ msgstr ""
 "Since this can cause many problems with syncing,\n"
 "syncing is disabled until you fix the problem."
 
-#: ui/main.py:1376
+#: ui/main.py:1375
 msgid ""
 "Your version of Matplotlib is broken.\n"
 "Please see http://ichi2.net/anki/wiki/MatplotlibBroken"
@@ -3029,7 +3034,7 @@ msgstr ""
 "Twoja wersja Matplotlib jest uszkodzona.\n"
 "Zobacz http://ichi2.net/anki/wiki/MatplotlibBroken"
 
-#: forms/main.py:989
+#: forms/main.py:987
 msgid "a"
 msgstr " "
 
@@ -3037,12 +3042,12 @@ msgstr " "
 msgid "cards"
 msgstr "kart"
 
-#: forms/deckproperties.py:369 forms/deckproperties.py:370
-#: forms/deckproperties.py:371 forms/reschedule.py:83 forms/reschedule.py:85
+#: forms/deckproperties.py:368 forms/deckproperties.py:369
+#: forms/deckproperties.py:370 forms/reschedule.py:83 forms/reschedule.py:85
 msgid "days"
 msgstr "dni"
 
-#: ui/main.py:2056
+#: ui/main.py:2055
 msgid "early"
 msgstr "Spieszy o"
 
@@ -3055,11 +3060,11 @@ msgstr "faktów"
 msgid "in %s"
 msgstr "w %s"
 
-#: forms/deckproperties.py:338
+#: forms/deckproperties.py:340
 msgid "label"
 msgstr "napis"
 
-#: ui/main.py:2054
+#: ui/main.py:2053
 msgid "late"
 msgstr "Spóźnia się"
 
@@ -3072,11 +3077,11 @@ msgstr "odwzorowane na <b>%s</b>"
 msgid "mapped to <b>Tags</b>"
 msgstr "odwzorowane na <b>etykiety</b>"
 
-#: forms/deckproperties.py:367 forms/deckproperties.py:368
+#: forms/deckproperties.py:366 forms/deckproperties.py:367
 msgid "mins"
 msgstr "min."
 
-#: forms/deckproperties.py:352
+#: forms/deckproperties.py:351
 msgid "option"
 msgstr "opcja"
 
@@ -3084,107 +3089,5 @@ msgstr "opcja"
 msgid "toplabel"
 msgstr "toplabel"
 
-<<<<<<< HEAD:ankiqt/locale/ankiqt_pl_PL.po
 #~ msgid "Please add a new card first."
 #~ msgstr "Dodaj najpierw nową kartę."
-=======
-#~ msgid ""
-#~ "<h1>Session Statistics</h1>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Cards/session</b></dt>\n"
-#~ "<dd>The number of cards you studied in the current session (blue) and previous\n"
-#~ "session (black)</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Cards/day</b></dt>\n"
-#~ "<dd>The number of cards you studied today (blue) and yesterday (black)</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Time/day</b></dt>\n"
-#~ "<dd>The number of minutes you studied today (blue) and yesterday (black)</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Reviews due</b></dt>\n"
-#~ "<dd>The number of cards that are waiting to be reviewed today</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>New today</b></dt>\n"
-#~ "<dd>The number of new cards that are waiting to be learnt today</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>New total</b></dt>\n"
-#~ "<dd>The total number of new cards in the deck</dd>\n"
-#~ "</dl>"
-#~ msgstr ""
-#~ "<h1>Statystyki sesji</h1>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Kart na sesję</b></dt>\n"
-#~ "<dd>Liczba kart powtarzanych w aktualnej (na niebiesko) i poprzedniej sesji (na czarno)</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Kart dziennie</b></dt>\n"
-#~ "<dd>Liczba kart powtarzanych dzisiaj (na niebiesko) i wczoraj (na czarno)</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Czas dziennie</b></dt>\n"
-#~ "<dd>Liczba minut w trakcie powtórki dzisiaj (na niebiesko) i wczoraj (na czarno)</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Do przeglądnięcia</b></dt>\n"
-#~ "<dd>Liczba kart będących dzisiaj do przeglądnięcia</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Nowe dzisiaj</b></dt>\n"
-#~ "<dd>Liczba nowych kart oczekujących dzisiaj</dd>\n"
-#~ "</dl>\n"
-#~ "<dl>\n"
-#~ "<dt><b>Nowych ogólnie</b></dt>\n"
-#~ "<dd>Ogólna liczba nowych kart w talii</dd>\n"
-#~ "</dl>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<table>\n"
-#~ "<tr><td width=100>%(rd_header)s</td><td align=right><b>%(ret)s</b></td></tr>\n"
-#~ "<tr><td>%(ntod_header)s</td><td align=right><b>%(new)s</b></td></tr>\n"
-#~ "<tr><td>%(ntot_header)s</td><td align=right>%(newof)s</td></tr>\n"
-#~ "</table>"
-#~ msgstr ""
-#~ "<table>\n"
-#~ "<tr><td width=100>Do przeglądnięcia:</td><td align=right><b>%(ret)s</b></td></tr>\n"
-#~ "<tr><td>Nowe dzisiaj:</td><td align=right><b>%(new)s</b></td></tr>\n"
-#~ "<tr><td>Nowych ogólnie:</td><td align=right>%(newof)s</td></tr>\n"
-#~ "</table>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<table>\n"
-#~ "<tr><td width=80>%(cs_header)s</td><td width=50><b>%(repsInSesChg)s</b></td>\n"
-#~ "<td><b>%(repsInSes)s</b></td></tr>\n"
-#~ " <tr><td>%(cd_header)s</td><td><b>%(repsTodayChg)s</b></td>\n"
-#~ "<td><b>%(repsToday)s</b></td></tr>\n"
-#~ "<tr><td>%(td_header)s</td><td><b>%(timeTodayChg)s</b></td>\n"
-#~ "<td><b>%(timeToday)s</b></td></tr>\n"
-#~ "</table>"
-#~ msgstr ""
-#~ "<table>\n"
-#~ "<tr><td width=80>Kart na sesję:</td><td width=50><b>%(repsInSesChg)s</b></td>\n"
-#~ "<td>%(repsInSes)s</td></tr>\n"
-#~ "<tr><td>Kart dziennie:</td><td><b>%(repsTodayChg)s</b></td>\n"
-#~ "<td>%(repsToday)s</td></tr>\n"
-#~ "<tr><td>Czas dziennie:</td><td><b>%(timeTodayChg)s</b></td>\n"
-#~ "<td>%(timeToday)s</td></tr>\n"
-#~ "</table>"
-
-#, fuzzy
-#~ msgid "Cards/day"
-#~ msgstr "Karty"
-
-#, fuzzy
-#~ msgid "Please choose a field to sort by."
-#~ msgstr "Dodaj najpierw nowe pole."
-
-#, fuzzy
-#~ msgid "Reviews due"
-#~ msgstr "Powtórki dzisiaj"
->>>>>>> 09df5d7bac44d3654f0ee4a70f4fd3dfb7e45173:ankiqt/locale/ankiqt_pl_PL.po
diff --git a/ankiqt/locale/ankiqt_pt_BR.po b/ankiqt/locale/ankiqt_pt_BR.po
index d19b11b1b..cab226ca6 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2095,14 +2095,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Por favor adicione um novo card primeiro"
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Por favor adicione um novo campo primeiro."
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "Por favor adicione um novo campo primeiro."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Por favor adicione outro modelo primeiro."
@@ -3361,6 +3362,9 @@ msgstr ""
 #~ msgid "Open On&line..."
 #~ msgstr "Abrir On&line..."
 
+#~ 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"
 
diff --git a/ankiqt/locale/ankiqt_sv_SE.po b/ankiqt/locale/ankiqt_sv_SE.po
index 5a8eb08c8..47a706ca4 100644
--- a/ankiqt/locale/ankiqt_sv_SE.po
+++ b/ankiqt/locale/ankiqt_sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ankiqt 0.9.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 11:35+0200\n"
-"PO-Revision-Date: 2009-04-30 11:34+0100\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
+"PO-Revision-Date: 2009-05-01 00:41+0100\n"
 "Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -124,8 +124,12 @@ msgid_plural "%(name)s [%(facts)d facts]"
 msgstr[0] "%(name)s [%(facts)d faktauppgift]"
 msgstr[1] "%(name)s [%(facts)d faktauppgifter]"
 
-#: ui/status.py:218 ui/status.py:220 ui/status.py:225 ui/status.py:229
-#: ui/status.py:231 ui/status.py:233
+#: ui/status.py:218
+#: ui/status.py:220
+#: ui/status.py:225
+#: ui/status.py:229
+#: ui/status.py:231
+#: ui/status.py:233
 #, python-format
 msgid "%(partOf)d of %(totalSum)d"
 msgstr "%(partOf)d av %(totalSum)d"
@@ -160,7 +164,8 @@ msgstr "&Om..."
 msgid "&Actions"
 msgstr "&Åtgärder"
 
-#: forms/deckproperties.py:334 forms/modelproperties.py:291
+#: forms/deckproperties.py:334
+#: forms/modelproperties.py:291
 #: forms/modelproperties.py:304
 msgid "&Add"
 msgstr "&Lägg till"
@@ -179,7 +184,7 @@ msgstr "&Lägg till etikett..."
 
 #: forms/main.py:1018
 msgid "&Bury Fact"
-msgstr "&Begrav faktauppgift"
+msgstr "B&egrav faktauppgift"
 
 #: forms/main.py:945
 msgid "&Card Statistics"
@@ -201,7 +206,8 @@ msgstr "&Kortleksegenskaper..."
 msgid "&Deck Statistics"
 msgstr "Kort&leksstatistik"
 
-#: forms/deckproperties.py:336 forms/modelproperties.py:294
+#: forms/deckproperties.py:336
+#: forms/modelproperties.py:294
 #: forms/modelproperties.py:309
 msgid "&Delete"
 msgstr "&Ta bort"
@@ -234,7 +240,9 @@ msgstr "&Donera..."
 msgid "&Download..."
 msgstr "&Hämta..."
 
-#: forms/cardlist.py:238 forms/deckproperties.py:335 forms/main.py:895
+#: forms/cardlist.py:238
+#: forms/deckproperties.py:335
+#: forms/main.py:895
 msgid "&Edit"
 msgstr "&Redigera"
 
@@ -278,7 +286,8 @@ msgstr "&Grafer..."
 msgid "&Guide..."
 msgstr "&Manual..."
 
-#: forms/cardlist.py:241 forms/main.py:894
+#: forms/cardlist.py:241
+#: forms/main.py:894
 msgid "&Help"
 msgstr "&Hjälp"
 
@@ -300,7 +309,7 @@ msgstr "&Kanjistatistik"
 
 #: forms/cardlist.py:262
 msgid "&Last Card"
-msgstr "&Sista kort"
+msgstr "S&ista kort"
 
 #: forms/main.py:892
 msgid "&Learn More"
@@ -342,7 +351,8 @@ msgstr "&Föregående kort"
 msgid "&Record Noise Profile..."
 msgstr "&Spela in brusprofil"
 
-#: forms/cardlist.py:250 forms/main.py:995
+#: forms/cardlist.py:250
+#: forms/main.py:995
 msgid "&Redo"
 msgstr "&Gör om"
 
@@ -374,7 +384,8 @@ msgstr "&Åsidosätt faktauppgift"
 msgid "&Tools"
 msgstr "&Verktyg"
 
-#: forms/cardlist.py:249 forms/main.py:971
+#: forms/cardlist.py:249
+#: forms/main.py:971
 msgid "&Undo"
 msgstr "Å&ngra"
 
@@ -539,7 +550,8 @@ msgstr "<b>Minsta tillåtna tidsintervall</b>"
 msgid "<b>Model</b>:"
 msgstr "<b>Modell</b>:"
 
-#: forms/modelproperties.py:286 forms/modelproperties.py:299
+#: forms/modelproperties.py:286
+#: forms/modelproperties.py:299
 #: forms/modelproperties.py:312
 msgid "<b>Name</b>"
 msgstr "<b>Namn</b>"
@@ -560,7 +572,8 @@ msgstr "<b>Ny dag börjar kl. </b>"
 msgid "<b>Old Model</b>:"
 msgstr "<b>Gammal modell</b>:"
 
-#: forms/modelproperties.py:297 forms/modelproperties.py:310
+#: forms/modelproperties.py:297
+#: forms/modelproperties.py:310
 msgid "<b>Options</b>"
 msgstr "<b>Alternativ</b>"
 
@@ -818,7 +831,8 @@ msgstr "Aktiva etiketter"
 msgid "Ad&vanced"
 msgstr "Ava&ncerat"
 
-#: ui/addcards.py:62 ui/addcards.py:116
+#: ui/addcards.py:62
+#: ui/addcards.py:116
 msgid "Add"
 msgstr "Lägg till"
 
@@ -884,7 +898,8 @@ msgstr "Tillagt"
 msgid "Added %(num)d card(s) for '%(str)s'."
 msgstr "La till  %(num)d kort för '%(str)s'."
 
-#: forms/deckproperties.py:375 forms/preferences.py:249
+#: forms/deckproperties.py:375
+#: forms/preferences.py:249
 msgid "Advanced"
 msgstr "Avancerat"
 
@@ -958,7 +973,9 @@ msgstr ""
 "Om detta inte löser problemet, kopiera följande text<br>\n"
 "till en felrapport:<br><br>\n"
 
-#: ui/deckproperties.py:182 ui/main.py:2313 forms/main.py:871
+#: ui/deckproperties.py:182
+#: ui/main.py:2313
+#: forms/main.py:871
 #: forms/syncdeck.py:42
 msgid "Anki"
 msgstr "Anki"
@@ -972,7 +989,8 @@ msgstr ""
 "Anki kunde inte spara din konfigurationsfil:\n"
 "%s"
 
-#: ui/cardlist.py:48 ui/cardlist.py:415
+#: ui/cardlist.py:48
+#: ui/cardlist.py:415
 msgid "Answer"
 msgstr "Svar"
 
@@ -1000,7 +1018,8 @@ msgstr "Sätt etiketten 'markerad' på denna faktauppgift så att du kan hitta d
 msgid "Applying reply..."
 msgstr "Tillämpar svar..."
 
-#: ui/status.py:221 ui/status.py:226
+#: ui/status.py:221
+#: ui/status.py:226
 msgid "Average time per answer: "
 msgstr "Genomsnittstid per svar: "
 
@@ -1070,7 +1089,8 @@ msgstr "Läs in Latex i cachen"
 msgid "Can only change one model at a time."
 msgstr "Du kan bara ändra en modell åt gången."
 
-#: ui/cardlist.py:800 ui/cardlist.py:938
+#: ui/cardlist.py:800
+#: ui/cardlist.py:938
 msgid "Can only operate on one model at a time."
 msgstr "Kan enbart arbeta med en modell åt gången."
 
@@ -1087,7 +1107,8 @@ msgstr "Avbryt"
 msgid "Card %(num)d (%(name)s): used %(cards)d times%(status)s"
 msgstr "Kort %(num)d (%(name)s): använt %(cards)d gånger %(status)s"
 
-#: ui/modelproperties.py:335 ui/modelproperties.py:368
+#: ui/modelproperties.py:335
+#: ui/modelproperties.py:368
 #, python-format
 msgid "Card %d"
 msgstr "Kort  %d"
@@ -1129,7 +1150,8 @@ msgstr "Ändra %s till:"
 msgid "Change &Model..."
 msgstr "Byt &modell..."
 
-#: ui/cardlist.py:851 forms/changemodel.py:74
+#: ui/cardlist.py:851
+#: forms/changemodel.py:74
 msgid "Change Model"
 msgstr "Byt modell"
 
@@ -1181,7 +1203,8 @@ msgstr "Klicka för att dölja Anki"
 msgid "Click to show Anki"
 msgstr "Klicka för att visa Anki"
 
-#: ui/addcards.py:73 forms/displayproperties.py:376
+#: ui/addcards.py:73
+#: forms/displayproperties.py:376
 msgid "Close"
 msgstr "Stäng"
 
@@ -1227,7 +1250,8 @@ msgstr "Kopiera: %s"
 msgid "Correct first time: "
 msgstr "Rätta första gången: "
 
-#: ui/status.py:219 ui/status.py:224
+#: ui/status.py:219
+#: ui/status.py:224
 msgid "Correct over a month: "
 msgstr "Rätta äldre än en månad:"
 
@@ -1256,7 +1280,8 @@ msgstr "Råplugga valda kort i en ny kortlek?"
 msgid "Create '%s' on server"
 msgstr "Skapa '%s' på server"
 
-#: ui/cardlist.py:229 ui/cardlist.py:416
+#: ui/cardlist.py:229
+#: ui/cardlist.py:416
 msgid "Created"
 msgstr "Skapad"
 
@@ -1289,7 +1314,8 @@ msgstr "Ctrl+Alt+%d"
 msgid "Ctrl+D"
 msgstr "Ctrl+D"
 
-#: forms/cardlist.py:243 forms/main.py:998
+#: forms/cardlist.py:243
+#: forms/main.py:998
 msgid "Ctrl+Del"
 msgstr "Ctrl+Del"
 
@@ -1305,7 +1331,8 @@ msgstr "Ctrl+End"
 msgid "Ctrl+Enter"
 msgstr "Ctrl+Enter"
 
-#: forms/cardlist.py:253 forms/main.py:924
+#: forms/cardlist.py:253
+#: forms/main.py:924
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
@@ -1321,7 +1348,8 @@ msgstr "Ctrl+Home"
 msgid "Ctrl+M"
 msgstr "Ctrl+M"
 
-#: forms/cardlist.py:257 forms/main.py:908
+#: forms/cardlist.py:257
+#: forms/main.py:908
 msgid "Ctrl+N"
 msgstr "Ctrl+N"
 
@@ -1329,7 +1357,8 @@ msgstr "Ctrl+N"
 msgid "Ctrl+O"
 msgstr "Ctrl+O"
 
-#: forms/cardlist.py:259 forms/main.py:927
+#: forms/cardlist.py:259
+#: forms/main.py:927
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -1438,11 +1467,13 @@ msgstr ""
 msgid "Deck Graphs"
 msgstr "Kortleksdiagram"
 
-#: ui/deckproperties.py:205 forms/deckproperties.py:326
+#: ui/deckproperties.py:205
+#: forms/deckproperties.py:326
 msgid "Deck Properties"
 msgstr "Kortleksegenskaper"
 
-#: ui/main.py:839 ui/main.py:898
+#: ui/main.py:839
+#: ui/main.py:898
 msgid "Deck files (*.anki)"
 msgstr "Kortleksfiler (*.anki)"
 
@@ -1450,7 +1481,8 @@ msgstr "Kortleksfiler (*.anki)"
 msgid "Deck is already open."
 msgstr "Kortleken är redan öppen."
 
-#: ui/main.py:1410 forms/cardlist.py:242
+#: ui/main.py:1410
+#: forms/cardlist.py:242
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1502,7 +1534,8 @@ msgstr "Begär inte att jag skall skriva in svaret"
 msgid "Download Personal Deck"
 msgstr "Hämta personlig kortlek"
 
-#: ui/getshared.py:36 ui/view.py:301
+#: ui/getshared.py:36
+#: ui/view.py:301
 msgid "Download Shared Deck"
 msgstr "Hämta delad kortlek"
 
@@ -1522,11 +1555,15 @@ msgstr "Hämta hem en kortlek som du har synkroniserat från en annan dator"
 msgid "Download a plugin to add new features or change Anki's behaviour"
 msgstr "Hämta hem en insticksmodul för att utöka eller ändra Ankis funktionalitet"
 
-#: ui/getshared.py:147 ui/getshared.py:151
+#: ui/getshared.py:147
+#: ui/getshared.py:151
 msgid "Downloads"
 msgstr "Hämtningar"
 
-#: ui/cardlist.py:49 ui/cardlist.py:239 ui/cardlist.py:418 ui/graphs.py:148
+#: ui/cardlist.py:49
+#: ui/cardlist.py:239
+#: ui/cardlist.py:418
+#: ui/graphs.py:148
 msgid "Due"
 msgstr "Tidsfrist slut"
 
@@ -1539,7 +1576,8 @@ msgstr "&Avsluta"
 msgid "ETA: <b>%(timeLeft)s</b>"
 msgstr "Nedräkning:<b>%(timeLeft)s</b>"
 
-#: ui/cardlist.py:237 ui/cardlist.py:421
+#: ui/cardlist.py:237
+#: ui/cardlist.py:421
 msgid "Ease"
 msgstr "Inlärningsgrad"
 
@@ -1619,7 +1657,8 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ui/facteditor.py:250 forms/main.py:970
+#: ui/facteditor.py:250
+#: forms/main.py:970
 msgid "F5"
 msgstr "F5"
 
@@ -1669,7 +1708,8 @@ msgstr "Fält %(num)d: %(name)s"
 msgid "Field %(num)d: %(name)s [%(cards)s non-empty]"
 msgstr "Fält %(num)d: %(name)s [%(cards)s inte tomma]"
 
-#: ui/modelproperties.py:133 ui/modelproperties.py:151
+#: ui/modelproperties.py:133
+#: ui/modelproperties.py:151
 #, python-format
 msgid "Field %d"
 msgstr "Fält %d"
@@ -1683,7 +1723,8 @@ msgstr "Fält <b>%d</b> i fil är:"
 msgid "Field mapping"
 msgstr "Fälthopparning"
 
-#: forms/changemodel.py:79 forms/displayproperties.py:373
+#: forms/changemodel.py:79
+#: forms/displayproperties.py:373
 msgid "Fields"
 msgstr "Fält"
 
@@ -1691,7 +1732,8 @@ msgstr "Fält"
 msgid "Find and Re&place..."
 msgstr "Sök och &ersätt"
 
-#: ui/cardlist.py:951 forms/findreplace.py:60
+#: ui/cardlist.py:951
+#: forms/findreplace.py:60
 msgid "Find and Replace"
 msgstr "Sök och ersätt"
 
@@ -1719,7 +1761,8 @@ msgstr "Franska"
 msgid "General && Fields"
 msgstr "Allmänt && Fält"
 
-#: ui/cardlist.py:810 forms/addcardmodels.py:34
+#: ui/cardlist.py:810
+#: forms/addcardmodels.py:34
 msgid "Generate Cards"
 msgstr "Skapa kort"
 
@@ -1755,7 +1798,9 @@ msgstr "HTML-redigerare (Ctrl+F9)"
 msgid "Hard"
 msgstr "Svår"
 
-#: ui/addcards.py:77 forms/displayproperties.py:374 forms/main.py:891
+#: ui/addcards.py:77
+#: forms/displayproperties.py:374
+#: forms/main.py:891
 msgid "Help"
 msgstr "Hjälp"
 
@@ -1775,7 +1820,9 @@ 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:78 ui/importing.py:118 forms/changemap.py:39
+#: ui/importing.py:78
+#: ui/importing.py:118
+#: forms/changemap.py:39
 #: forms/importing.py:95
 msgid "Import"
 msgstr "Importera"
@@ -1814,7 +1861,9 @@ msgstr "Inkludera schemaläggningsinformation"
 msgid "Include tags"
 msgstr "Inkludera etiketter"
 
-#: ui/cardlist.py:233 ui/cardlist.py:419 ui/graphs.py:150
+#: ui/cardlist.py:233
+#: ui/cardlist.py:419
+#: ui/graphs.py:150
 msgid "Interval"
 msgstr "Intervall"
 
@@ -1883,8 +1932,10 @@ msgstr "Para ihop med etiketter"
 msgid "Marked"
 msgstr "Märkt"
 
-#: forms/deckproperties.py:359 forms/deckproperties.py:360
-#: forms/deckproperties.py:362 forms/reschedule.py:84
+#: forms/deckproperties.py:359
+#: forms/deckproperties.py:360
+#: forms/deckproperties.py:362
+#: forms/reschedule.py:84
 msgid "Max"
 msgstr "Max"
 
@@ -1893,8 +1944,10 @@ msgstr "Max"
 msgid "Merge with '%s' on server"
 msgstr "Slå ihop med '%s' på server"
 
-#: forms/deckproperties.py:355 forms/deckproperties.py:356
-#: forms/deckproperties.py:361 forms/reschedule.py:82
+#: forms/deckproperties.py:355
+#: forms/deckproperties.py:356
+#: forms/deckproperties.py:361
+#: forms/reschedule.py:82
 msgid "Min"
 msgstr "Min"
 
@@ -1902,7 +1955,8 @@ msgstr "Min"
 msgid "Model"
 msgstr "Modell"
 
-#: ui/modelproperties.py:35 forms/modelproperties.py:284
+#: ui/modelproperties.py:35
+#: forms/modelproperties.py:284
 msgid "Model Properties"
 msgstr "Modellegenskaper"
 
@@ -1910,7 +1964,8 @@ msgstr "Modellegenskaper"
 msgid "Models && Priorities"
 msgstr "Modeller && Prioriteter"
 
-#: ui/cardlist.py:231 ui/cardlist.py:417
+#: ui/cardlist.py:231
+#: ui/cardlist.py:417
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -1922,11 +1977,13 @@ msgstr "mongoliska"
 msgid "More"
 msgstr "Mer"
 
-#: forms/modelproperties.py:293 forms/modelproperties.py:306
+#: forms/modelproperties.py:293
+#: forms/modelproperties.py:306
 msgid "Move &Up"
 msgstr "Flytta &upp"
 
-#: forms/modelproperties.py:296 forms/modelproperties.py:308
+#: forms/modelproperties.py:296
+#: forms/modelproperties.py:308
 msgid "Move Dow&n"
 msgstr "Fl&ytta ner"
 
@@ -1970,7 +2027,8 @@ 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:1537 ui/main.py:1573
+#: ui/main.py:1537
+#: ui/main.py:1573
 msgid "No cards matched the provided tags."
 msgstr "Inga kort är markerade med angivna etiketter."
 
@@ -2066,14 +2124,14 @@ msgstr "Personlig kortlek"
 msgid "Play the last-played audio again"
 msgstr "Spela upp senaste ljudet igen"
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "Lägg först till ett nytt kort."
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "Lägg först till ett nytt fält."
 
+#: ui/modelproperties.py:382
+msgid "Please add a new template first."
+msgstr "Lägg först till en ny mall."
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "Lägg först till en annan modell."
@@ -2159,7 +2217,9 @@ msgstr ""
 "Hittade problem:\n"
 "%s"
 
-#: ui/graphs.py:253 ui/graphs.py:284 ui/utils.py:223
+#: ui/graphs.py:253
+#: ui/graphs.py:284
+#: ui/utils.py:223
 msgid "Processing..."
 msgstr "Behandlar..."
 
@@ -2167,7 +2227,8 @@ 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:414
+#: ui/cardlist.py:47
+#: ui/cardlist.py:414
 msgid "Question"
 msgstr "Fråga"
 
@@ -2187,7 +2248,8 @@ msgstr "Frågetypsnitt:"
 msgid "Question size"
 msgstr "Frågestorlek"
 
-#: ui/main.py:1223 ui/main.py:1563
+#: ui/main.py:1223
+#: ui/main.py:1563
 msgid "Randomizing..."
 msgstr "Blandar om..."
 
@@ -2208,7 +2270,8 @@ msgstr "Spela in ljud (F5)"
 msgid "Recording...<br>Time: %0.1f"
 msgstr "Spelar in...<br>Tid: %0.1f"
 
-#: ui/cardlist.py:520 ui/main.py:2033
+#: ui/cardlist.py:520
+#: ui/main.py:2033
 #, python-format
 msgid "Redo %s"
 msgstr "Gör om %s"
@@ -2253,11 +2316,14 @@ msgstr "Upprepa &frågeljud"
 msgid "Replacing..."
 msgstr "Ersätter..."
 
-#: ui/cardlist.py:235 ui/cardlist.py:420 ui/graphs.py:154
+#: ui/cardlist.py:235
+#: ui/cardlist.py:420
+#: ui/graphs.py:154
 msgid "Reps"
 msgstr "Upprepningar"
 
-#: ui/cardlist.py:766 forms/reschedule.py:79
+#: ui/cardlist.py:766
+#: forms/reschedule.py:79
 msgid "Reschedule"
 msgstr "Schemalägg igen"
 
@@ -2334,7 +2400,8 @@ msgstr "Spara denna kortlek under ett nytt namn"
 msgid "Save when closing"
 msgstr "Spara ändringar när programmet avslutas"
 
-#: forms/getshared.py:82 forms/share.py:71
+#: forms/getshared.py:82
+#: forms/share.py:71
 msgid "Search:"
 msgstr "Sök:"
 
@@ -2446,11 +2513,13 @@ msgstr "Visa ikon i systembrickan"
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ui/addcards.py:122 ui/cardlist.py:627
+#: ui/addcards.py:122
+#: ui/cardlist.py:627
 msgid "Some fields are missing or not unique."
 msgstr "Några fält saknas eller är inte unika."
 
-#: forms/preferences.py:228 forms/preferences.py:248
+#: forms/preferences.py:228
+#: forms/preferences.py:248
 msgid "Some settings will take effect after you restart Anki."
 msgstr "Vissa inställningar blir aktiva först efter att du startat om Anki."
 
@@ -2534,7 +2603,8 @@ msgstr "Synkronisera denna kortlek"
 msgid "Synchronize this deck with Anki Online"
 msgstr "Synkronisera denna kortlek med Anki Online"
 
-#: ui/main.py:1814 ui/main.py:1816
+#: ui/main.py:1814
+#: ui/main.py:1816
 msgid "Syncing Media..."
 msgstr "Synkroniserar media..."
 
@@ -2567,7 +2637,8 @@ msgstr "Mål måste vara  unika."
 msgid "Templates"
 msgstr "Mallar"
 
-#: forms/changemodel.py:76 forms/share.py:76
+#: forms/changemodel.py:76
+#: forms/share.py:76
 msgid "TextLabel"
 msgstr "TextLabel"
 
@@ -2776,7 +2847,8 @@ msgstr ""
 msgid "Time/day:"
 msgstr "Tid/dag:"
 
-#: ui/getshared.py:147 ui/getshared.py:151
+#: ui/getshared.py:147
+#: ui/getshared.py:151
 msgid "Title"
 msgstr "Titel"
 
@@ -2800,7 +2872,8 @@ msgstr "Visa eller dölj verktygsraden"
 msgid "Total correct: "
 msgstr "Sammanlagt rätt: "
 
-#: ui/status.py:222 ui/status.py:227
+#: ui/status.py:222
+#: ui/status.py:227
 msgid "Total review time: "
 msgstr "Sammanlagd repetitionstid: "
 
@@ -2820,7 +2893,8 @@ msgstr "Skriv in svaret och tryck enter"
 msgid "Type:"
 msgstr "Typ:"
 
-#: ui/getshared.py:68 ui/getshared.py:175
+#: ui/getshared.py:68
+#: ui/getshared.py:175
 msgid "Unable to connect to server."
 msgstr "Kan inte nå servern."
 
@@ -2881,7 +2955,8 @@ msgstr "Ta bort Latex från cachen"
 msgid "Underline text (Ctrl+u)"
 msgstr "Stryk under text (Ctrl+u)"
 
-#: ui/cardlist.py:514 ui/main.py:2027
+#: ui/cardlist.py:514
+#: ui/main.py:2027
 #, python-format
 msgid "Undo %s"
 msgstr "Ångra %s"
@@ -2909,11 +2984,13 @@ msgstr ""
 msgid "Use custom colour"
 msgstr "Använd anpassade färger"
 
-#: forms/displayproperties.py:368 forms/displayproperties.py:372
+#: forms/displayproperties.py:368
+#: forms/displayproperties.py:372
 msgid "Use custom font"
 msgstr "Använd anpassat typsnitt"
 
-#: forms/displayproperties.py:367 forms/displayproperties.py:371
+#: forms/displayproperties.py:367
+#: forms/displayproperties.py:371
 msgid "Use custom size"
 msgstr "Använd anpassad storlek"
 
@@ -2950,7 +3027,8 @@ msgstr "Bra gjort! Detta kort kommer att visas igen om  <b>%(next)s</b>."
 msgid "Would you like to download it now?"
 msgstr "Vill du hämta hem det nu?"
 
-#: ui/main.py:1442 ui/main.py:1490
+#: ui/main.py:1442
+#: ui/main.py:1490
 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."
 
@@ -2996,8 +3074,11 @@ msgstr "a"
 msgid "cards"
 msgstr "kort"
 
-#: forms/deckproperties.py:369 forms/deckproperties.py:370
-#: forms/deckproperties.py:371 forms/reschedule.py:83 forms/reschedule.py:85
+#: forms/deckproperties.py:369
+#: forms/deckproperties.py:370
+#: forms/deckproperties.py:371
+#: forms/reschedule.py:83
+#: forms/reschedule.py:85
 msgid "days"
 msgstr "dagar"
 
@@ -3031,7 +3112,8 @@ msgstr "parades ihop med <b>%s</b>"
 msgid "mapped to <b>Tags</b>"
 msgstr "parade i hop med <b>etiketter</b>"
 
-#: forms/deckproperties.py:367 forms/deckproperties.py:368
+#: forms/deckproperties.py:367
+#: forms/deckproperties.py:368
 msgid "mins"
 msgstr "minuter"
 
@@ -3061,10 +3143,8 @@ msgstr "toppetikett"
 #~ "maximera din minneskapacitet.<p/>Det är fritt och under GPL-licens.<p/>\n"
 #~ "Version %s<br>\n"
 #~ "<a href=\"http://ichi2.net/anki/\">Besök webbplats</a></span>\n"
-
 #~ msgid " (%(dYesTotal)d of %(dTotal)d)</b><br>"
 #~ msgstr " (%(dYesTotal)d av %(dTotal)d)</b><br>"
-
 #~ msgid ""
 #~ "%s.\n"
 #~ "Anki can only merge models if they have exactly\n"
@@ -3073,10 +3153,8 @@ msgstr "toppetikett"
 #~ "%s.\n"
 #~ "Anki kan enbart slå ihop modeller om de har exact\n"
 #~ "samma antal fält och kort."
-
 #~ msgid "&Edit All..."
 #~ msgstr "&Redigera allt..."
-
 #~ msgid "&Get More Decks..."
 #~ msgstr "&Hämta fler kortlekar..."
 
@@ -3091,25 +3169,18 @@ msgstr "toppetikett"
 #, fuzzy
 #~ msgid "(%(gYoungYes)d of %(gYoungTotal)d)<br>"
 #~ msgstr " (%(dYesTotal)d av %(dTotal)d)</b><br>"
-
 #~ msgid "<Select Tag>"
 #~ msgstr "<Välj etikett>"
-
 #~ msgid "<b>File to import</b>:"
 #~ msgstr "<b>Fil att importera</b>:"
-
 #~ msgid "<b>Type of file</b>:"
 #~ msgstr "<b>Filtyp</b>:"
-
 #~ msgid "<h1>Advanced settings</h1>Some settings require a restart."
 #~ msgstr "<h1>Avancerade inställningar</h1>Några inställningar kräver en omstart."
-
 #~ msgid "<h1>Remaining cards</h1><p/>There are <b>%(failed)d</b> failed cards due soon.<br>There are <b>%(rev)d</b> cards awaiting review.<br>There are <b>%(new)d</b> new cards due today.<br><br>There are <b>%(new2)d</b> new cards in total.<br>There are <b>%(spaced)d</b> delayed cards."
 #~ msgstr "<h1>Återstående kort</h1><p/>Det finns <b>%(failed)d</b> felbesvarade kort vars tidsfrist snart är ute.<br>Det finns <b>%(rev)d</b> kort som väntar på att repeteras.<br>Det finns <b>%(new)d</b> nya kort som skall visas i dag.<br><br>Det finns sammanlagt <b>%(new2)d</b> nya kort.<br>Det finns <b>%(spaced)d</b> senarelagda kort."
-
 #~ msgid "<h1>Select tags to suspend</h1>"
 #~ msgstr "<h1>Välj de etiketter du vill åsidosätta</h1>"
-
 #~ msgid ""
 #~ "<h1>Session Statistics</h1>\n"
 #~ "<dl>\n"
@@ -3164,10 +3235,8 @@ msgstr "toppetikett"
 #~ "<dt><b>Nya totalt</b></dt>\n"
 #~ "<dd>Det sammanlagda antalet nya kort i kortleken</dd>\n"
 #~ "</dl>"
-
 #~ msgid "<h1>Welcome Back!</h1>"
 #~ msgstr "<h1>Välkommen tillbaka!</h1>"
-
 #~ msgid ""
 #~ "<h1>Welcome to Anki!</h1>\n"
 #~ "<p>\n"
@@ -3274,7 +3343,6 @@ msgstr "toppetikett"
 #~ "(%(gNewYes)d of %(gNewTotal)d)<br>\n"
 #~ "Sammanlagt rätt: %(gYesTotal%)0.1f%%\n"
 #~ "(%(gYesTotal)d of %(gTotal)d)"
-
 #~ msgid ""
 #~ "<h2>Reviews today</h2>\n"
 #~ "<b>Correct today: %(percTotal)s\n"
@@ -3321,51 +3389,38 @@ msgstr "toppetikett"
 #~ "<tr><td>Tid/dag:</td><td><b>%(timeTodayChg)s</b></td>\n"
 #~ "<td><b>%(timeToday)s</b></td></tr>\n"
 #~ "</table>"
-
 #~ msgid "Application-wide preferences."
 #~ msgstr "Inställningar för hela programmet."
 
 #, fuzzy
 #~ msgid "Cards/day"
 #~ msgstr "Kort"
-
 #~ msgid "Choose &file..."
 #~ msgstr "Välj &fil..."
-
 #~ msgid "Choose file..."
 #~ msgstr "Välj fil..."
-
 #~ msgid ""
 #~ "Click the close button or import another file.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Klicka på stängningsknappen eller importera en fil till.\n"
 #~ "\n"
-
 #~ msgid "Del"
 #~ msgstr "Ta bort"
-
 #~ msgid "Dialog"
 #~ msgstr "Dialog"
-
 #~ msgid "Edit Items"
 #~ msgstr "Redigera poster"
-
 #~ msgid "Export to..."
 #~ msgstr "Exportera till..."
-
 #~ msgid "F6"
 #~ msgstr "F6"
-
 #~ msgid "Find"
 #~ msgstr "Sök"
-
 #~ msgid "Import file"
 #~ msgstr "Importera fil"
-
 #~ msgid "Merge complete."
 #~ msgstr "Sammanslagning klar."
-
 #~ msgid ""
 #~ "No models found to merge. If you want to merge models,\n"
 #~ "all models must have the same name, and must not be\n"
@@ -3374,26 +3429,22 @@ msgstr "toppetikett"
 #~ "Hittade inte några modeller att slå ihop. Om du vill slå ihop\n"
 #~ "modeller måste de alla ha samma namn, och kan inte höra\n"
 #~ "ihop med någon annans kortlek."
-
 #~ msgid "Open On&line..."
 #~ msgstr "Öppna p&å nätet..."
-
+#~ msgid "Please add a new card first."
+#~ msgstr "Lägg först till ett nytt kort."
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "Välj ett fält att sortera efter"
-
 #~ msgid "Replace"
 #~ msgstr "Ersätt"
 
 #, fuzzy
 #~ msgid "Reviews due"
 #~ msgstr "Repetitioner idag"
-
 #~ msgid "Search"
 #~ msgstr "Sök"
-
 #~ msgid "Show information in status bar"
 #~ msgstr "Visa information i statusraden"
-
 #~ msgid ""
 #~ "Syncing failed. Please try again in a few minutes.\n"
 #~ "If the problem persists, please report it on the forum.\n"
@@ -3404,9 +3455,8 @@ msgstr "toppetikett"
 #~ "Om problemet kvarstår, rapportera detta på forumet.\n"
 #~ "\n"
 #~ "Fel: %s"
-
 #~ msgid "Would you like to merge models that have the same name?"
 #~ msgstr "Vill du slå ihop modeller med samma namn?"
-
 #~ msgid "xxx"
 #~ msgstr "xxx"
+
diff --git a/ankiqt/locale/ankiqt_zh_CN.po b/ankiqt/locale/ankiqt_zh_CN.po
index d087b2c75..03985fb7e 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -2070,14 +2070,15 @@ msgstr "私人卡片组"
 msgid "Play the last-played audio again"
 msgstr "再次播放音频"
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "请先加入一张卡片"
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr ""
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "请先加入一张卡片"
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr ""
diff --git a/ankiqt/locale/ankiqt_zh_TW.po b/ankiqt/locale/ankiqt_zh_TW.po
index fe82ce75b..a93ed68c6 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-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\n"
 "PO-Revision-Date: 2009-04-07 15:53+0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2133,14 +2133,15 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr "まず新しいカードを入力してください。"
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr "まず新しいフィールドを作成してください。"
 
+#: ui/modelproperties.py:382
+#, fuzzy
+msgid "Please add a new template first."
+msgstr "まず新しいフィールドを作成してください。"
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr "まずもう一つのモデルを作成してください。"
@@ -4034,6 +4035,9 @@ msgstr ""
 #~ msgid "Percentage of minimum interval"
 #~ msgstr "最小期間のパーセンテージ"
 
+#~ msgid "Please add a new card first."
+#~ msgstr "まず新しいカードを入力してください。"
+
 #~ msgid "Please choose a field to sort by."
 #~ msgstr "フィールドの整列を選んでください。"
 
diff --git a/ankiqt/locale/messages.pot b/ankiqt/locale/messages.pot
index 59913dc04..2dfa7704e 100644
--- a/ankiqt/locale/messages.pot
+++ b/ankiqt/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 11:35+0200\n"
+"POT-Creation-Date: 2009-05-01 00:40+0200\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"
@@ -1991,14 +1991,14 @@ msgstr ""
 msgid "Play the last-played audio again"
 msgstr ""
 
-#: ui/modelproperties.py:382
-msgid "Please add a new card first."
-msgstr ""
-
 #: ui/modelproperties.py:164
 msgid "Please add a new field first."
 msgstr ""
 
+#: ui/modelproperties.py:382
+msgid "Please add a new template first."
+msgstr ""
+
 #: ui/deckproperties.py:143
 msgid "Please add another model first."
 msgstr ""