1 files changed, 3978 insertions, 1646 deletions

diff --git a/po/ru/krecipes.po b/po/ru/krecipes.po
index f7f25c0..3d1d5c8 100644
--- a/po/ru/krecipes.po
+++ b/po/ru/krecipes.po
@@ -2,125 +2,2244 @@
 # Nick Shaforostoff <shafff@ukr.net>, 2004-2005, 2006.
 # Gregory Mokhin <mok@kde.ru>, 2005.
 # TDE3 - krecipes.pot Russian translation.
+#: src/exporters/cookmlexporter.cpp:71
 msgid ""
 msgstr ""
 "Project-Id-Version: krecipes\n"
-"POT-Creation-Date: 2006-09-01 08:44+0200\n"
+"POT-Creation-Date: 2019-01-03 14:08+0100\n"
 "PO-Revision-Date: 2006-07-09 17:47+0300\n"
 "Last-Translator: Nick Shaforostoff <shafff@ukr.net>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. i18n: file ./src/widgets/ratingdisplaywidget.ui line 113
-#: src/dialogs/setupdisplay.cpp:90 rc.cpp:4
-#, fuzzy, no-c-format
-msgid "Rater"
-msgstr "Категория"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Николай Шафоростов"
 
-#. i18n: file ./src/widgets/ratingdisplaywidget.ui line 119
-#: src/dialogs/advancedsearchdialog.cpp:576
-#: src/dialogs/editratingdialog.cpp:102 src/dialogs/editratingdialog.cpp:152
-#: rc.cpp:7
-#, no-c-format
-msgid "Criteria"
-msgstr "Условие отбора"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "shafff@ukr.net"
 
-#. i18n: file ./src/widgets/ratingdisplaywidget.ui line 130
-#: src/dialogs/advancedsearchdialog.cpp:418
-#: src/dialogs/advancedsearchdialog.cpp:577
-#: src/dialogs/editratingdialog.cpp:103 src/dialogs/editratingdialog.cpp:153
-#: rc.cpp:10
-#, no-c-format
-msgid "Stars"
+#: src/backends/MySQL/mysqlrecipedb.cpp:473
+#: src/backends/PostgreSQL/psqlrecipedb.cpp:370
+#: src/backends/SQLite/literecipedb.cpp:752
+msgid "Overall"
+msgstr "Общая"
+
+#: src/backends/MySQL/mysqlrecipedb.cpp:474
+#: src/backends/PostgreSQL/psqlrecipedb.cpp:371
+#: src/backends/SQLite/literecipedb.cpp:753
+msgid "Taste"
+msgstr "Вкус"
+
+#: src/backends/MySQL/mysqlrecipedb.cpp:475
+#: src/backends/PostgreSQL/psqlrecipedb.cpp:372
+#: src/backends/SQLite/literecipedb.cpp:754
+msgid "Appearance"
 msgstr ""
 
-#. i18n: file ./src/widgets/ratingdisplaywidget.ui line 167
-#: rc.cpp:13
-#, no-c-format
-msgid "Comments"
-msgstr "Комментарии"
+#: src/backends/MySQL/mysqlrecipedb.cpp:476
+#: src/backends/PostgreSQL/psqlrecipedb.cpp:373
+#: src/backends/SQLite/literecipedb.cpp:755
+msgid "Originality"
+msgstr "Оригинальность"
 
-#. i18n: file ./src/widgets/ratingdisplaywidget.ui line 214
-#: rc.cpp:20
-#, no-c-format
-msgid "Edit..."
-msgstr "Изменить..."
+#: src/backends/MySQL/mysqlrecipedb.cpp:477
+#: src/backends/PostgreSQL/psqlrecipedb.cpp:374
+#: src/backends/SQLite/literecipedb.cpp:756
+msgid "Ease of Preparation"
+msgstr "Простота приготовления"
 
-#: src/dialogs/dbimportdialog.cpp:39
-msgid "Database Import"
-msgstr "Импорт базы данных"
+#: src/backends/qsqlrecipedb.cpp:65
+msgid "TQSqlRecipeDB: Opening Database..."
+msgstr ""
 
-#: src/dialogs/dbimportdialog.cpp:70 src/pref.cpp:354 src/setupwizard.cpp:553
-msgid "Database file:"
-msgstr "Файл базы данных:"
+#: src/backends/qsqlrecipedb.cpp:83
+msgid ""
+"The TQt database plug-in (%1) is not installed.  This plug-in is required "
+"for using this database backend."
+msgstr ""
 
-#: src/dialogs/dbimportdialog.cpp:152
-msgid "Database"
-msgstr "База данных"
+#: src/backends/qsqlrecipedb.cpp:104
+msgid "Parameters set. Calling db->open()"
+msgstr ""
 
-#: src/dialogs/dbimportdialog.cpp:156 src/pref.cpp:105 src/pref.cpp:232
-#: src/setupwizard.cpp:463
-msgid "Server:"
-msgstr "Сервер:"
+#: src/backends/qsqlrecipedb.cpp:109
+msgid "Failing to open database. Trying to create it"
+msgstr ""
 
-#: src/dialogs/dbimportdialog.cpp:157 src/pref.cpp:118 src/pref.cpp:245
-#: src/setupwizard.cpp:197 src/setupwizard.cpp:305 src/setupwizard.cpp:398
-msgid "Username:"
-msgstr "Имя пользователя:"
+#: src/backends/qsqlrecipedb.cpp:114 src/backends/qsqlrecipedb.cpp:123
+msgid ""
+"Krecipes could not open the database using the driver '%2' (with username: "
+"\"%1\"). You may not have the necessary permissions, or the server may be "
+"down."
+msgstr ""
 
-#: src/dialogs/dbimportdialog.cpp:158 src/pref.cpp:131 src/pref.cpp:258
-#: src/setupwizard.cpp:203 src/setupwizard.cpp:311 src/setupwizard.cpp:418
-msgid "Password:"
-msgstr "Пароль:"
+#: src/backends/qsqlrecipedb.cpp:119
+#, c-format
+msgid "Database message: %1"
+msgstr "Сообщение мя базы данных: %1"
 
-#: src/dialogs/dbimportdialog.cpp:159 src/pref.cpp:160 src/pref.cpp:287
-#: src/setupwizard.cpp:429
-msgid "Database name:"
-msgstr "Имя базы данных:"
+#: src/backends/qsqlrecipedb.cpp:120
+msgid "Failing to open database. Exiting\n"
+msgstr "не удалось открыть базу данных. Выход...\n"
 
-#: src/dialogs/dbimportdialog.cpp:160 src/pref.cpp:145 src/pref.cpp:272
+#: src/backends/qsqlrecipedb.cpp:129
+msgid ""
+"This database was created with a newer version of Krecipes and cannot be "
+"opened."
+msgstr ""
+
+#: src/backends/qsqlrecipedb.cpp:138
+msgid ""
+"Failed to fix database structure.\n"
+"If you are using SQLite, this is often caused by using an SQLite 2 database "
+"with SQLite 3 installed.  If this is the case, make sure both SQLite 2 and 3 "
+"are installed, and then run 'krecipes --convert-sqlite3' to update your "
+"database to the new structure."
+msgstr ""
+
+#: src/backends/qsqlrecipedb.cpp:1754
+msgid "In ingredient '%1': weight [%2/%3%4]"
+msgstr ""
+
+#: src/backends/qsqlrecipedb.cpp:1804
+msgid "In ingredient '%1': property \"%2\" [%3/%4]"
+msgstr ""
+
+#: src/backends/qsqlrecipedb.cpp:1969
+msgid ""
+"<!doc>The database was created with a previous version of Krecipes.  Would "
+"you like Krecipes to update this database to work with this version of "
+"Krecipes?  Depending on the number of recipes and amount of data, this could "
+"take some time.<br><br><b>Warning: After updating, this database will no "
+"longer be compatible with previous versions of Krecipes.<br><br>Cancelling "
+"this operation may result in corrupting the database.</b>"
+msgstr ""
+
+#: src/backends/qsqlrecipedb.cpp:1971
+msgid "Porting database structure..."
+msgstr ""
+
+#: src/backends/qsqlrecipedb.cpp:2041
+msgid "Loading category list"
+msgstr ""
+
+#: src/backends/recipedb.cpp:303
+msgid "Creating complete backup"
+msgstr ""
+
+#: src/backends/recipedb.cpp:304 src/backends/recipedb.cpp:428
+msgid ""
+"Depending on the number of recipes and amount of data, this could take some "
+"time."
+msgstr ""
+
+#: src/backends/recipedb.cpp:308
+msgid ""
+"Unable to find or run the program '%1'.  Either it is not installed on your "
+"system or it is not in $PATH."
+msgstr ""
+
+#: src/backends/recipedb.cpp:343
+msgid "Backup failed."
+msgstr ""
+
+#: src/backends/recipedb.cpp:390
+msgid ""
+"This backup was created with a newer version of Krecipes and cannot be "
+"restored."
+msgstr ""
+
+#: src/backends/recipedb.cpp:400
 #, fuzzy
-msgid "Port:"
-msgstr "Свойство"
+msgid "This file is not a Krecipes backup file or has become corrupt."
+msgstr "\"%1\" в строке %2, столбце %3.  Возможно, это не файл Krecipes."
 
-#: src/dialogs/createcategorydialog.cpp:26
-#: src/dialogs/createcategorydialog.cpp:37
-msgid "New Category"
-msgstr "Создать категорию"
+#: src/backends/recipedb.cpp:405
+msgid ""
+"This backup was created using the \"%1\" backend.  It can only be restored "
+"into a database using this backend."
+msgstr ""
 
-#: src/dialogs/createcategorydialog.cpp:43
-msgid "Subcategory of:"
-msgstr "Подкатегория категории"
+#: src/backends/recipedb.cpp:427
+msgid "Restoring backup"
+msgstr ""
 
-#: src/dialogs/createcategorydialog.cpp:60
-msgid "**NONE**"
-msgstr "**НЕТ**"
+#: src/backends/recipedb.cpp:472 src/krecipes.cpp:527
+msgid "Restore Failed"
+msgstr ""
 
-#: src/dialogs/authorsdialog.cpp:38 src/dialogs/categorieseditordialog.cpp:40
-#: src/dialogs/prepmethodsdialog.cpp:39 src/dialogs/propertiesdialog.cpp:48
-#: src/dialogs/unitsdialog.cpp:49
-msgid "Create ..."
-msgstr "Создать..."
+#: src/backends/recipedb.cpp:808
+msgid "Nutrient Import"
+msgstr "Импорт данных о продуктах"
 
-#: src/dialogs/ingredientsdialog.cpp:105
-msgid "Ingredient list"
-msgstr "Перечень ингредиентов"
+#: src/backends/recipedb.cpp:808
+msgid "Importing USDA nutrient data"
+msgstr "Импорт данных о продуктах USDA"
 
-#: src/dialogs/ingredientsdialog.cpp:148
-msgid "Unit list"
-msgstr "Список единиц"
+#: src/backends/usda_ingredient_data.h:26
+msgid "active baker's yeast"
+msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:149 src/dialogs/ingredientsdialog.cpp:186
-#: src/dialogs/recipeinputdialog.cpp:348 src/dialogs/unitsdialog.cpp:60
-#: src/krecipesview.cpp:322 src/krecipesview.cpp:378 src/pref.cpp:496
-#: src/widgets/propertylistview.cpp:118
-msgid "Units"
-msgstr "Единицы"
+#: src/backends/usda_ingredient_data.h:27
+msgid "all-purpose flour"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:28
+msgid "allspice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:29
+msgid "almond extract"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:30
+msgid "almonds"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:31
+msgid "apple juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:32
+msgid "apple slices"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:33
+msgid "apples"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:34
+msgid "applesauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:35
+msgid "applesauce, unsweetened"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:36
+msgid "apricot jam"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:37
+msgid "bacon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:38
+msgid "baking potato"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:39
+msgid "baking powder"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:40
+msgid "baking soda"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:41
+msgid "bananas"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:42
+msgid "barley"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:43
+msgid "basil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:44
+msgid "bay leaf"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:45
+msgid "bean sprouts"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:46
+msgid "beans, black"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:47
+msgid "beef bottom round"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:48
+msgid "beef bouillon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:49
+msgid "beef broth"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:50
+msgid "beef stock"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:51
+msgid "beef, brisket"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:52
+msgid "beer"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:53
+msgid "bell peppers (red, green, yellow)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:54
+msgid "black pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:55
+msgid "boiling water"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:56
+msgid "bologna"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:57
+msgid "bourbon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:58
+msgid "bran flakes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:59
+msgid "bread"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:60
+msgid "bread crumbs"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:61
+msgid "bread cubes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:62
+msgid "broccoli"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:63
+msgid "broccoli (frozen-thawed)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:64
+msgid "broccoli spears, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:65
+msgid "broccoli, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:66
+msgid "brown rice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:67
+msgid "brown sugar"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:68
+msgid "bulgur"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:69
+msgid "butter"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:70
+msgid "butter (1/2 stick)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:71
+#, fuzzy
+msgid "butter or margarine"
+msgstr "Нижнее поле"
+
+#: src/backends/usda_ingredient_data.h:72
+msgid "buttermilk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:73
+msgid "cabbage"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:74
+msgid "canned apple slices"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:75
+msgid "canned beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:76
+msgid "canned beef"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:77
+msgid "canned black beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:78
+msgid "canned carrot slices"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:79
+msgid "canned cooked squid"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:80
+msgid "canned corn"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:81
+msgid "canned crushed tomatoes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:82
+msgid "canned green beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:83
+msgid "canned green peas"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:84
+msgid "canned jalapeno pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:85
+msgid "canned kidney beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:86
+msgid "canned pinto beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:87
+msgid "canned potato"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:88
+msgid "canned red pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:89
+msgid "canned red tart cherries in water"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:90
+msgid "canned sweet potatoes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:91
+msgid "canned tomatoes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:92
+msgid "canned wax beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:93
+msgid "canned white beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:94
+msgid "canned whole kernel corn"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:95
+msgid "carrot"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:96
+msgid "carrot slices, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:97
+msgid "carrots"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:98
+msgid "carrots, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:99
+msgid "carrots, peeled and chopped"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:100
+msgid "catsup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:101
+msgid "cauliflower, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:102
+msgid "cayenne"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:103
+msgid "celery"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:104
+msgid "celery leaf"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:105
+msgid "celery salt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:106
+msgid "celery seed"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:107
+msgid "cheddar cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:108
+msgid "cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:109
+#, fuzzy
+msgid "cherry pie filling"
+msgstr "Проверить правописание"
+
+#: src/backends/usda_ingredient_data.h:110
+msgid "chicken"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:111
+msgid "chicken (1-2 lb)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:112
+msgid "chicken bouillon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:113
+msgid "chicken breast"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:114
+msgid "chicken broth"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:115
+msgid "chicken pieces"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:116
+msgid "chicken stock"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:117
+msgid "chicken thigh"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:118
+msgid "chicken, cooked"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:119
+msgid "chickens, whole"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:120
+msgid "chili"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:121
+msgid "chili powder"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:122
+msgid "chinese turnip"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:123
+msgid "chives"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:124
+msgid "chocolate chip"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:125
+msgid "chocolate pudding mix (instant)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:126
+msgid "chopped capers"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:127
+msgid "chopped carrot"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:128
+msgid "chopped celery"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:129
+msgid "chopped chives"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:130
+msgid "chopped green chilies"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:131
+msgid "chopped onion"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:132
+msgid "chopped onions"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:133
+msgid "chopped onions, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:134
+msgid "chopped parsley"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:135
+msgid "chopped pimientos"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:136
+msgid "chopped walnuts"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:137
+msgid "cider vinegar"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:138
+msgid "cilantro"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:139
+msgid "cinnamon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:140
+#, fuzzy
+msgid "clear honey"
+msgstr "Очистить фотографию"
+
+#: src/backends/usda_ingredient_data.h:141
+msgid "cloves"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:142
+msgid "cloves garlic"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:143
+msgid "cloves or allspice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:144
+msgid "cocoa"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:145
+msgid "coconut"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:146
+msgid "coconut milk (canned)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:147
+msgid "cold butter"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:148
+msgid "cold water"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:149
+msgid "condensed milk (sweetened)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:150
+msgid "cooked chicken"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:151
+msgid "cooked chicken breast"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:152
+msgid "cooked ham"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:153
+msgid "cooked turkey"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:154
+msgid "cooked wild rice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:155
+msgid "cookie crust (chocolate - 8-9 in)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:156
+msgid "Cool Whip"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:157
+msgid "corn chips"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:158
+msgid "corn meal"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:159
+msgid "corn oil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:160
+#, fuzzy
+msgid "corn starch"
+msgstr "Очистить условие поиска"
+
+#: src/backends/usda_ingredient_data.h:161
+msgid "corn syrup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:162
+msgid "cornmeal"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:163
+msgid "cornstarch"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:164
+msgid "cottage cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:165
+msgid "cream (heavy)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:166
+msgid "cream cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:167
+msgid "cream of celery soup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:168
+msgid "cream of chicken soup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:169
+msgid "cream of chicken soup, condensed"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:170
+msgid "cream of mushroom soup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:171
+msgid "cream of mushroom soup, condensed"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:172
+msgid "croutons to serve"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:173
+msgid "crushed pineapple in juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:174
+msgid "cucumber"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:175
+msgid "cucumber, whole"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:176
+msgid "cucumbers"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:177
+msgid "cucumbers, whole"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:178
+msgid "cumin"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:179
+msgid "currants"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:180
+msgid "dehydrated onion flakes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:181
+msgid "diced chicken"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:182
+msgid "dried basil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:183
+msgid "dried onion"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:184
+msgid "dried oregano"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:185
+msgid "dried parsley"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:186
+msgid "dried porcini mushrooms"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:187
+msgid "dried red pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:188
+msgid "dried sage"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:189
+msgid "dry bread crumbs"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:190
+msgid "dry mustard"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:191
+msgid "dry nonfat milk powder"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:192
+msgid "egg"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:193
+msgid "egg noodles (medium)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:194
+msgid "egg substitute"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:195
+msgid "eggplant"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:196
+msgid "eggplant (baby)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:197
+msgid "eggs"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:198
+msgid "eggs, hard cooked"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:199
+msgid "eggs, hard-boiled"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:200
+msgid "egg whites"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:201
+msgid "egg yolk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:202
+msgid "egg yolks"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:203
+msgid "elbow macaroni"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:204
+msgid "flaked almonds"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:205
+msgid "flat anchovies"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:206
+msgid "flour"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:207
+msgid "flour tortillas"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:208
+msgid "flour, all-purpose"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:209
+msgid "flour, white"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:210
+msgid "flour, whole-grain wheat"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:211
+msgid "fresh spinach"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:212
+msgid "freshly chopped coriander"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:213
+msgid "freshly chopped parsley"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:214
+msgid "frozen broccoli"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:215
+msgid "frozen broccoli spears"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:216
+msgid "frozen cauliflower"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:217
+msgid "frozen corn"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:218
+msgid "frozen egg whites"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:219
+msgid "frozen fish"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:220
+msgid "frozen green beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:221
+msgid "frozen orange juice concentrate"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:222
+msgid "frozen peas"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:223
+msgid "frozen whole egg"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:224
+msgid "garlic"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:225
+msgid "garlic clove"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:226
+msgid "garlic cloves"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:227
+msgid "garlic powder"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:228
+msgid "garlic salt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:229
+#, fuzzy
+msgid "gelatin"
+msgstr "Рейтинг"
+
+#: src/backends/usda_ingredient_data.h:230
+msgid "gelatin (peach-flavored)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:231
+msgid "ginger"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:232
+msgid "ginger, fresh"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:233
+msgid "graham cracker crust (8 or 9 in)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:234
+msgid "granny Smith apple"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:235
+msgid "granulated garlic"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:236
+msgid "grapefruit"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:237
+msgid "gravy"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:238
+msgid "green beans (fresh)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:239
+msgid "green chile"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:240
+msgid "green chiles"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:241
+msgid "green chili pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:242
+msgid "green onion"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:243
+msgid "green pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:244
+msgid "green peppers"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:245
+msgid "ground almonds"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:246
+msgid "ground beef"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:247
+msgid "ground chuck"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:248
+msgid "ground cinnamon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:249
+msgid "ground clove"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:250
+msgid "ground cloves"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:251
+msgid "ground cumin"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:252
+msgid "ground ginger"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:253
+msgid "ground nutmeg"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:254
+msgid "ground oregano"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:255
+msgid "ground pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:256
+msgid "ground thyme"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:257
+msgid "ham"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:258
+msgid "hamburger"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:259
+msgid "hamburger bun"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:260
+msgid "hamburger buns"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:261
+msgid "hamburger rolls"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:262
+msgid "hazelnuts"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:263
+msgid "heavy cream"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:264
+msgid "herb stuffing"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:265
+msgid "honey"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:266
+msgid "horseradish"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:267
+msgid "hot pepper flakes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:268
+msgid "hot pepper sauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:269
+msgid "hot sauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:270
+msgid "hot water"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:271
+msgid "instant dry milk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:272
+msgid "instant rice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:273
+msgid "Italian salad dressing"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:274
+msgid "jalapeno peppers"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:275
+msgid "juice of 1 lemon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:276
+msgid "ketchup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:277
+msgid "lasagna noodles (8 noodles)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:278
+msgid "leaf lettuce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:279
+msgid "leeks"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:280
+msgid "lemon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:281
+msgid "lemon juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:282
+msgid "lemon juice, bottled"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:283
+msgid "lemon juice, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:284
+msgid "lemon peel"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:285
+msgid "lemon, sliced"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:286
+msgid "lentil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:287
+msgid "lettuce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:288
+msgid "lime juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:289
+msgid "long-grain white rice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:290
+msgid "low sodium beef broth"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:291
+msgid "low sodium chicken broth"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:292
+#, c-format
+msgid "lowfat 1% milk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:293
+msgid "lowfat cheddar cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:294
+msgid "lowfat cottage cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:295
+msgid "lowfat mayonnaise"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:296
+msgid "lowfat mozzarella cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:297
+msgid "lowfat yogurt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:298
+msgid "low-sodium chicken broth"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:299
+msgid "low-sodium soy sauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:300
+msgid "low-sodium vegetable stock"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:301
+#, fuzzy
+msgid "margarine"
+msgstr "Верхнее поле"
+
+#: src/backends/usda_ingredient_data.h:302
+msgid "margarine, soft"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:303
+msgid "marjoram"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:304
+msgid "marjoram leaves"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:305
+msgid "mayonnaise"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:306
+msgid "medium-size egg"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:307
+msgid "milk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:308
+msgid "mint leaves"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:309
+msgid "mixed fruit in syrup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:310
+msgid "mixed vegetables"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:311
+msgid "mixed vegetables, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:312
+msgid "molasses"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:313
+msgid "molasses, dark"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:314
+msgid "monterey jack cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:315
+msgid "mozzarella cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:316
+msgid "mung beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:317
+msgid "mushroom"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:318
+msgid "mushrooms"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:319
+msgid "mustard"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:320
+msgid "mustard seeds"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:321
+msgid "navy beans, cooked"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:322
+msgid "nonfat dry milk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:323
+msgid "nonfat milk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:324
+msgid "noodles"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:325
+msgid "noodles (lasagne)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:326
+msgid "noodles (lasagne) (6-8 bunches)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:327
+msgid "noodles, egg (medium)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:328
+msgid "nutmeg"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:329
+msgid "nuts, chopped"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:330
+msgid "oil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:331
+msgid "oil, peanut"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:332
+msgid "oil, sesame"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:333
+msgid "olive oil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:334
+msgid "onion"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:335
+msgid "onion, medium"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:336
+msgid "onion powder"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:337
+msgid "onion salt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:338
+msgid "onion soup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:339
+msgid "onion, chopped"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:340
+msgid "onion, large"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:341
+msgid "onions"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:342
+msgid "onions, chopped"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:343
+msgid "orange juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:344
+msgid "orange juice, from frozen concentra"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:345
+msgid "orange rind"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:346
+msgid "orange zest"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:347
+msgid "oranges"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:348
+msgid "oregano"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:349
+msgid "Oreo Cookies"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:350
+msgid "paprika"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:351
+msgid "paprika pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:352
+msgid "parmesan cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:353
+msgid "parsley"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:354
+msgid "parsley flakes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:355
+msgid "parsley stalks"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:356
+msgid "parsnips"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:357
+msgid "pasta shells"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:358
+msgid "peach slices in syrup"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:359
+msgid "peanut butter"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:360
+msgid "pearled barley"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:361
+msgid "peas, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:362
+msgid "peas, frozen"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:363
+msgid "pecans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:364
+msgid "pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:365
+msgid "Pepperidge Farm stuffing"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:366
+msgid "pickle relish"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:367
+msgid "pickles"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:368
+#, fuzzy
+msgid "pimento"
+msgstr "Выравнивание"
+
+#: src/backends/usda_ingredient_data.h:369
+msgid "pine kernels"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:370
+msgid "pineapple chunks in juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:371
+msgid "pineapple juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:372
+msgid "pinto beans"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:373
+msgid "pinto beans, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:374
+msgid "plain flour"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:375
+msgid "plain low-fat yogurt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:376
+msgid "plain yogurt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:377
+msgid "pork roast"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:378
+msgid "potato"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:379
+msgid "potato flakes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:380
+msgid "potato Granules"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:381
+msgid "potato, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:382
+msgid "potatoes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:383
+msgid "potatoes (red-skinned)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:384
+msgid "poultry seasoning"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:385
+msgid "powdered sugar"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:386
+msgid "processed American cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:387
+msgid "provolone cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:388
+msgid "prunes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:389
+msgid "pumpkin"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:390
+msgid "radishes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:391
+msgid "raisins"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:392
+msgid "red burgundy wine"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:393
+msgid "red onion"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:394
+msgid "red pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:395
+msgid "red snapper fillets"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:396
+msgid "red wine"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:397
+msgid "reduced calorie mayonnaise"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:398
+msgid "relish"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:399
+msgid "rice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:400
+msgid "ricotta cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:401
+msgid "ripe dessert pears"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:402
+msgid "rolled oats"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:403
+msgid "rosemary"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:404
+msgid "rum flavoring or vanilla"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:405
+msgid "sage"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:406
+msgid "salad dressing (Miracle Whip)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:407
+msgid "salad onions"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:408
+msgid "salsa"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:409
+msgid "salt"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:410
+msgid "sandwich rolls"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:411
+msgid "sausage"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:412
+msgid "scallions"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:413
+msgid "self-raising flour"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:414
+msgid "sesame oil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:415
+msgid "shallots"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:416
+msgid "shortening"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:417
+msgid "shredded carrots"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:418
+msgid "shredded lettuce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:419
+msgid "shrimp (raw, medium-size)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:420
+msgid "skim milk"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:421
+msgid "skinless boneless chicken breast"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:422
+msgid "sliced carrots"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:423
+msgid "small mushrooms"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:424
+msgid "small onions or shallots"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:425
+msgid "smoked bacon"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:426
+msgid "soft bread crumbs"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:427
+msgid "sour cream"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:428
+msgid "soy sauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:429
+msgid "spaghetti"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:430
+msgid "spinach leaf"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:431
+msgid "sprig fresh thyme"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:432
+msgid "stew beef"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:433
+msgid "stock"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:434 src/backends/usda_property_data.h:37
+msgid "sugar"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:435
+msgid "sweet pickle"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:436
+msgid "sweet pickle relish"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:437
+msgid "sweet potato"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:438
+msgid "sweet potato, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:439
+msgid "swiss cheese"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:440
+msgid "taco sauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:441
+msgid "taco seasoning mix"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:442
+msgid "taco shells"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:443
+msgid "taco spice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:444
+msgid "thyme"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:445
+msgid "tomato juice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:446
+msgid "tomato paste"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:447
+msgid "tomato sauce"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:448
+msgid "tomatoes"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:449
+msgid "tomatoes, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:450
+msgid "tomatoes, stewed"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:451
+msgid "tortilla chips"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:452
+msgid "tostada shell"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:453
+msgid "tuna"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:454
+msgid "tuna in water, canned"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:455
+msgid "turkey"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:456
+msgid "turkey ham"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:457
+msgid "turmeric"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:458
+msgid "turnip"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:459
+msgid "unflavored gelatin"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:460
+msgid "vanilla"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:461
+msgid "vanilla extract"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:462
+msgid "vanilla pudding mix (instant)"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:463
+msgid "veal shank"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:464
+msgid "vegetable oil"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:465
+msgid "vegetable stock"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:466
+msgid "Velveeta"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:467
+msgid "vinegar"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:468
+msgid "walnuts"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:469
+msgid "warm water"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:470 src/backends/usda_property_data.h:30
+#, fuzzy
+msgid "water"
+msgstr "Категория"
+
+#: src/backends/usda_ingredient_data.h:471
+msgid "whipped topping"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:472
+msgid "white flour"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:473
+msgid "white pepper"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:474
+msgid "white rice"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:475
+msgid "white turnips"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:476
+msgid "white vinegar"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:477
+msgid "white wine"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:478
+msgid "whole wheat flour"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:479
+msgid "yeast"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:480
+msgid "yellow squash"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:481
+msgid "zucchini"
+msgstr ""
+
+#: src/backends/usda_ingredient_data.h:482
+msgid "zucchini slices"
+msgstr ""
+
+#: src/backends/usda_property_data.h:31
+msgid "energy"
+msgstr ""
+
+#: src/backends/usda_property_data.h:32
+msgid "protein"
+msgstr ""
+
+#: src/backends/usda_property_data.h:33
+msgid "fat"
+msgstr ""
+
+#: src/backends/usda_property_data.h:34
+msgid "ash"
+msgstr ""
+
+#: src/backends/usda_property_data.h:35
+msgid "carbohydrates"
+msgstr ""
+
+#: src/backends/usda_property_data.h:36
+msgid "dietary fiber"
+msgstr ""
+
+#: src/backends/usda_property_data.h:38
+msgid "calcuim"
+msgstr ""
+
+#: src/backends/usda_property_data.h:39
+msgid "iron"
+msgstr ""
+
+#: src/backends/usda_property_data.h:40
+msgid "magnesium"
+msgstr ""
+
+#: src/backends/usda_property_data.h:41
+msgid "phosphorus"
+msgstr ""
+
+#: src/backends/usda_property_data.h:42
+msgid "potassium"
+msgstr ""
+
+#: src/backends/usda_property_data.h:43
+msgid "sodium"
+msgstr ""
+
+#: src/backends/usda_property_data.h:44
+msgid "zinc"
+msgstr ""
+
+#: src/backends/usda_property_data.h:45
+msgid "copper"
+msgstr ""
+
+#: src/backends/usda_property_data.h:46
+msgid "manganese"
+msgstr ""
+
+#: src/backends/usda_property_data.h:47
+msgid "selenium"
+msgstr ""
+
+#: src/backends/usda_property_data.h:48
+msgid "vitamin C"
+msgstr ""
+
+#: src/backends/usda_property_data.h:49
+msgid "thiamin"
+msgstr ""
+
+#: src/backends/usda_property_data.h:50
+msgid "riboflavin"
+msgstr ""
+
+#: src/backends/usda_property_data.h:51
+msgid "niacin"
+msgstr ""
+
+#: src/backends/usda_property_data.h:52
+msgid "pantothenic acid"
+msgstr ""
+
+#: src/backends/usda_property_data.h:53
+msgid "vitamin B"
+msgstr ""
+
+#: src/backends/usda_property_data.h:54
+msgid "folate"
+msgstr ""
+
+#: src/backends/usda_property_data.h:55
+msgid "folic acid"
+msgstr ""
+
+#: src/backends/usda_property_data.h:56
+msgid "food folate"
+msgstr ""
+
+#: src/backends/usda_property_data.h:57
+msgid "folate (DFE)"
+msgstr ""
+
+#: src/backends/usda_property_data.h:58
+msgid "vitamin B12"
+msgstr ""
+
+#: src/backends/usda_property_data.h:59
+msgid "vitamin A"
+msgstr ""
+
+#: src/backends/usda_property_data.h:60
+msgid "vitamin A (RAE)"
+msgstr ""
+
+#: src/backends/usda_property_data.h:61
+msgid "retinol"
+msgstr ""
+
+#: src/backends/usda_property_data.h:62
+msgid "vitamin E"
+msgstr ""
+
+#: src/backends/usda_property_data.h:63
+msgid "vitamin K"
+msgstr ""
+
+#: src/backends/usda_property_data.h:64
+msgid "alpha-carotene"
+msgstr ""
+
+#: src/backends/usda_property_data.h:65
+msgid "beta-carotene"
+msgstr ""
+
+#: src/backends/usda_property_data.h:66
+msgid "beta-cryptoxanthin"
+msgstr ""
+
+#: src/backends/usda_property_data.h:67
+msgid "lycopene"
+msgstr ""
+
+#: src/backends/usda_property_data.h:68
+msgid "lutein+zeazanthin"
+msgstr ""
+
+#: src/backends/usda_property_data.h:69
+msgid "saturated fat"
+msgstr ""
+
+#: src/backends/usda_property_data.h:70
+msgid "monounsaturated fat"
+msgstr ""
+
+#: src/backends/usda_property_data.h:71
+msgid "polyunsaturated fat"
+msgstr ""
+
+#: src/backends/usda_property_data.h:72
+msgid "cholesterol"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:89
+#: src/dialogs/advancedsearchdialog.cpp:293
+msgid "Require All Words"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:93
+#: src/dialogs/advancedsearchdialog.cpp:297
+msgid "Keywords:"
+msgstr "Ключевые слова:"
+
+#: src/dialogs/advancedsearchdialog.cpp:111
+msgid "Enter ingredients: (e.g. chicken pasta \"white wine\")"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:152
+msgid "Enter categories: (e.g. Desserts Pastas \"Main Dishes\")"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:193
+msgid "Enter author name (e.g. Smith or \"Jane Doe\")"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:316 src/widgets/recipelistview.cpp:152
+msgid "Created:"
+msgstr "Создан:"
+
+#: src/dialogs/advancedsearchdialog.cpp:327 src/widgets/recipelistview.cpp:153
+msgid "Modified:"
+msgstr "Изменён:"
+
+#: src/dialogs/advancedsearchdialog.cpp:338 src/widgets/recipelistview.cpp:154
+msgid "Last Accessed:"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:417
+msgid "Criterion"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:418
+#: src/dialogs/advancedsearchdialog.cpp:577
+#: src/dialogs/editratingdialog.cpp:103 src/dialogs/editratingdialog.cpp:153
+#: src/widgets/ratingdisplaywidget.ui:130
+#, no-c-format
+msgid "Stars"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:465
+#: src/dialogs/advancedsearchdialog.cpp:541
+#: src/dialogs/ingredientmatcherdialog.cpp:97 src/dialogs/setupdisplay.cpp:117
+msgid "Title"
+msgstr "Заголовок"
 
 #: src/dialogs/advancedsearchdialog.cpp:466
 #: src/dialogs/ingredientmatcherdialog.cpp:102
@@ -131,51 +2250,24 @@ msgstr "Единицы"
 #: src/widgets/authorlistview.cpp:62 src/widgets/authorlistview.cpp:239
 #: src/widgets/categorylistview.cpp:307 src/widgets/categorylistview.cpp:573
 #: src/widgets/headerlistview.cpp:65 src/widgets/ingredientlistview.cpp:114
-#: src/widgets/ingredientlistview.cpp:251
-#: src/widgets/prepmethodlistview.cpp:62 src/widgets/propertylistview.cpp:123
-#: src/widgets/unitlistview.cpp:125
+#: src/widgets/ingredientlistview.cpp:251 src/widgets/prepmethodlistview.cpp:62
+#: src/widgets/propertylistview.cpp:123 src/widgets/unitlistview.cpp:125
 msgid "Id"
 msgstr "Id"
 
-#: src/dialogs/ingredientsdialog.cpp:181
-msgid "Ingredient Properties"
-msgstr "Свойства ингредиента"
-
-#: src/dialogs/ingredientsdialog.cpp:184
-#: src/dialogs/selectpropertydialog.cpp:47
-#: src/widgets/propertylistview.cpp:117 src/widgets/propertylistview.cpp:257
-msgid "Property"
-msgstr "Свойство"
-
-#: src/dialogs/ingredientmatcherdialog.cpp:144
-#: src/dialogs/ingredientparserdialog.cpp:59
-#: src/dialogs/ingredientparserdialog.cpp:104
-#: src/dialogs/ingredientsdialog.cpp:185 src/dialogs/ingredientsdialog.cpp:388
-#: src/dialogs/ingredientsdialog.cpp:411 src/dialogs/recipeinputdialog.cpp:244
-#: src/dialogs/recipeinputdialog.cpp:346
-#: src/dialogs/refineshoppinglistdialog.cpp:75
-#: src/dialogs/refineshoppinglistdialog.cpp:106
-msgid "Amount"
-msgstr "Количество"
-
-#: src/dialogs/ingredientsdialog.cpp:213 src/widgets/unitlistview.cpp:241
-#, fuzzy
-msgid "Ingredient Weights"
-msgstr "Перечень ингредиентов"
-
-#: src/dialogs/ingredientsdialog.cpp:214
-#, fuzzy
-msgid "Weight"
-msgstr "&Высота:"
-
-#: src/dialogs/ingredientsdialog.cpp:215
-#, fuzzy
-msgid "Per Amount"
-msgstr "Количество"
+#: src/dialogs/advancedsearchdialog.cpp:533
+#: src/dialogs/editratingdialog.cpp:124 src/dialogs/editratingdialog.cpp:151
+#: src/dialogs/ingredientparserdialog.cpp:86 src/recipeactionshandler.cpp:59
+#: src/widgets/authorlistview.cpp:71 src/widgets/categorylistview.cpp:318
+#: src/widgets/headerlistview.cpp:74 src/widgets/ingredientlistview.cpp:123
+#: src/widgets/prepmethodlistview.cpp:71 src/widgets/propertylistview.cpp:134
+#: src/widgets/unitlistview.cpp:138
+msgid "&Delete"
+msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:252
-msgid "Load USDA data"
-msgstr "Загрузить данные USDA"
+#: src/dialogs/advancedsearchdialog.cpp:542
+msgid "Search using the following criteria:"
+msgstr ""
 
 #: src/dialogs/advancedsearchdialog.cpp:543
 #: src/dialogs/ingredientsdialog.cpp:264 src/dialogs/recipeinputdialog.cpp:426
@@ -185,99 +2277,467 @@ msgstr "Загрузить данные USDA"
 msgid "Ingredients"
 msgstr "Ингредиенты"
 
-#: src/dialogs/ingredientsdialog.cpp:267
-msgid "Headers"
-msgstr "Заголовки"
+#: src/dialogs/advancedsearchdialog.cpp:544
+msgid "Uses any of:"
+msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:369
-msgid ""
-"Recipes may require this information for nutrient analysis. Are you sure you "
-"want to delete this entry?"
+#: src/dialogs/advancedsearchdialog.cpp:545
+#, fuzzy
+msgid "Uses all:"
+msgstr "Использовать:"
+
+#: src/dialogs/advancedsearchdialog.cpp:546
+msgid "Without:"
 msgstr ""
 
-#: src/dialogs/ingredientmatcherdialog.cpp:142
-#: src/dialogs/ingredientsdialog.cpp:386 src/dialogs/ingredientsdialog.cpp:409
+#: src/dialogs/advancedsearchdialog.cpp:547
+msgid "Categories >>"
+msgstr "Категории >>"
+
+#: src/dialogs/advancedsearchdialog.cpp:548
+msgid "In all:"
+msgstr "Во всех:"
+
+#: src/dialogs/advancedsearchdialog.cpp:549
+msgid "Not in:"
+msgstr "Отсутствует в:"
+
+#: src/dialogs/advancedsearchdialog.cpp:550
+msgid "In any of:"
+msgstr "В одной из:"
+
+#: src/dialogs/advancedsearchdialog.cpp:551
+#: src/dialogs/recipeinputdialog.cpp:195 src/dialogs/selectauthorsdialog.cpp:27
+#: src/dialogs/setupdisplay.cpp:121 src/exporters/htmlexporter.cpp:315
+#: src/exporters/plaintextexporter.cpp:78 src/krecipesview.cpp:325
+#: src/krecipesview.cpp:393
+msgid "Authors"
+msgstr "Авторы"
+
+#: src/dialogs/advancedsearchdialog.cpp:552
+msgid "By any of:"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:553
 #, fuzzy
-msgid "Enter amount"
-msgstr "Количество"
+msgid "By all:"
+msgstr "Авторы:"
 
-#: src/dialogs/ingredientsdialog.cpp:456
-msgid "Unit Exists"
-msgstr "Единица существует"
+#: src/dialogs/advancedsearchdialog.cpp:554
+msgid "Not by:"
+msgstr "Кроме авторов:"
 
-#: src/dialogs/ingredientsdialog.cpp:456
-msgid "The ingredient contains already the unit that you have chosen."
-msgstr "Ингредиент уже содержит эти единицы."
+#: src/dialogs/advancedsearchdialog.cpp:555
+#: src/dialogs/recipeinputdialog.cpp:241 src/dialogs/setupdisplay.cpp:126
+#: src/exporters/htmlexporter.cpp:283
+msgid "Yield"
+msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:484 src/dialogs/recipeimportdialog.cpp:38
-#: src/krecipesview.cpp:444 src/recipeactionshandler.cpp:235
-#: src/recipeactionshandler.cpp:246 src/widgets/authorlistview.cpp:125
-#: src/widgets/categorylistview.cpp:399 src/widgets/headerlistview.cpp:123
-#: src/widgets/ingredientlistview.cpp:170
-#: src/widgets/prepmethodlistview.cpp:118 src/widgets/unitlistview.cpp:229
-msgid "Recipes"
-msgstr "Рецепты"
+#: src/dialogs/advancedsearchdialog.cpp:556
+#: src/dialogs/advancedsearchdialog.cpp:562
+#: src/widgets/propertylistview.cpp:256
+msgid "Enabled"
+msgstr "Включено"
 
-#: src/dialogs/ingredientsdialog.cpp:500 src/widgets/headerlistview.cpp:126
-#: src/widgets/ingredientlistview.cpp:173
-#: src/widgets/prepmethodlistview.cpp:120 src/widgets/unitlistview.cpp:250
-msgid "You are about to permanantly delete recipes from your database."
+#: src/dialogs/advancedsearchdialog.cpp:558
+msgid "Yields at least:"
+msgstr "Минимум порций:"
+
+#: src/dialogs/advancedsearchdialog.cpp:559
+msgid "Yields at most:"
+msgstr "Максимум порций:"
+
+#: src/dialogs/advancedsearchdialog.cpp:560
+msgid "Yields about:"
+msgstr "Примерно порций:"
+
+#: src/dialogs/advancedsearchdialog.cpp:561
+#: src/dialogs/recipeinputdialog.cpp:254 src/dialogs/setupdisplay.cpp:119
+#: src/exporters/htmlexporter.cpp:289 src/exporters/plaintextexporter.cpp:96
+msgid "Preparation Time"
+msgstr "Время приготовления"
+
+#: src/dialogs/advancedsearchdialog.cpp:564
+msgid "Ready in at most:"
+msgstr "Готово не позднее:"
+
+#: src/dialogs/advancedsearchdialog.cpp:565
+msgid "Ready in about:"
+msgstr "Готово примерно:"
+
+#: src/dialogs/advancedsearchdialog.cpp:566
+#: src/dialogs/recipeinputdialog.cpp:427 src/dialogs/setupdisplay.cpp:73
+#: src/dialogs/setupdisplay.cpp:118
+msgid "Instructions"
+msgstr "Инструкции"
+
+#: src/dialogs/advancedsearchdialog.cpp:567
+msgid "Meta Data"
+msgstr "Метдаданные"
+
+#: src/dialogs/advancedsearchdialog.cpp:568
+msgid "C&lear"
+msgstr "&Очистить"
+
+#: src/dialogs/advancedsearchdialog.cpp:569
+msgid "Alt+L"
+msgstr "Alt+L"
+
+#: src/dialogs/advancedsearchdialog.cpp:570
+msgid "&Search"
+msgstr "&Поиск"
+
+#: src/dialogs/advancedsearchdialog.cpp:571
+msgid "By average:"
 msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:598
-msgid "Property Exists"
-msgstr "Свойство существует"
+#: src/dialogs/advancedsearchdialog.cpp:572
+msgid "stars"
+msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:598
+#: src/dialogs/advancedsearchdialog.cpp:573
+msgid "By criteria:"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:574
+msgid "+"
+msgstr "+"
+
+#: src/dialogs/advancedsearchdialog.cpp:576
+#: src/dialogs/editratingdialog.cpp:102 src/dialogs/editratingdialog.cpp:152
+#: src/widgets/ratingdisplaywidget.ui:119
+#, no-c-format
+msgid "Criteria"
+msgstr "Условие отбора"
+
+#: src/dialogs/advancedsearchdialog.cpp:578
+#: src/dialogs/recipeinputdialog.cpp:428 src/dialogs/setupdisplay.cpp:125
+#: src/exporters/htmlexporter.cpp:485 src/exporters/plaintextexporter.cpp:141
+msgid "Ratings"
+msgstr ""
+
+#: src/dialogs/advancedsearchdialog.cpp:877
+msgid "No matching recipes found"
+msgstr "Нет подходящих рецептов"
+
+#: src/dialogs/authorsdialog.cpp:38 src/dialogs/categorieseditordialog.cpp:40
+#: src/dialogs/prepmethodsdialog.cpp:39 src/dialogs/propertiesdialog.cpp:48
+#: src/dialogs/unitsdialog.cpp:49
+msgid "Create ..."
+msgstr "Создать..."
+
+#: src/dialogs/authorsdialog.cpp:43 src/dialogs/categorieseditordialog.cpp:45
+#: src/dialogs/prepmethodsdialog.cpp:44 src/dialogs/propertiesdialog.cpp:52
+#: src/dialogs/selectrecipedialog.cpp:108 src/dialogs/unitsdialog.cpp:54
+msgid "Delete"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:107
+msgid "Requested Border"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:108
+msgid "Style:"
+msgstr "Стиль:"
+
+#: src/dialogs/borderdialog.cpp:109
+msgid "Color:"
+msgstr "Цвет:"
+
+#: src/dialogs/borderdialog.cpp:110
+msgid "Width:"
+msgstr "Ширина:"
+
+#: src/dialogs/borderdialog.cpp:182
+msgid "None"
+msgstr "Нет"
+
+#: src/dialogs/borderdialog.cpp:183
 msgid ""
-"The property you tried to add already exists in the ingredient with the same "
-"per units."
-msgstr "Это свойство уже присутствует в ингредиенте с теми же единицами."
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Dotted"
+msgstr ""
 
-#: src/dialogs/ingredientsdialog.cpp:699
-msgid "No ingredient selected."
+#: src/dialogs/borderdialog.cpp:184
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Dashed"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:185
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Solid"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:186
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Double"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:187
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Groove"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:188
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Ridge"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:189
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Inset"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:190
+msgid ""
+"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
+"Outset"
+msgstr ""
+
+#: src/dialogs/borderdialog.cpp:205
+msgid "Border Preview"
+msgstr ""
+
+#: src/dialogs/conversiondialog.cpp:34
+msgid "Measurement Converter"
+msgstr ""
+
+#: src/dialogs/conversiondialog.cpp:39 src/dialogs/conversiondialog.cpp:94
+msgid "Convert"
+msgstr ""
+
+#: src/dialogs/conversiondialog.cpp:59
+#, fuzzy
+msgid "--Ingredient (optional)--"
+msgstr "Свойства ингредиента"
+
+#: src/dialogs/conversiondialog.cpp:62
+#: src/dialogs/createingredientweightdialog.cpp:69
+#: src/widgets/weightinput.cpp:24
+#, fuzzy
+msgid "-No Preparation-"
+msgstr "Простота приготовления"
+
+#: src/dialogs/conversiondialog.cpp:95
+msgid "To"
+msgstr ""
+
+#: src/dialogs/conversiondialog.cpp:96 src/dialogs/conversiondialog.cpp:136
+#, fuzzy
+msgid "<b>Result:</b>"
+msgstr "<b>Список</b>"
+
+#: src/dialogs/conversiondialog.cpp:140
+#, fuzzy
+msgid "<b>Approximated result:</b>"
+msgstr "<b>Список</b>"
+
+#: src/dialogs/conversiondialog.cpp:144 src/dialogs/conversiondialog.cpp:148
+#: src/dialogs/conversiondialog.cpp:152 src/dialogs/conversiondialog.cpp:156
+#: src/dialogs/conversiondialog.cpp:160
+msgid "<b>Error:</b>"
+msgstr ""
+
+#: src/dialogs/conversiondialog.cpp:145
+msgid "Missing unit conversion"
+msgstr ""
+
+#: src/dialogs/conversiondialog.cpp:149
+#, fuzzy
+msgid "No ingredient weight available"
 msgstr "Нет выделенных ингредиентов."
 
-#: src/dialogs/selectrecipedialog.cpp:74 src/dialogs/selectrecipedialog.cpp:75
-#: src/widgets/krelistview.cpp:47
-msgid "Search:"
-msgstr "Поиск:"
+#: src/dialogs/conversiondialog.cpp:153
+#, fuzzy
+msgid "No ingredient weight available for this method of preparation"
+msgstr "Нет выделенных ингредиентов."
 
-#: src/dialogs/selectrecipedialog.cpp:98
-msgid "Open Recipe(s)"
-msgstr "Открыть рецепты"
+#: src/dialogs/conversiondialog.cpp:157
+msgid "Ingredient required for conversion"
+msgstr ""
 
-#: src/dialogs/selectrecipedialog.cpp:103
-#: src/dialogs/similarcategoriesdialog.cpp:300 src/krecipesview.cpp:398
-#: src/recipeactionshandler.cpp:214 src/recipeactionshandler.cpp:220
-msgid "Edit Recipe"
-msgstr "Изменить рецепт"
+#: src/dialogs/conversiondialog.cpp:161
+msgid "Impossible unit conversion based on unit types"
+msgstr ""
 
-#: src/dialogs/selectrecipedialog.cpp:114
+#: src/dialogs/createcategorydialog.cpp:26
+#: src/dialogs/createcategorydialog.cpp:37
+msgid "New Category"
+msgstr "Создать категорию"
+
+#: src/dialogs/createcategorydialog.cpp:43
+msgid "Subcategory of:"
+msgstr "Подкатегория категории"
+
+#: src/dialogs/createcategorydialog.cpp:60
+msgid "**NONE**"
+msgstr "**НЕТ**"
+
+#: src/dialogs/createingredientweightdialog.cpp:86
 #, fuzzy
-msgid "Basic"
-msgstr "Базовый"
+msgid "New Ingredient Weight"
+msgstr "Новый ингрежиент"
 
-#: src/dialogs/selectrecipedialog.cpp:117
+#: src/dialogs/createingredientweightdialog.cpp:87
 #, fuzzy
-msgid "Advanced"
-msgstr "Дополнительно"
+msgid "Per Amount:"
+msgstr "Количество:"
 
-#: src/dialogs/selectrecipedialog.cpp:119
-msgid "Clear search"
-msgstr "Очистить условие поиска"
+#: src/dialogs/createingredientweightdialog.cpp:88
+#, fuzzy
+msgid "Weight:"
+msgstr "&Высота:"
 
-#: src/dialogs/usdadatadialog.cpp:39
-msgid "Load ingredient properties for: \"%1\""
-msgstr "Загрузить свойства ингредиента для: \"%1\""
+#: src/dialogs/createingredientweightdialog.cpp:94
+#: src/dialogs/createingredientweightdialog.cpp:101
+#: src/widgets/ingredientinputwidget.cpp:277
+msgid "Amount field contains invalid input."
+msgstr ""
 
-#: src/dialogs/usdadatadialog.cpp:43
-msgid "&Load"
-msgstr "&Загрузить"
+#: src/dialogs/createingredientweightdialog.cpp:95
+#: src/dialogs/createingredientweightdialog.cpp:102
+#: src/dialogs/resizerecipedialog.cpp:162
+#: src/dialogs/resizerecipedialog.cpp:171
+#: src/widgets/ingredientinputwidget.cpp:278
+msgid "Invalid input"
+msgstr "Недопустимый ввод"
 
-#: src/dialogs/usdadatadialog.cpp:48
-msgid "USDA Ingredient"
-msgstr "Ингредиент USDA"
+#: src/dialogs/createpropertydialog.cpp:18
+#: src/dialogs/createpropertydialog.cpp:34
+msgid "New Property"
+msgstr "Новое свойство"
+
+#: src/dialogs/createpropertydialog.cpp:36
+msgid "Property name:"
+msgstr "Имя свойства:"
+
+#: src/dialogs/createpropertydialog.cpp:42
+msgid "Units:"
+msgstr "Единицы:"
+
+#: src/dialogs/createunitdialog.cpp:22 src/dialogs/createunitdialog.cpp:34
+msgid "New Unit"
+msgstr "Новая единица"
+
+#: src/dialogs/createunitdialog.cpp:22 src/dialogs/createunitdialog.cpp:34
+#: src/dialogs/ingredientparserdialog.cpp:60
+#: src/dialogs/ingredientparserdialog.cpp:105
+#: src/dialogs/refineshoppinglistdialog.cpp:76
+#: src/dialogs/refineshoppinglistdialog.cpp:107
+#: src/dialogs/selectunitdialog.cpp:37 src/widgets/unitlistview.cpp:116
+msgid "Unit"
+msgstr "Единица"
+
+#: src/dialogs/createunitdialog.cpp:36
+msgid "Singular:"
+msgstr "Единственное число:"
+
+#: src/dialogs/createunitdialog.cpp:42 src/dialogs/createunitdialog.cpp:54
+#, fuzzy
+msgid "Abbreviation:"
+msgstr "Аббревиатура"
+
+#: src/dialogs/createunitdialog.cpp:48
+msgid "Plural:"
+msgstr "Множественное число:"
+
+#: src/dialogs/createunitdialog.cpp:60
+#, fuzzy
+msgid "Type:"
+msgstr "Тип"
+
+#: src/dialogs/createunitdialog.cpp:62 src/widgets/unitlistview.cpp:72
+#: src/widgets/unitlistview.cpp:144
+#, fuzzy
+msgid "Other"
+msgstr "Категория"
+
+#: src/dialogs/createunitdialog.cpp:63 src/widgets/unitlistview.cpp:73
+#: src/widgets/unitlistview.cpp:145
+msgid "Mass"
+msgstr ""
+
+#: src/dialogs/createunitdialog.cpp:64 src/widgets/unitlistview.cpp:74
+#: src/widgets/unitlistview.cpp:146
+msgid "Volume"
+msgstr ""
+
+#: src/dialogs/dbimportdialog.cpp:39
+msgid "Database Import"
+msgstr "Импорт базы данных"
+
+#: src/dialogs/dbimportdialog.cpp:70 src/pref.cpp:354 src/setupwizard.cpp:553
+msgid "Database file:"
+msgstr "Файл базы данных:"
+
+#: src/dialogs/dbimportdialog.cpp:152
+msgid "Database"
+msgstr "База данных"
+
+#: src/dialogs/dbimportdialog.cpp:156 src/pref.cpp:105 src/pref.cpp:232
+#: src/setupwizard.cpp:463
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/dialogs/dbimportdialog.cpp:157 src/pref.cpp:118 src/pref.cpp:245
+#: src/setupwizard.cpp:197 src/setupwizard.cpp:305 src/setupwizard.cpp:398
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: src/dialogs/dbimportdialog.cpp:158 src/pref.cpp:131 src/pref.cpp:258
+#: src/setupwizard.cpp:203 src/setupwizard.cpp:311 src/setupwizard.cpp:418
+msgid "Password:"
+msgstr "Пароль:"
+
+#: src/dialogs/dbimportdialog.cpp:159 src/pref.cpp:160 src/pref.cpp:287
+#: src/setupwizard.cpp:429
+msgid "Database name:"
+msgstr "Имя базы данных:"
+
+#: src/dialogs/dbimportdialog.cpp:160 src/pref.cpp:145 src/pref.cpp:272
+#, fuzzy
+msgid "Port:"
+msgstr "Свойство"
+
+#: src/dialogs/dbimportdialog.cpp:161 src/pref.cpp:152 src/pref.cpp:279
+msgid "Default"
+msgstr ""
+
+#: src/dialogs/dependanciesdialog.cpp:56
+msgid ""
+"<b>WARNING:</b> The following will have to be removed also, since currently "
+"they use the element you have chosen to be removed."
+msgstr ""
+
+#: src/dialogs/dependanciesdialog.cpp:59
+msgid ""
+"<b>WARNING:</b> The following currently use the element you have chosen to "
+"be removed."
+msgstr ""
+
+#: src/dialogs/dependanciesdialog.cpp:91
+#, fuzzy
+msgid "Are you sure you wish to proceed?"
+msgstr "Вы действительно хотите удалить это свойство?"
+
+#: src/dialogs/dietviewdialog.cpp:23
+msgid "Create &Shopping List"
+msgstr "Создать &список покупок"
+
+#: src/dialogs/dietviewdialog.cpp:51 src/dialogs/dietviewdialog.cpp:70
+msgid "Diet"
+msgstr "Диета"
+
+#: src/dialogs/dietviewdialog.cpp:90
+#, c-format
+msgid "Day %1"
+msgstr "День %1"
 
 #: src/dialogs/dietwizarddialog.cpp:51
 msgid "Number of Days"
@@ -291,6 +2751,13 @@ msgstr "Блюд в день"
 msgid "Create the diet"
 msgstr "Создать диету"
 
+#: src/dialogs/dietwizarddialog.cpp:91
+#: src/dialogs/ingredientmatcherdialog.cpp:121
+#: src/dialogs/shoppinglistdialog.cpp:134
+#, fuzzy
+msgid "Clear"
+msgstr "&Очистить"
+
 #: src/dialogs/dietwizarddialog.cpp:96
 msgid "Meal 1"
 msgstr "Блюдо 1"
@@ -355,223 +2822,244 @@ msgstr "Характеристики блюда"
 msgid "Enable Category Filtering"
 msgstr "Включить фильтр категорий"
 
-#: src/dialogs/setupdisplay.cpp:70 src/dialogs/shoppinglistdialog.cpp:108
-msgid "Recipe Title"
-msgstr "Заголовок рецепта"
+#: src/dialogs/editratingdialog.cpp:57 src/dialogs/editratingdialog.cpp:69
+msgid "Rating"
+msgstr "Рейтинг"
 
-#: src/dialogs/setupdisplay.cpp:72
-msgid "Category 1, Category 2, ..."
-msgstr "Категория 1, Категория 2, ..."
+#: src/dialogs/editratingdialog.cpp:148
+msgid "Criteria:"
+msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:566
-#: src/dialogs/recipeinputdialog.cpp:427 src/dialogs/setupdisplay.cpp:73
-#: src/dialogs/setupdisplay.cpp:118
-msgid "Instructions"
-msgstr "Инструкции"
+#: src/dialogs/editratingdialog.cpp:149
+#, fuzzy
+msgid "Stars:"
+msgstr "Поиск:"
 
-#: src/dialogs/setupdisplay.cpp:76
-msgid "Author 1, Author 2, ..."
-msgstr "Автор 1, Автор 2, ..."
+#: src/dialogs/editratingdialog.cpp:150
+msgid "Add"
+msgstr ""
 
-#: src/dialogs/setupdisplay.cpp:79
-msgid "Ingredient 1"
-msgstr "Ингредиент 1"
+#: src/dialogs/editratingdialog.cpp:154
+msgid "Comments:"
+msgstr "Комментарии:"
 
-#: src/dialogs/setupdisplay.cpp:82
-msgid "Ingredient 2"
-msgstr "Ингредиент 2"
+#: src/dialogs/editratingdialog.cpp:155
+#, fuzzy
+msgid "Rater:"
+msgstr "Заголовок:"
 
-#: src/dialogs/setupdisplay.cpp:91
-msgid "Comment"
-msgstr "Комментарий"
+#: src/dialogs/ingredientgroupsdialog.cpp:27
+#, fuzzy
+msgid "Header list"
+msgstr "Заголовок"
 
-#: src/dialogs/setupdisplay.cpp:93
-msgid "Criteria 1"
-msgstr ""
+#: src/dialogs/ingredientmatcherdialog.cpp:78
+#, fuzzy
+msgid "Ingredient (required?)"
+msgstr "Анализатор ингредиентов"
 
-#: src/dialogs/setupdisplay.cpp:97
-msgid "Criteria 2"
+#: src/dialogs/ingredientmatcherdialog.cpp:79
+msgid "Amount Available"
 msgstr ""
 
-#: src/dialogs/setupdisplay.cpp:102
-msgid "Property 1"
-msgstr "Свойство 1"
-
-#: src/dialogs/setupdisplay.cpp:104
-msgid "Property 2"
-msgstr "Свойство 2"
+#: src/dialogs/ingredientmatcherdialog.cpp:86
+#, fuzzy
+msgid "Missing ingredients allowed:"
+msgstr "Недостающие разрешённые ингредиенты:"
 
-#: src/dialogs/setupdisplay.cpp:116
-msgid "Background"
-msgstr "Фон"
+#: src/dialogs/ingredientmatcherdialog.cpp:89
+msgid "Any"
+msgstr "Любые"
 
-#: src/dialogs/advancedsearchdialog.cpp:465
-#: src/dialogs/advancedsearchdialog.cpp:541
-#: src/dialogs/ingredientmatcherdialog.cpp:97 src/dialogs/setupdisplay.cpp:117
-msgid "Title"
-msgstr "Заголовок"
+#: src/dialogs/ingredientmatcherdialog.cpp:93
+msgid "Matching Recipes"
+msgstr "Подходящие рецепты"
 
-#: src/dialogs/advancedsearchdialog.cpp:561
-#: src/dialogs/recipeinputdialog.cpp:254 src/dialogs/setupdisplay.cpp:119
-#: src/exporters/htmlexporter.cpp:289 src/exporters/plaintextexporter.cpp:96
-msgid "Preparation Time"
-msgstr "Время приготовления"
+#: src/dialogs/ingredientmatcherdialog.cpp:104
+msgid "Missing Ingredients"
+msgstr "Недостающие ингредиенты"
 
-#: src/dialogs/setupdisplay.cpp:120
-msgid "Photo"
-msgstr "Снимок"
+#: src/dialogs/ingredientmatcherdialog.cpp:115
+msgid "Find matching recipes"
+msgstr "Найти подходящие рецепты"
 
-#: src/dialogs/advancedsearchdialog.cpp:551
-#: src/dialogs/recipeinputdialog.cpp:195
-#: src/dialogs/selectauthorsdialog.cpp:27 src/dialogs/setupdisplay.cpp:121
-#: src/exporters/htmlexporter.cpp:315 src/exporters/plaintextexporter.cpp:78
-#: src/krecipesview.cpp:325 src/krecipesview.cpp:393
-msgid "Authors"
-msgstr "Авторы"
+#: src/dialogs/ingredientmatcherdialog.cpp:142
+#: src/dialogs/ingredientsdialog.cpp:386 src/dialogs/ingredientsdialog.cpp:409
+#, fuzzy
+msgid "Enter amount"
+msgstr "Количество"
 
-#: src/dialogs/recipeinputdialog.cpp:217
-#: src/dialogs/selectcategoriesdialog.cpp:28 src/dialogs/setupdisplay.cpp:122
-#: src/exporters/htmlexporter.cpp:329 src/exporters/plaintextexporter.cpp:84
-#: src/krecipesview.cpp:324 src/krecipesview.cpp:388
-msgid "Categories"
-msgstr "Категории"
+#: src/dialogs/ingredientmatcherdialog.cpp:144
+#: src/dialogs/ingredientparserdialog.cpp:59
+#: src/dialogs/ingredientparserdialog.cpp:104
+#: src/dialogs/ingredientsdialog.cpp:185 src/dialogs/ingredientsdialog.cpp:388
+#: src/dialogs/ingredientsdialog.cpp:411 src/dialogs/recipeinputdialog.cpp:244
+#: src/dialogs/recipeinputdialog.cpp:346
+#: src/dialogs/refineshoppinglistdialog.cpp:75
+#: src/dialogs/refineshoppinglistdialog.cpp:106
+msgid "Amount"
+msgstr "Количество"
 
-#: src/dialogs/advancedsearchdialog.cpp:578
-#: src/dialogs/recipeinputdialog.cpp:428 src/dialogs/setupdisplay.cpp:125
-#: src/exporters/htmlexporter.cpp:485 src/exporters/plaintextexporter.cpp:141
-msgid "Ratings"
+#: src/dialogs/ingredientmatcherdialog.cpp:319
+#, c-format
+msgid ""
+"_n: You are missing 1 ingredient for:\n"
+"You are missing %n ingredients for:"
 msgstr ""
+"У вас нет %n ингредиента для:\n"
+"У вас нет %n ингредиентов для:\n"
+"У вас нет %n ингредиентов для:"
 
-#: src/dialogs/advancedsearchdialog.cpp:555
-#: src/dialogs/recipeinputdialog.cpp:241 src/dialogs/setupdisplay.cpp:126
-#: src/exporters/htmlexporter.cpp:283
-msgid "Yield"
+#: src/dialogs/ingredientmatcherdialog.h:55 src/widgets/inglistviewitem.cpp:29
+#: src/widgets/inglistviewitem.cpp:41 src/widgets/ingredientinputwidget.cpp:94
+msgid "OR"
 msgstr ""
 
-#: src/dialogs/setupdisplay.cpp:197
-msgid "\"%1\" at line %2, column %3.  This may not be a Krecipes layout file."
-msgstr "\"%1\" в строке %2, столбце %3.  Возможно, это не файл Krecipes."
-
-#: src/dialogs/setupdisplay.cpp:423
-msgid "Background Color..."
-msgstr "Цвет фона..."
-
-#: src/dialogs/setupdisplay.cpp:426
-msgid "Text Color..."
-msgstr "Цвет текста..."
-
-#: src/dialogs/setupdisplay.cpp:429
-msgid "Font..."
-msgstr "Шрифт..."
+#: src/dialogs/ingredientparserdialog.cpp:37
+msgid "Ingredient Parser"
+msgstr "Анализатор ингредиентов"
 
-#: src/dialogs/setupdisplay.cpp:432
-msgid "Show"
-msgstr "Показать"
+#: src/dialogs/ingredientparserdialog.cpp:58
+#: src/dialogs/ingredientparserdialog.cpp:103
+#: src/dialogs/recipeinputdialog.cpp:345 src/widgets/ingredientlistview.cpp:109
+#: src/widgets/ingredientlistview.cpp:246
+msgid "Ingredient"
+msgstr "Ингредиент"
 
-#: src/dialogs/setupdisplay.cpp:456
-msgid "Alignment"
-msgstr "Выравнивание"
+#: src/dialogs/ingredientparserdialog.cpp:61
+#: src/dialogs/ingredientparserdialog.cpp:106
+#: src/dialogs/recipeinputdialog.cpp:349 src/widgets/prepmethodlistview.cpp:57
+msgid "Preparation Method"
+msgstr "Метод приготовления"
 
-#: src/dialogs/setupdisplay.cpp:462
-msgid "Border..."
-msgstr "Граница..."
+#: src/dialogs/ingredientparserdialog.cpp:80
+#: src/dialogs/ingredientparserdialog.cpp:87
+msgid "Set &Header"
+msgstr "Задать &заголовок"
 
-#: src/dialogs/setupdisplay.cpp:465
-msgid "Columns..."
+#: src/dialogs/ingredientparserdialog.cpp:81
+msgid ""
+"If an ingredient header is detected as an ingredient, select it and click "
+"this button so that Krecipes will recognize it as a header.  All the "
+"ingredients below the header will be included within that group.\n"
+"\n"
+"Alternatively, if you select multiple ingredients and click this button, "
+"those ingredients will be grouped together."
 msgstr ""
 
-#: src/dialogs/setupdisplay.cpp:509
-msgid "Select the number of columns to use:"
+#: src/dialogs/ingredientparserdialog.cpp:100
+msgid ""
+"To use: Paste a list of ingredient below, click \"Parse Text\", and then you "
+"may correct any incorrectly parsed ingredients.<br><b>Caution: Fields will "
+"be truncated if longer than the database allows</b>"
 msgstr ""
 
-#: src/dialogs/shoppinglistdialog.cpp:66
-msgid "Full recipe list"
-msgstr "Полный список рецептов"
+#: src/dialogs/ingredientparserdialog.cpp:101
+msgid "Ingredients as understood by Krecipes:"
+msgstr ""
 
-#: src/dialogs/shoppinglistdialog.cpp:97
-#: src/dialogs/shoppinglistviewdialog.cpp:58
-#: src/dialogs/shoppinglistviewdialog.cpp:60 src/krecipesview.cpp:319
-#: src/krecipesview.cpp:352
-msgid "Shopping List"
-msgstr "Список покупок"
+#: src/dialogs/ingredientparserdialog.cpp:102
+msgid "Parse Text"
+msgstr ""
 
-#: src/dialogs/selectauthorsdialog.cpp:64 src/widgets/authorlistview.cpp:57
-#: src/widgets/authorlistview.cpp:234
-msgid "Author"
-msgstr "Автор"
+#: src/dialogs/ingredientsdialog.cpp:105
+msgid "Ingredient list"
+msgstr "Перечень ингредиентов"
 
-#: src/dialogs/selectauthorsdialog.cpp:114 src/widgets/authorlistview.cpp:189
-msgid "Author name cannot be longer than %1 characters."
-msgstr "Имя автора не может быть больше %1 символов."
+#: src/dialogs/ingredientsdialog.cpp:148
+msgid "Unit list"
+msgstr "Список единиц"
 
-#: src/dialogs/dietviewdialog.cpp:23
-msgid "Create &Shopping List"
-msgstr "Создать &список покупок"
+#: src/dialogs/ingredientsdialog.cpp:149 src/dialogs/ingredientsdialog.cpp:186
+#: src/dialogs/recipeinputdialog.cpp:348 src/dialogs/unitsdialog.cpp:60
+#: src/krecipesview.cpp:322 src/krecipesview.cpp:378 src/pref.cpp:496
+#: src/widgets/propertylistview.cpp:118
+msgid "Units"
+msgstr "Единицы"
 
-#: src/dialogs/dietviewdialog.cpp:51 src/dialogs/dietviewdialog.cpp:70
-msgid "Diet"
-msgstr "Диета"
+#: src/dialogs/ingredientsdialog.cpp:181
+msgid "Ingredient Properties"
+msgstr "Свойства ингредиента"
 
-#: src/dialogs/dietviewdialog.cpp:90
-#, c-format
-msgid "Day %1"
-msgstr "День %1"
+#: src/dialogs/ingredientsdialog.cpp:184
+#: src/dialogs/selectpropertydialog.cpp:47 src/widgets/propertylistview.cpp:117
+#: src/widgets/propertylistview.cpp:257
+msgid "Property"
+msgstr "Свойство"
 
-#: src/dialogs/conversiondialog.cpp:62
-#: src/dialogs/createingredientweightdialog.cpp:69
-#: src/widgets/weightinput.cpp:24
+#: src/dialogs/ingredientsdialog.cpp:213 src/widgets/unitlistview.cpp:241
 #, fuzzy
-msgid "-No Preparation-"
-msgstr "Простота приготовления"
+msgid "Ingredient Weights"
+msgstr "Перечень ингредиентов"
 
-#: src/dialogs/createingredientweightdialog.cpp:86
+#: src/dialogs/ingredientsdialog.cpp:214
 #, fuzzy
-msgid "New Ingredient Weight"
-msgstr "Новый ингрежиент"
+msgid "Weight"
+msgstr "&Высота:"
 
-#: src/dialogs/createingredientweightdialog.cpp:87
+#: src/dialogs/ingredientsdialog.cpp:215
 #, fuzzy
-msgid "Per Amount:"
-msgstr "Количество:"
+msgid "Per Amount"
+msgstr "Количество"
 
-#: src/dialogs/createingredientweightdialog.cpp:88
-#, fuzzy
-msgid "Weight:"
-msgstr "&Высота:"
+#: src/dialogs/ingredientsdialog.cpp:252
+msgid "Load USDA data"
+msgstr "Загрузить данные USDA"
 
-#: src/dialogs/createingredientweightdialog.cpp:94
-#: src/dialogs/createingredientweightdialog.cpp:101
-#: src/widgets/ingredientinputwidget.cpp:277
-msgid "Amount field contains invalid input."
+#: src/dialogs/ingredientsdialog.cpp:267
+msgid "Headers"
+msgstr "Заголовки"
+
+#: src/dialogs/ingredientsdialog.cpp:369
+msgid ""
+"Recipes may require this information for nutrient analysis. Are you sure you "
+"want to delete this entry?"
 msgstr ""
 
-#: src/dialogs/createingredientweightdialog.cpp:95
-#: src/dialogs/createingredientweightdialog.cpp:102
-#: src/dialogs/resizerecipedialog.cpp:162
-#: src/dialogs/resizerecipedialog.cpp:171
-#: src/widgets/ingredientinputwidget.cpp:278
-msgid "Invalid input"
-msgstr "Недопустимый ввод"
+#: src/dialogs/ingredientsdialog.cpp:456
+msgid "Unit Exists"
+msgstr "Единица существует"
 
-#: src/dialogs/selectpropertydialog.cpp:22
-#: src/dialogs/selectpropertydialog.cpp:33
-msgid "Choose Property"
-msgstr "Выберите свойство"
+#: src/dialogs/ingredientsdialog.cpp:456
+msgid "The ingredient contains already the unit that you have chosen."
+msgstr "Ингредиент уже содержит эти единицы."
 
-#: src/dialogs/selectpropertydialog.cpp:55
-msgid "Per units:"
-msgstr "Единицы:"
+#: src/dialogs/ingredientsdialog.cpp:484 src/dialogs/recipeimportdialog.cpp:38
+#: src/krecipesview.cpp:444 src/recipeactionshandler.cpp:235
+#: src/recipeactionshandler.cpp:246 src/widgets/authorlistview.cpp:125
+#: src/widgets/categorylistview.cpp:399 src/widgets/headerlistview.cpp:123
+#: src/widgets/ingredientlistview.cpp:170
+#: src/widgets/prepmethodlistview.cpp:118 src/widgets/unitlistview.cpp:229
+msgid "Recipes"
+msgstr "Рецепты"
 
-#: src/dialogs/recipeinputdialog.cpp:1509
-#: src/dialogs/recipeinputdialog.cpp:1523
-#: src/dialogs/recipeinputdialog.cpp:1526
-#: src/dialogs/recipeinputdialog.cpp:1529
-#: src/dialogs/recipeinputdialog.cpp:1532
-#: src/dialogs/selectpropertydialog.cpp:110
-#: src/dialogs/selectunitdialog.cpp:69
-msgid "-No unit-"
+#: src/dialogs/ingredientsdialog.cpp:490 src/dialogs/setupdisplay.cpp:124
+#: src/krecipesview.cpp:321 src/krecipesview.cpp:373
+#: src/widgets/unitlistview.cpp:235
+#, fuzzy
+msgid "Properties"
+msgstr "Свойство"
+
+#: src/dialogs/ingredientsdialog.cpp:500 src/widgets/headerlistview.cpp:126
+#: src/widgets/ingredientlistview.cpp:173
+#: src/widgets/prepmethodlistview.cpp:120 src/widgets/unitlistview.cpp:250
+msgid "You are about to permanantly delete recipes from your database."
 msgstr ""
 
+#: src/dialogs/ingredientsdialog.cpp:598
+msgid "Property Exists"
+msgstr "Свойство существует"
+
+#: src/dialogs/ingredientsdialog.cpp:598
+msgid ""
+"The property you tried to add already exists in the ingredient with the same "
+"per units."
+msgstr "Это свойство уже присутствует в ингредиенте с теми же единицами."
+
+#: src/dialogs/ingredientsdialog.cpp:699
+msgid "No ingredient selected."
+msgstr "Нет выделенных ингредиентов."
+
 #: src/dialogs/pagesetupdialog.cpp:53
 msgid "Styles"
 msgstr "Стили"
@@ -596,6 +3084,10 @@ msgstr ""
 msgid "Save and Close"
 msgstr "Сохранить и закрыть"
 
+#: src/dialogs/pagesetupdialog.cpp:88
+msgid "&Cancel"
+msgstr ""
+
 #: src/dialogs/pagesetupdialog.cpp:142
 msgid ""
 "The recipe view layout has been modified.\n"
@@ -633,79 +3125,18 @@ msgid ""
 "Would you like to select another file?"
 msgstr ""
 
-#: src/dialogs/resizerecipedialog.cpp:42
-msgid "Resize Recipe"
-msgstr "Изменить размер рецепта"
-
-#: src/dialogs/resizerecipedialog.cpp:127
-#, fuzzy
-msgid "Scale by yield"
-msgstr "Умножить на количество порций"
-
-#: src/dialogs/resizerecipedialog.cpp:128
-msgid "New yield:"
-msgstr ""
-
-#: src/dialogs/resizerecipedialog.cpp:129
-#, fuzzy
-msgid "Current yield:"
-msgstr "Текущие порции:"
-
-#: src/dialogs/resizerecipedialog.cpp:130
-msgid "Scale by factor"
-msgstr "Умножить на коэфициент"
-
-#: src/dialogs/resizerecipedialog.cpp:131
-msgid "Factor (i.e. 1/2 to half, 3 to triple):"
-msgstr "Коэфициент:"
-
-#: src/dialogs/resizerecipedialog.cpp:153
-#, fuzzy
-msgid "Unable to scale a recipe with zero yield"
-msgstr "Ноль порций."
-
-#: src/dialogs/editratingdialog.cpp:57 src/dialogs/editratingdialog.cpp:69
-msgid "Rating"
-msgstr "Рейтинг"
-
-#: src/dialogs/editratingdialog.cpp:148
-msgid "Criteria:"
-msgstr ""
-
-#: src/dialogs/editratingdialog.cpp:149
-#, fuzzy
-msgid "Stars:"
-msgstr "Поиск:"
-
-#: src/dialogs/editratingdialog.cpp:154
-msgid "Comments:"
-msgstr "Комментарии:"
-
-#: src/dialogs/editratingdialog.cpp:155
-#, fuzzy
-msgid "Rater:"
-msgstr "Заголовок:"
-
-#: src/dialogs/recipeprintpreview.cpp:22
-#, fuzzy
-msgid "Print Preview"
-msgstr "Предварительный просмотр"
-
-#: src/dialogs/recipeprintpreview.cpp:27
-msgid "&Print"
-msgstr "&Печать"
-
-#: src/dialogs/unitsdialog.cpp:63
-msgid "Mass Conversions"
-msgstr ""
+#: src/dialogs/recipeimportdialog.cpp:29
+msgid "Import Recipes"
+msgstr "Импортировать рецепты"
 
-#: src/dialogs/unitsdialog.cpp:66
-msgid "Volume Conversions"
-msgstr ""
+#: src/dialogs/recipeimportdialog.cpp:61
+msgid "All (%1)"
+msgstr "Все (%1)"
 
-#: src/dialogs/unitsdialog.cpp:174
-msgid "Finding Unit Ratios"
-msgstr "Поиск отношений единиц"
+#: src/dialogs/recipeimportdialog.cpp:96 src/dialogs/recipeimportdialog.cpp:97
+#: src/widgets/recipelistview.cpp:31
+msgid "Uncategorized"
+msgstr "Некатегоризировано"
 
 #: src/dialogs/recipeinputdialog.cpp:161
 msgid "Select photo"
@@ -719,6 +3150,13 @@ msgstr "Очистить фотографию"
 msgid "Recipe Name"
 msgstr "Название рецепта"
 
+#: src/dialogs/recipeinputdialog.cpp:217
+#: src/dialogs/selectcategoriesdialog.cpp:28 src/dialogs/setupdisplay.cpp:122
+#: src/exporters/htmlexporter.cpp:329 src/exporters/plaintextexporter.cpp:84
+#: src/krecipesview.cpp:324 src/krecipesview.cpp:388
+msgid "Categories"
+msgstr "Категории"
+
 #: src/dialogs/recipeinputdialog.cpp:245 src/widgets/unitlistview.cpp:120
 msgid "Type"
 msgstr "Тип"
@@ -744,20 +3182,6 @@ msgstr "Удалить ингредиент"
 msgid "Paste Ingredients"
 msgstr "Ингредиенты"
 
-#: src/dialogs/ingredientparserdialog.cpp:58
-#: src/dialogs/ingredientparserdialog.cpp:103
-#: src/dialogs/recipeinputdialog.cpp:345
-#: src/widgets/ingredientlistview.cpp:109
-#: src/widgets/ingredientlistview.cpp:246
-msgid "Ingredient"
-msgstr "Ингредиент"
-
-#: src/dialogs/ingredientparserdialog.cpp:61
-#: src/dialogs/ingredientparserdialog.cpp:106
-#: src/dialogs/recipeinputdialog.cpp:349 src/widgets/prepmethodlistview.cpp:57
-msgid "Preparation Method"
-msgstr "Метод приготовления"
-
 #: src/dialogs/recipeinputdialog.cpp:361
 #, fuzzy
 msgid "Property Status:"
@@ -796,6 +3220,10 @@ msgstr "Сохранить рецепт"
 msgid "Show recipe"
 msgstr "Показать рецепт"
 
+#: src/dialogs/recipeinputdialog.cpp:451
+msgid "Close"
+msgstr ""
+
 #: src/dialogs/recipeinputdialog.cpp:453
 msgid "Resize recipe"
 msgstr "Изменить размер рецепта"
@@ -852,8 +3280,8 @@ msgstr ""
 
 #: src/dialogs/recipeinputdialog.cpp:1220
 msgid ""
-"This recipe has changes that will not be displayed unless the recipe is saved. "
-"Would you like to save it now?"
+"This recipe has changes that will not be displayed unless the recipe is "
+"saved. Would you like to save it now?"
 msgstr ""
 
 #: src/dialogs/recipeinputdialog.cpp:1241
@@ -868,10 +3296,20 @@ msgstr ""
 msgid "<b>%3:</b> Unit conversion missing for conversion from '%1' to '%2'"
 msgstr ""
 
+#: src/dialogs/recipeinputdialog.cpp:1509
+#: src/dialogs/recipeinputdialog.cpp:1523
+#: src/dialogs/recipeinputdialog.cpp:1526
+#: src/dialogs/recipeinputdialog.cpp:1529
+#: src/dialogs/recipeinputdialog.cpp:1532
+#: src/dialogs/selectpropertydialog.cpp:110 src/dialogs/selectunitdialog.cpp:69
+msgid "-No unit-"
+msgstr ""
+
 #: src/dialogs/recipeinputdialog.cpp:1538
 msgid ""
-"<b>%1:</b> Either an appropriate ingredient weight entry is needed, or Krecipes "
-"needs conversion information to perform one of the following conversions: %2"
+"<b>%1:</b> Either an appropriate ingredient weight entry is needed, or "
+"Krecipes needs conversion information to perform one of the following "
+"conversions: %2"
 msgstr ""
 
 #: src/dialogs/recipeinputdialog.cpp:1546
@@ -881,21 +3319,21 @@ msgstr "Нет выделенных ингредиентов."
 
 #: src/dialogs/recipeinputdialog.cpp:1550
 msgid ""
-"<b>%1:</b> There is no ingredient weight entry for when no preparation method "
-"is specified"
+"<b>%1:</b> There is no ingredient weight entry for when no preparation "
+"method is specified"
 msgstr ""
 
 #: src/dialogs/recipeinputdialog.cpp:1552
 msgid ""
-"<b>%1:</b> There is no ingredient weight entry for when prepared in any of the "
-"following manners: %2"
+"<b>%1:</b> There is no ingredient weight entry for when prepared in any of "
+"the following manners: %2"
 msgstr ""
 
 #: src/dialogs/recipeinputdialog.cpp:1555
 msgid ""
-"<b>%1:</b> There is no ingredient weight entry for when prepared in any of the "
-"following manners (defaulting to a weight entry without a preparation method "
-"specified): %2"
+"<b>%1:</b> There is no ingredient weight entry for when prepared in any of "
+"the following manners (defaulting to a weight entry without a preparation "
+"method specified): %2"
 msgstr ""
 
 #: src/dialogs/recipeinputdialog.cpp:1571
@@ -923,534 +3361,722 @@ msgid ""
 "information:"
 msgstr ""
 
-#: src/dialogs/ingredientmatcherdialog.cpp:78
+#: src/dialogs/recipeprintpreview.cpp:22
 #, fuzzy
-msgid "Ingredient (required?)"
-msgstr "Анализатор ингредиентов"
-
-#: src/dialogs/ingredientmatcherdialog.cpp:79
-msgid "Amount Available"
-msgstr ""
+msgid "Print Preview"
+msgstr "Предварительный просмотр"
 
-#: src/dialogs/ingredientmatcherdialog.cpp:86
-#, fuzzy
-msgid "Missing ingredients allowed:"
-msgstr "Недостающие разрешённые ингредиенты:"
+#: src/dialogs/recipeprintpreview.cpp:26 src/krecipesui.rc:14
+#: src/recipeactionshandler.cpp:53
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Изменить..."
 
-#: src/dialogs/ingredientmatcherdialog.cpp:89
-msgid "Any"
-msgstr "Любые"
+#: src/dialogs/recipeprintpreview.cpp:27
+msgid "&Print"
+msgstr "&Печать"
 
-#: src/dialogs/ingredientmatcherdialog.cpp:93
-msgid "Matching Recipes"
-msgstr "Подходящие рецепты"
+#: src/dialogs/recipeviewdialog.cpp:87
+msgid "Opening recipes, please wait..."
+msgstr "Открытие рецепта..."
 
-#: src/dialogs/ingredientmatcherdialog.cpp:104
-msgid "Missing Ingredients"
-msgstr "Недостающие ингредиенты"
+#: src/dialogs/refineshoppinglistdialog.cpp:39
+msgid "&Done"
+msgstr "&Готово"
 
-#: src/dialogs/ingredientmatcherdialog.cpp:115
-msgid "Find matching recipes"
-msgstr "Найти подходящие рецепты"
+#: src/dialogs/refineshoppinglistdialog.cpp:74
+#: src/dialogs/refineshoppinglistdialog.cpp:105
+msgid "Ingredients in Shopping List"
+msgstr "Ингедиеныт в списке покупок"
 
-#: src/dialogs/ingredientmatcherdialog.cpp:319
-#, c-format
+#: src/dialogs/refineshoppinglistdialog.cpp:103
 msgid ""
-"_n: You are missing 1 ingredient for:\n"
-"You are missing %n ingredients for:"
+"On the right are the ingredients needed for the recipes you selected.  You "
+"may now add additional ingredients, remove ingredients you do not need, or "
+"modify the amounts of existing ingredients."
 msgstr ""
-"У вас нет %n ингредиента для:\n"
-"У вас нет %n ингредиентов для:\n"
-"У вас нет %n ингредиентов для:"
 
-#: src/dialogs/borderdialog.cpp:107
-msgid "Requested Border"
+#: src/dialogs/resizerecipedialog.cpp:42
+msgid "Resize Recipe"
+msgstr "Изменить размер рецепта"
+
+#: src/dialogs/resizerecipedialog.cpp:127
+#, fuzzy
+msgid "Scale by yield"
+msgstr "Умножить на количество порций"
+
+#: src/dialogs/resizerecipedialog.cpp:128
+msgid "New yield:"
 msgstr ""
 
-#: src/dialogs/borderdialog.cpp:108
-msgid "Style:"
-msgstr "Стиль:"
+#: src/dialogs/resizerecipedialog.cpp:129
+#, fuzzy
+msgid "Current yield:"
+msgstr "Текущие порции:"
 
-#: src/dialogs/borderdialog.cpp:109
-msgid "Color:"
-msgstr "Цвет:"
+#: src/dialogs/resizerecipedialog.cpp:130
+msgid "Scale by factor"
+msgstr "Умножить на коэфициент"
 
-#: src/dialogs/borderdialog.cpp:110
-msgid "Width:"
-msgstr "Ширина:"
+#: src/dialogs/resizerecipedialog.cpp:131
+msgid "Factor (i.e. 1/2 to half, 3 to triple):"
+msgstr "Коэфициент:"
 
-#: src/dialogs/borderdialog.cpp:182
-msgid "None"
-msgstr "Нет"
+#: src/dialogs/resizerecipedialog.cpp:153
+#, fuzzy
+msgid "Unable to scale a recipe with zero yield"
+msgstr "Ноль порций."
 
-#: src/dialogs/borderdialog.cpp:183
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Dotted"
-msgstr ""
+#: src/dialogs/selectauthorsdialog.cpp:64 src/widgets/authorlistview.cpp:57
+#: src/widgets/authorlistview.cpp:234
+msgid "Author"
+msgstr "Автор"
 
-#: src/dialogs/borderdialog.cpp:184
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Dashed"
-msgstr ""
+#: src/dialogs/selectauthorsdialog.cpp:114 src/widgets/authorlistview.cpp:189
+msgid "Author name cannot be longer than %1 characters."
+msgstr "Имя автора не может быть больше %1 символов."
 
-#: src/dialogs/borderdialog.cpp:185
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Solid"
-msgstr ""
+#: src/dialogs/selectcategoriesdialog.cpp:42
+msgid "&New Category..."
+msgstr "&Создать категорию..."
 
-#: src/dialogs/borderdialog.cpp:186
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Double"
+#: src/dialogs/selectcategoriesdialog.cpp:87
+#: src/widgets/categorylistview.cpp:556
+msgid "Category name cannot be longer than %1 characters."
+msgstr "Имя категории не может быть больше %1 символов."
+
+#: src/dialogs/selectpropertydialog.cpp:22
+#: src/dialogs/selectpropertydialog.cpp:33
+msgid "Choose Property"
+msgstr "Выберите свойство"
+
+#: src/dialogs/selectpropertydialog.cpp:55
+msgid "Per units:"
+msgstr "Единицы:"
+
+#: src/dialogs/selectrecipedialog.cpp:74 src/dialogs/selectrecipedialog.cpp:75
+#: src/widgets/krelistview.cpp:47
+msgid "Search:"
+msgstr "Поиск:"
+
+#: src/dialogs/selectrecipedialog.cpp:98
+msgid "Open Recipe(s)"
+msgstr "Открыть рецепты"
+
+#: src/dialogs/selectrecipedialog.cpp:103
+#: src/dialogs/similarcategoriesdialog.cpp:300 src/krecipesview.cpp:398
+#: src/recipeactionshandler.cpp:214 src/recipeactionshandler.cpp:220
+msgid "Edit Recipe"
+msgstr "Изменить рецепт"
+
+#: src/dialogs/selectrecipedialog.cpp:114
+#, fuzzy
+msgid "Basic"
+msgstr "Базовый"
+
+#: src/dialogs/selectrecipedialog.cpp:117
+#, fuzzy
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: src/dialogs/selectrecipedialog.cpp:119
+msgid "Clear search"
+msgstr "Очистить условие поиска"
+
+#: src/dialogs/selectunitdialog.cpp:20 src/dialogs/selectunitdialog.cpp:26
+msgid "Choose Unit"
+msgstr "Выберите единицы"
+
+#: src/dialogs/setupdisplay.cpp:70 src/dialogs/shoppinglistdialog.cpp:108
+msgid "Recipe Title"
+msgstr "Заголовок рецепта"
+
+#: src/dialogs/setupdisplay.cpp:72
+msgid "Category 1, Category 2, ..."
+msgstr "Категория 1, Категория 2, ..."
+
+#: src/dialogs/setupdisplay.cpp:76
+msgid "Author 1, Author 2, ..."
+msgstr "Автор 1, Автор 2, ..."
+
+#: src/dialogs/setupdisplay.cpp:79
+msgid "Ingredient 1"
+msgstr "Ингредиент 1"
+
+#: src/dialogs/setupdisplay.cpp:82
+msgid "Ingredient 2"
+msgstr "Ингредиент 2"
+
+#: src/dialogs/setupdisplay.cpp:90 src/widgets/ratingdisplaywidget.ui:113
+#, fuzzy, no-c-format
+msgid "Rater"
+msgstr "Категория"
+
+#: src/dialogs/setupdisplay.cpp:91
+msgid "Comment"
+msgstr "Комментарий"
+
+#: src/dialogs/setupdisplay.cpp:93
+msgid "Criteria 1"
 msgstr ""
 
-#: src/dialogs/borderdialog.cpp:187
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Groove"
+#: src/dialogs/setupdisplay.cpp:97
+msgid "Criteria 2"
 msgstr ""
 
-#: src/dialogs/borderdialog.cpp:188
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Ridge"
+#: src/dialogs/setupdisplay.cpp:102
+msgid "Property 1"
+msgstr "Свойство 1"
+
+#: src/dialogs/setupdisplay.cpp:104
+msgid "Property 2"
+msgstr "Свойство 2"
+
+#: src/dialogs/setupdisplay.cpp:116
+msgid "Background"
+msgstr "Фон"
+
+#: src/dialogs/setupdisplay.cpp:120
+msgid "Photo"
+msgstr "Снимок"
+
+#: src/dialogs/setupdisplay.cpp:197
+msgid "\"%1\" at line %2, column %3.  This may not be a Krecipes layout file."
+msgstr "\"%1\" в строке %2, столбце %3.  Возможно, это не файл Krecipes."
+
+#: src/dialogs/setupdisplay.cpp:423
+msgid "Background Color..."
+msgstr "Цвет фона..."
+
+#: src/dialogs/setupdisplay.cpp:426
+msgid "Text Color..."
+msgstr "Цвет текста..."
+
+#: src/dialogs/setupdisplay.cpp:429
+msgid "Font..."
+msgstr "Шрифт..."
+
+#: src/dialogs/setupdisplay.cpp:432
+msgid "Show"
+msgstr "Показать"
+
+#: src/dialogs/setupdisplay.cpp:442 src/dialogs/setupdisplay.cpp:572
+msgid "Center"
 msgstr ""
 
-#: src/dialogs/borderdialog.cpp:189
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Inset"
+#: src/dialogs/setupdisplay.cpp:443 src/dialogs/setupdisplay.cpp:574
+#, fuzzy
+msgid "Left"
+msgstr "Слева:"
+
+#: src/dialogs/setupdisplay.cpp:444 src/dialogs/setupdisplay.cpp:576
+#, fuzzy
+msgid "Right"
+msgstr "Справа:"
+
+#: src/dialogs/setupdisplay.cpp:456
+msgid "Alignment"
+msgstr "Выравнивание"
+
+#: src/dialogs/setupdisplay.cpp:462
+msgid "Border..."
+msgstr "Граница..."
+
+#: src/dialogs/setupdisplay.cpp:465
+msgid "Columns..."
 msgstr ""
 
-#: src/dialogs/borderdialog.cpp:190
-msgid ""
-"_: See http://krecipes.sourceforge.net/bordertypes.png for an example\n"
-"Outset"
+#: src/dialogs/setupdisplay.cpp:509
+msgid "Select the number of columns to use:"
 msgstr ""
 
-#: src/dialogs/borderdialog.cpp:205
-msgid "Border Preview"
+#: src/dialogs/shoppinglistdialog.cpp:66
+msgid "Full recipe list"
+msgstr "Полный список рецептов"
+
+#: src/dialogs/shoppinglistdialog.cpp:97
+#: src/dialogs/shoppinglistviewdialog.cpp:58
+#: src/dialogs/shoppinglistviewdialog.cpp:60 src/krecipesview.cpp:319
+#: src/krecipesview.cpp:352
+msgid "Shopping List"
+msgstr "Список покупок"
+
+#: src/dialogs/shoppinglistdialog.cpp:127
+msgid "&OK"
 msgstr ""
 
-#: src/dialogs/ingredientparserdialog.cpp:37
-msgid "Ingredient Parser"
-msgstr "Анализатор ингредиентов"
+#: src/dialogs/similarcategoriesdialog.cpp:137
+msgid "Similar Categories"
+msgstr "Подобные категории"
 
-#: src/dialogs/createunitdialog.cpp:22 src/dialogs/createunitdialog.cpp:34
-#: src/dialogs/ingredientparserdialog.cpp:60
-#: src/dialogs/ingredientparserdialog.cpp:105
-#: src/dialogs/refineshoppinglistdialog.cpp:76
-#: src/dialogs/refineshoppinglistdialog.cpp:107
-#: src/dialogs/selectunitdialog.cpp:37 src/widgets/unitlistview.cpp:116
-msgid "Unit"
-msgstr "Единица"
+#: src/dialogs/similarcategoriesdialog.cpp:138
+msgid "Threshold:"
+msgstr "Порог:"
 
-#: src/dialogs/ingredientparserdialog.cpp:80
-#: src/dialogs/ingredientparserdialog.cpp:87
-msgid "Set &Header"
-msgstr "Задать &заголовок"
+#: src/dialogs/similarcategoriesdialog.cpp:139
+msgid "Category:"
+msgstr "Категория:"
 
-#: src/dialogs/ingredientparserdialog.cpp:81
-msgid ""
-"If an ingredient header is detected as an ingredient, select it and click this "
-"button so that Krecipes will recognize it as a header.  All the ingredients "
-"below the header will be included within that group.\n"
-"\n"
-"Alternatively, if you select multiple ingredients and click this button, those "
-"ingredients will be grouped together."
-msgstr ""
+#: src/dialogs/similarcategoriesdialog.cpp:140
+msgid "Search"
+msgstr "Поиск"
 
-#: src/dialogs/ingredientparserdialog.cpp:100
-msgid ""
-"To use: Paste a list of ingredient below, click \"Parse Text\", and then you "
-"may correct any incorrectly parsed ingredients."
-"<br><b>Caution: Fields will be truncated if longer than the database allows</b>"
-msgstr ""
+#: src/dialogs/similarcategoriesdialog.cpp:141
+msgid "Similar Categories:"
+msgstr "Подобные категории:"
 
-#: src/dialogs/ingredientparserdialog.cpp:101
-msgid "Ingredients as understood by Krecipes:"
+#: src/dialogs/similarcategoriesdialog.cpp:142
+msgid "<<"
+msgstr "<<"
+
+#: src/dialogs/similarcategoriesdialog.cpp:143
+msgid ">>"
+msgstr ">>"
+
+#: src/dialogs/similarcategoriesdialog.cpp:144
+msgid "Categories to Merge:"
+msgstr "Объединяемые категории:"
+
+#: src/dialogs/similarcategoriesdialog.cpp:145
+msgid "Merge"
+msgstr "Объединить"
+
+#: src/dialogs/similarcategoriesdialog.cpp:146
+msgid "Cancel"
 msgstr ""
 
-#: src/dialogs/ingredientparserdialog.cpp:102
-msgid "Parse Text"
+#: src/dialogs/similarcategoriesdialog.cpp:148
+#: src/dialogs/similarcategoriesdialog.cpp:150
+#: src/widgets/categorylistview.cpp:302 src/widgets/categorylistview.cpp:568
+msgid "Category"
+msgstr "Категория"
+
+#: src/dialogs/similarcategoriesdialog.cpp:271
+msgid "Please select only one category."
 msgstr ""
 
-#: src/dialogs/refineshoppinglistdialog.cpp:39
-msgid "&Done"
-msgstr "&Готово"
+#: src/dialogs/similarcategoriesdialog.cpp:300 src/recipeactionshandler.cpp:220
+#: src/recipeactionshandler.cpp:252
+msgid "No recipes selected."
+msgstr "Нет выделенных рецептов."
 
-#: src/dialogs/refineshoppinglistdialog.cpp:74
-#: src/dialogs/refineshoppinglistdialog.cpp:105
-msgid "Ingredients in Shopping List"
-msgstr "Ингедиеныт в списке покупок"
+#: src/dialogs/similarcategoriesdialog.cpp:331
+msgid "No categories selected to merge."
+msgstr "Нет выделенных категорий."
 
-#: src/dialogs/refineshoppinglistdialog.cpp:103
-msgid ""
-"On the right are the ingredients needed for the recipes you selected.  You may "
-"now add additional ingredients, remove ingredients you do not need, or modify "
-"the amounts of existing ingredients."
+#: src/dialogs/unitsdialog.cpp:63
+msgid "Mass Conversions"
 msgstr ""
 
-#: src/dialogs/selectcategoriesdialog.cpp:42
-msgid "&New Category..."
-msgstr "&Создать категорию..."
+#: src/dialogs/unitsdialog.cpp:66
+msgid "Volume Conversions"
+msgstr ""
 
-#: src/dialogs/selectcategoriesdialog.cpp:87
-#: src/widgets/categorylistview.cpp:556
-msgid "Category name cannot be longer than %1 characters."
-msgstr "Имя категории не может быть больше %1 символов."
+#: src/dialogs/unitsdialog.cpp:174
+msgid "Finding Unit Ratios"
+msgstr "Поиск отношений единиц"
 
-#: src/dialogs/recipeviewdialog.cpp:87
-msgid "Opening recipes, please wait..."
-msgstr "Открытие рецепта..."
+#: src/dialogs/usdadatadialog.cpp:39
+msgid "Load ingredient properties for: \"%1\""
+msgstr "Загрузить свойства ингредиента для: \"%1\""
 
-#: src/dialogs/conversiondialog.cpp:34
-msgid "Measurement Converter"
-msgstr ""
+#: src/dialogs/usdadatadialog.cpp:43
+msgid "&Load"
+msgstr "&Загрузить"
 
-#: src/dialogs/conversiondialog.cpp:39 src/dialogs/conversiondialog.cpp:94
-msgid "Convert"
+#: src/dialogs/usdadatadialog.cpp:48
+msgid "USDA Ingredient"
+msgstr "Ингредиент USDA"
+
+#: src/exporters/htmlexporter.cpp:130
+msgid ""
+"<html><body>\n"
+"<p><b>Error: </b>Unable to find a layout file, which is needed to view the "
+"recipe.</p><p>Krecipes was probably not properly installed.</p></body></html>"
 msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:59
+#: src/exporters/htmlexporter.cpp:162
+msgid "Krecipes Recipes"
+msgstr "Krecipes"
+
+#: src/exporters/htmlexporter.cpp:396 src/exporters/htmlexporter.cpp:419
+#: src/exporters/plaintextexporter.cpp:116
+#: src/exporters/plaintextexporter.cpp:126
+msgid "or"
+msgstr "OR"
+
+#: src/exporters/htmlexporter.cpp:520
+msgid "Overall Rating"
+msgstr "Общий рейтинг"
+
+#: src/exporters/plaintextexporter.cpp:90
 #, fuzzy
-msgid "--Ingredient (optional)--"
-msgstr "Свойства ингредиента"
+msgid "Yields"
+msgstr "Порций"
 
-#: src/dialogs/conversiondialog.cpp:95
-msgid "To"
+#: src/exporters/plaintextexporter.cpp:153
+#, c-format
+msgid ""
+"_n: 1 star\n"
+"%n stars"
 msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:96 src/dialogs/conversiondialog.cpp:136
-#, fuzzy
-msgid "<b>Result:</b>"
-msgstr "<b>Список</b>"
+#: src/exporters/recipemlexporter.cpp:140
+msgid "Total"
+msgstr "Всего"
 
-#: src/dialogs/conversiondialog.cpp:140
-#, fuzzy
-msgid "<b>Approximated result:</b>"
-msgstr "<b>Список</b>"
+#: src/importers/baseimporter.cpp:99 src/importers/baseimporter.cpp:124
+msgid "Importing selected recipes"
+msgstr "Импортирование выбранных рецептов"
 
-#: src/dialogs/conversiondialog.cpp:144 src/dialogs/conversiondialog.cpp:148
-#: src/dialogs/conversiondialog.cpp:152 src/dialogs/conversiondialog.cpp:156
-#: src/dialogs/conversiondialog.cpp:160
-msgid "<b>Error:</b>"
+#: src/importers/baseimporter.cpp:127
+msgid "%v/%m Recipes"
+msgstr "%v/%m"
+
+#: src/importers/baseimporter.cpp:221
+msgid "All recipes up unto this point have been successfully imported."
 msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:145
-msgid "Missing unit conversion"
+#: src/importers/baseimporter.cpp:230
+#, c-format
+msgid "Importing recipe: %1"
+msgstr "Импортирование рецепта: %1"
+
+#: src/importers/baseimporter.cpp:388
+msgid ""
+"<!doc>Import of recipes from the file <b>\"%1\"</b> <b>failed</b> due to the "
+"following error(s):"
 msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:149
-#, fuzzy
-msgid "No ingredient weight available"
-msgstr "Нет выделенных ингредиентов."
+#: src/importers/baseimporter.cpp:394
+msgid "The file <b>%1</b> generated the following warning(s):"
+msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:153
-#, fuzzy
-msgid "No ingredient weight available for this method of preparation"
-msgstr "Нет выделенных ингредиентов."
+#: src/importers/kreimporter.cpp:50
+msgid "Archive does not contain a valid Krecipes file"
+msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:157
-msgid "Ingredient required for conversion"
+#: src/importers/kreimporter.cpp:71
+msgid "\"%1\" at line %2, column %3"
 msgstr ""
 
-#: src/dialogs/conversiondialog.cpp:161
-msgid "Impossible unit conversion based on unit types"
+#: src/importers/kreimporter.cpp:78
+msgid "This file does not appear to be a *.kreml file"
 msgstr ""
 
-#: src/dialogs/recipeimportdialog.cpp:29
-msgid "Import Recipes"
-msgstr "Импортировать рецепты"
+#: src/importers/kreimporter.cpp:84
+#, c-format
+msgid "KreML version %1"
+msgstr ""
 
-#: src/dialogs/recipeimportdialog.cpp:61
-msgid "All (%1)"
-msgstr "Все (%1)"
+#: src/importers/mmfimporter.cpp:70 src/importers/mxpimporter.cpp:54
+#: src/importers/rezkonvimporter.cpp:52
+msgid "No recipes found in this file."
+msgstr "Нет рецептов в этом файле."
 
-#: src/dialogs/recipeimportdialog.cpp:96 src/dialogs/recipeimportdialog.cpp:97
-#: src/widgets/recipelistview.cpp:31
-msgid "Uncategorized"
-msgstr "Некатегоризировано"
+#: src/importers/mmfimporter.cpp:73 src/importers/mx2importer.cpp:86
+#: src/importers/mxpimporter.cpp:57 src/importers/nycgenericimporter.cpp:47
+#: src/importers/recipemlimporter.cpp:65 src/importers/rezkonvimporter.cpp:55
+msgid "Unable to open file."
+msgstr "Невозможно открыть файл."
 
-#: src/dialogs/advancedsearchdialog.cpp:89
-#: src/dialogs/advancedsearchdialog.cpp:293
-msgid "Require All Words"
+#: src/importers/mmfimporter.cpp:137
+msgid ""
+"While loading recipe <b>%1</b> an ingredient line was found after the "
+"directions. While this is valid, it most commonly indicates an incorrectly "
+"formatted recipe."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:93
-#: src/dialogs/advancedsearchdialog.cpp:297
-msgid "Keywords:"
-msgstr "Ключевые слова:"
+#: src/importers/mmfimporter.cpp:305 src/importers/mx2importer.cpp:101
+#: src/importers/mxpimporter.cpp:102 src/importers/mxpimporter.cpp:251
+#, fuzzy
+msgid "servings"
+msgstr "Порядок подачи"
 
-#: src/dialogs/advancedsearchdialog.cpp:111
-msgid "Enter ingredients: (e.g. chicken pasta \"white wine\")"
+#: src/importers/mx2importer.cpp:55
+msgid "\"%1\" at line %2, column %3.  This may not be a *.mx2 file."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:152
-msgid "Enter categories: (e.g. Desserts Pastas \"Main Dishes\")"
+#: src/importers/mx2importer.cpp:63
+msgid "This file does not appear to be a *.mx2 file"
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:193
-msgid "Enter author name (e.g. Smith or \"Jane Doe\")"
+#: src/importers/mxpimporter.cpp:86
+msgid ""
+"While loading recipe \"%1\" the field \"Recipe By:\" is either missing or "
+"could not be detected."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:316 src/widgets/recipelistview.cpp:152
-msgid "Created:"
-msgstr "Создан:"
+#: src/importers/mxpimporter.cpp:106
+msgid ""
+"While loading recipe \"%1\" the field \"Serving Size:\" is either missing or "
+"could not be detected."
+msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:327 src/widgets/recipelistview.cpp:153
-msgid "Modified:"
-msgstr "Изменён:"
+#: src/importers/mxpimporter.cpp:117
+msgid ""
+"While loading recipe \"%1\" the field \"Preparation Time:\" is either "
+"missing or could not be detected."
+msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:338 src/widgets/recipelistview.cpp:154
-msgid "Last Accessed:"
+#: src/importers/mxpimporter.cpp:161
+msgid ""
+"While loading recipe \"%1\" the field \"Categories:\" is either missing or "
+"could not be detected."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:417
-msgid "Criterion"
+#: src/importers/mxpimporter.cpp:188
+msgid "While loading recipe \"%1\" Invalid amount \"%2\" in the line \"%3\""
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:542
-msgid "Search using the following criteria:"
+#: src/importers/mxpimporter.cpp:352
+msgid ""
+"MasterCook's Generic Export format is currently not supported.  Please write "
+"to jkivlighn@gmail.com to request support for this format."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:544
-msgid "Uses any of:"
+#: src/importers/mxpimporter.cpp:358
+msgid ""
+"MasterCook Mac's Export format is currently not supported.  Please write to "
+"jkivlighn@gmail.com to request support for this format."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:545
-#, fuzzy
-msgid "Uses all:"
-msgstr "Использовать:"
+#: src/importers/nycgenericimporter.cpp:42
+msgid "File does not appear to be a valid NYC export."
+msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:546
-msgid "Without:"
+#: src/importers/recipemlimporter.cpp:37
+msgid "\"%1\" at line %2, column %3.  This may not be a RecipeML file."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:547
-msgid "Categories >>"
-msgstr "Категории >>"
+#: src/importers/recipemlimporter.cpp:44
+msgid "This file does not appear to be a valid RecipeML archive."
+msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:548
-msgid "In all:"
-msgstr "Во всех:"
+#: src/krecipes.cpp:117
+#, fuzzy
+msgid ""
+"Gathering recipe data from file.\n"
+"Please wait..."
+msgstr "Открытие рецепта..."
 
-#: src/dialogs/advancedsearchdialog.cpp:549
-msgid "Not in:"
-msgstr "Отсутствует в:"
+#: src/krecipes.cpp:167
+msgid "Reloa&d"
+msgstr "&Перезагрузить"
 
-#: src/dialogs/advancedsearchdialog.cpp:550
-msgid "In any of:"
-msgstr "В одной из:"
+#: src/krecipes.cpp:169
+msgid "&Edit Recipe"
+msgstr "&Изменить рецепт"
 
-#: src/dialogs/advancedsearchdialog.cpp:552
-msgid "By any of:"
+#: src/krecipes.cpp:173
+msgid "&Measurement Converter"
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:553
+#: src/krecipes.cpp:180
+msgid "&Merge Similar Categories..."
+msgstr ""
+
+#: src/krecipes.cpp:184
 #, fuzzy
-msgid "By all:"
-msgstr "Авторы:"
+msgid "&Merge Similar Ingredients..."
+msgstr "Недостающие ингредиенты"
 
-#: src/dialogs/advancedsearchdialog.cpp:554
-msgid "Not by:"
-msgstr "Кроме авторов:"
+#: src/krecipes.cpp:190
+msgid "&New Recipe"
+msgstr "&Добавить рецепт"
 
-#: src/dialogs/advancedsearchdialog.cpp:556
-#: src/dialogs/advancedsearchdialog.cpp:562
-#: src/widgets/propertylistview.cpp:256
-msgid "Enabled"
-msgstr "Включено"
+#: src/krecipes.cpp:203
+msgid "Import from File..."
+msgstr "Импортировать из файла..."
 
-#: src/dialogs/advancedsearchdialog.cpp:558
-msgid "Yields at least:"
-msgstr "Минимум порций:"
+#: src/krecipes.cpp:207
+msgid "Import from Database..."
+msgstr "Импортировать из базы данных..."
 
-#: src/dialogs/advancedsearchdialog.cpp:559
-msgid "Yields at most:"
-msgstr "Максимум порций:"
+#: src/krecipes.cpp:211
+msgid "Export..."
+msgstr "Экспортировать..."
 
-#: src/dialogs/advancedsearchdialog.cpp:560
-msgid "Yields about:"
-msgstr "Примерно порций:"
+#: src/krecipes.cpp:215 src/recipeactionshandler.cpp:64
+msgid "&Copy to Clipboard"
+msgstr "&Скопировать в буфер обмена"
 
-#: src/dialogs/advancedsearchdialog.cpp:564
-msgid "Ready in at most:"
-msgstr "Готово не позднее:"
+#: src/krecipes.cpp:220
+msgid "Page Setup..."
+msgstr "Настройка печати..."
 
-#: src/dialogs/advancedsearchdialog.cpp:565
-msgid "Ready in about:"
-msgstr "Готово примерно:"
+#: src/krecipes.cpp:224
+#, fuzzy
+msgid "Print Setup..."
+msgstr "Настройка печати..."
 
-#: src/dialogs/advancedsearchdialog.cpp:567
-msgid "Meta Data"
-msgstr "Метдаданные"
+#: src/krecipes.cpp:228
+msgid "Backup..."
+msgstr "Создать резервную копию..."
 
-#: src/dialogs/advancedsearchdialog.cpp:568
-msgid "C&lear"
-msgstr "&Очистить"
+#: src/krecipes.cpp:232
+msgid "Restore..."
+msgstr "Восстановить..."
 
-#: src/dialogs/advancedsearchdialog.cpp:569
-msgid "Alt+L"
-msgstr "Alt+L"
+#: src/krecipes.cpp:356
+msgid ""
+"Filter \"%1\" not recognized.\n"
+"Please select one of the provided filters."
+msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:570
-msgid "&Search"
-msgstr "&Поиск"
+#: src/krecipes.cpp:358
+msgid "Unrecognized Filter"
+msgstr "Фильтр нераспознаваем"
 
-#: src/dialogs/advancedsearchdialog.cpp:571
-msgid "By average:"
+#: src/krecipes.cpp:390
+msgid ""
+"NOTE: We recommend that all recipes generating warnings be checked to ensure "
+"that they were properly imported, and no loss of recipe data has occurred."
+"<br><br>"
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:572
-msgid "stars"
-msgstr ""
+#: src/krecipes.cpp:393
+msgid "Import Warnings"
+msgstr "Сообщения импортирования"
 
-#: src/dialogs/advancedsearchdialog.cpp:573
-msgid "By criteria:"
+#: src/krecipes.cpp:458 src/krecipes.cpp:477
+msgid ""
+"The recipe print and view layouts use the same file for their style, meaning "
+"changing one view's look changes them both.  If this is not the behavior you "
+"desire, load one style and save it under a different name."
 msgstr ""
 
-#: src/dialogs/advancedsearchdialog.cpp:574
-msgid "+"
-msgstr "+"
-
-#: src/dialogs/advancedsearchdialog.cpp:877
-msgid "No matching recipes found"
-msgstr "Нет подходящих рецептов"
+#: src/krecipes.cpp:494
+msgid "Save Backup As..."
+msgstr ""
 
-#: src/dialogs/ingredientgroupsdialog.cpp:27
-#, fuzzy
-msgid "Header list"
-msgstr "Заголовок"
+#: src/krecipes.cpp:498 src/recipeactionshandler.cpp:383
+msgid "File \"%1\" exists.  Are you sure you want to overwrite it?"
+msgstr "Файл \"%1\" уже существует. Заменить его?"
 
-#: src/dialogs/createpropertydialog.cpp:18
-#: src/dialogs/createpropertydialog.cpp:34
-msgid "New Property"
-msgstr "Новое свойство"
+#: src/krecipes.cpp:507
+msgid "Backup Failed"
+msgstr ""
 
-#: src/dialogs/createpropertydialog.cpp:36
-msgid "Property name:"
-msgstr "Имя свойства:"
+#: src/krecipes.cpp:514
+msgid "Krecipes Backup File"
+msgstr "Резервная копия Krecipes"
 
-#: src/dialogs/createpropertydialog.cpp:42
-msgid "Units:"
-msgstr "Единицы:"
+#: src/krecipes.cpp:515
+msgid "Restore Backup"
+msgstr "Восстановить из резервной копии"
 
-#: src/dialogs/dependanciesdialog.cpp:56
+#: src/krecipes.cpp:518
 msgid ""
-"<b>WARNING:</b> The following will have to be removed also, since currently "
-"they use the element you have chosen to be removed."
+"<b>Restoring this file will erase ALL data currently in the database!</"
+"b><br /><br />If you want to keep the recipes in your database, click "
+"\"Cancel\" and first export your recipes.  These can then be imported once "
+"the restore is complete.<br /><br />Are you sure you want to proceed?"
 msgstr ""
 
-#: src/dialogs/dependanciesdialog.cpp:59
-msgid ""
-"<b>WARNING:</b> The following currently use the element you have chosen to be "
-"removed."
+#: src/krecipes.cpp:525
+msgid "Restore successful."
 msgstr ""
 
-#: src/dialogs/dependanciesdialog.cpp:91
-#, fuzzy
-msgid "Are you sure you wish to proceed?"
-msgstr "Вы действительно хотите удалить это свойство?"
-
-#: src/dialogs/selectunitdialog.cpp:20 src/dialogs/selectunitdialog.cpp:26
-msgid "Choose Unit"
-msgstr "Выберите единицы"
+#: src/krecipes.cpp:589
+msgid ""
+"A recipe contains unsaved changes.\n"
+"Do you want to save the changes before exiting?"
+msgstr ""
 
-#: src/dialogs/similarcategoriesdialog.cpp:137
-msgid "Similar Categories"
-msgstr "Подобные категории"
+#: src/krecipes.cpp:591
+msgid "Unsaved Changes"
+msgstr "Несохраненные изменения"
 
-#: src/dialogs/similarcategoriesdialog.cpp:138
-msgid "Threshold:"
-msgstr "Порог:"
+#: src/krecipesview.cpp:106 src/krecipesview.cpp:318 src/krecipesview.cpp:348
+msgid "Find/Edit Recipes"
+msgstr "Поиск/Изменение рецептов"
 
-#: src/dialogs/similarcategoriesdialog.cpp:139
-msgid "Category:"
-msgstr "Категория:"
+#: src/krecipesview.cpp:133
+msgid "Data"
+msgstr "Данные"
 
-#: src/dialogs/similarcategoriesdialog.cpp:140
-msgid "Search"
-msgstr "Поиск"
+#: src/krecipesview.cpp:302
+msgid ""
+"\n"
+"Would you like to run the setup wizard again? Otherwise, the application "
+"will be closed."
+msgstr ""
 
-#: src/dialogs/similarcategoriesdialog.cpp:141
-msgid "Similar Categories:"
-msgstr "Подобные категории:"
+#: src/krecipesview.cpp:308
+msgid "Exiting"
+msgstr "Выход"
 
-#: src/dialogs/similarcategoriesdialog.cpp:142
-msgid "<<"
-msgstr "<<"
+#: src/krecipesview.cpp:323 src/krecipesview.cpp:383
+msgid "Preparation Methods"
+msgstr "Методы приготовления"
 
-#: src/dialogs/similarcategoriesdialog.cpp:143
-msgid ">>"
-msgstr ">>"
+#: src/krecipesview.cpp:326 src/krecipesview.cpp:357
+msgid "Diet Helper"
+msgstr "Помощник по диетам"
 
-#: src/dialogs/similarcategoriesdialog.cpp:144
-msgid "Categories to Merge:"
-msgstr "Объединяемые категории:"
+#: src/krecipesview.cpp:327 src/krecipesview.cpp:362
+msgid "Ingredient Matcher"
+msgstr "Сопоставление ингредиентов"
 
-#: src/dialogs/similarcategoriesdialog.cpp:145
-msgid "Merge"
-msgstr "Объединить"
+#: src/krecipesview.cpp:402
+msgid "View Recipe"
+msgstr "Просмотреть рецепт"
 
-#: src/dialogs/similarcategoriesdialog.cpp:148
-#: src/dialogs/similarcategoriesdialog.cpp:150
-#: src/widgets/categorylistview.cpp:302 src/widgets/categorylistview.cpp:568
-msgid "Category"
-msgstr "Категория"
+#: src/krecipesview.cpp:442 src/krecipesview.cpp:444
+#: src/recipeactionshandler.cpp:237
+msgid "Export Recipe"
+msgstr "Экспортировать рецепт"
 
-#: src/dialogs/similarcategoriesdialog.cpp:271
-msgid "Please select only one category."
+#: src/krecipesview.cpp:460
+msgid ""
+"A recipe contains unsaved changes.\n"
+"Do you want to save changes made to this recipe before editing another "
+"recipe?"
 msgstr ""
 
-#: src/dialogs/similarcategoriesdialog.cpp:300
-#: src/recipeactionshandler.cpp:220 src/recipeactionshandler.cpp:252
-msgid "No recipes selected."
-msgstr "Нет выделенных рецептов."
+#: src/krecipesview.cpp:480
+msgid "Are you sure you want to permanently remove the recipe, %1?"
+msgstr "Удалить рецепт %1?"
 
-#: src/dialogs/similarcategoriesdialog.cpp:331
-msgid "No categories selected to merge."
-msgstr "Нет выделенных категорий."
+#: src/krecipesview.cpp:481
+msgid "Confirm remove"
+msgstr "Подтверждение удаления"
 
-#: src/dialogs/createunitdialog.cpp:22 src/dialogs/createunitdialog.cpp:34
-msgid "New Unit"
-msgstr "Новая единица"
+#: src/krecipesview.cpp:512
+msgid ""
+"A recipe contains unsaved changes.\n"
+"Do you want to save changes made to this recipe before creating a new recipe?"
+msgstr ""
 
-#: src/dialogs/createunitdialog.cpp:36
-msgid "Singular:"
-msgstr "Единственное число:"
+#: src/krecipesview.cpp:665
+msgid "Unable to setup database"
+msgstr "Невозможно настроить базу данных"
 
-#: src/dialogs/createunitdialog.cpp:42 src/dialogs/createunitdialog.cpp:54
-#, fuzzy
-msgid "Abbreviation:"
-msgstr "Аббревиатура"
+#: src/krecipesview.cpp:676
+msgid "Code error. No DB support has been included. Exiting"
+msgstr ""
 
-#: src/dialogs/createunitdialog.cpp:48
-msgid "Plural:"
-msgstr "Множественное число:"
+#: src/krecipesview.cpp:846 src/krecipesview.cpp:872
+msgid "Code error. No DB support was built in. Exiting"
+msgstr ""
 
-#: src/dialogs/createunitdialog.cpp:60
-#, fuzzy
-msgid "Type:"
-msgstr "Тип"
+#: src/krecipesview.cpp:854
+msgid "Unable to open database"
+msgstr "Невозможно открыть базу данных"
 
-#: src/dialogs/createunitdialog.cpp:62 src/widgets/unitlistview.cpp:72
-#: src/widgets/unitlistview.cpp:144
-#, fuzzy
-msgid "Other"
-msgstr "Категория"
+#: src/krecipesview.cpp:877
+msgid "DB started correctly\n"
+msgstr "База данных запущена\n"
 
-#: src/dialogs/createunitdialog.cpp:63 src/widgets/unitlistview.cpp:73
-#: src/widgets/unitlistview.cpp:145
-msgid "Mass"
+#: src/krecipesview.cpp:885
+msgid "The configured database type (%1) is unsupported."
 msgstr ""
 
-#: src/dialogs/createunitdialog.cpp:64 src/widgets/unitlistview.cpp:74
-#: src/widgets/unitlistview.cpp:146
-msgid "Volume"
+#: src/krecipesview.cpp:885
+msgid ""
+"Unsupported database type. Database must be either MySQL, SQLite, or "
+"PostgreSQL."
 msgstr ""
 
 #: src/krepagelayout.cpp:116
@@ -1569,215 +4195,6 @@ msgstr "US Ledger"
 msgid "US Tabloid"
 msgstr "US Tabloid"
 
-#: src/setupwizard.cpp:39
-msgid "Welcome to Krecipes"
-msgstr "Добро пожаловать в Krecipes"
-
-#: src/setupwizard.cpp:42
-msgid "Database Type"
-msgstr "Тип базы данных"
-
-#: src/pref.cpp:57 src/setupwizard.cpp:45 src/setupwizard.cpp:54
-msgid "Server Settings"
-msgstr "Параметры сервера"
-
-#: src/setupwizard.cpp:48 src/setupwizard.cpp:51
-msgid "Database Permissions"
-msgstr "Права доступа к базе данных"
-
-#: src/setupwizard.cpp:57
-msgid "Initialize Database"
-msgstr "Инициализировать базу данных"
-
-#: src/setupwizard.cpp:60
-msgid "Finish & Save Settings"
-msgstr "Окончить и сохранить настройки"
-
-#: src/setupwizard.cpp:130
-msgid ""
-"<b><font size=\"+1\">Thank you very much for choosing Krecipes.</font></b>"
-"<br>It looks like this is the first time you are using it. This wizard will "
-"help you with the initial setup so that you can start using it quickly."
-"<br>"
-"<br>Welcome, and enjoy cooking!"
-msgstr ""
-
-#: src/setupwizard.cpp:162
-msgid ""
-"This dialog will allow you to specify a MySQL account that has the necessary "
-"permissions to access the Krecipes MySQL database."
-"<br>"
-"<br><b><font size=\"+1\">Most users that use Krecipes and MySQL for the first "
-"time can just leave the default parameters and press 'Next'.</font></b> "
-"<br>"
-"<br>If you set a MySQL root password before, or you have already permissions as "
-"normal user, click on the appropriate option. Otherwise the account 'root' will "
-"be used, with no password."
-"<br>"
-"<br>[For security reasons, we strongly encourage you to setup a MySQL root "
-"password if you have not done so yet. Just type as root: mysqladmin password <i>"
-"your_password</i>]"
-msgstr ""
-
-#: src/setupwizard.cpp:174 src/setupwizard.cpp:282
-msgid "I have already set the necessary permissions"
-msgstr ""
-
-#: src/setupwizard.cpp:181
-msgid "I have already set a MySQL root/admin account"
-msgstr ""
-
-#: src/setupwizard.cpp:189
-msgid "MySQL Administrator Account"
-msgstr ""
-
-#: src/setupwizard.cpp:270
-msgid ""
-"This dialog will allow you to specify a PostgreSQL account that has the "
-"necessary permissions to access the Krecipes PostgreSQL database.  This account "
-"may either be a <b>PostgreSQL superuser</b> or have the ability to both <b>"
-"create new PostgreSQL users and databases</b>."
-"<br>"
-"<br>If no superuser or privileged account is given, the account 'postgres' will "
-"be attempted, with no password.  If this is insufficient for your PostgreSQL "
-"setup, you <b>must</b> select the appropriate option below to enter the "
-"information of a privileged PostgreSQL account."
-msgstr ""
-
-#: src/setupwizard.cpp:289
-msgid "I have already set a superuser or privileged account"
-msgstr ""
-
-#: src/setupwizard.cpp:297
-msgid "PostgreSQL Superuser or Privileged Account"
-msgstr ""
-
-#: src/setupwizard.cpp:378
-msgid ""
-"In this dialog you can adjust the database server settings."
-"<br>"
-"<br><b>Warning: Passwords are stored in plain text and could potentially be "
-"compromised.  We recommend that you create a username and password combination "
-"solely for use by Krecipes.</b>"
-msgstr ""
-
-#: src/setupwizard.cpp:446
-msgid "The server is remote"
-msgstr "Удалённый сервер"
-
-#: src/setupwizard.cpp:455
-msgid "Server / Client Settings"
-msgstr "Клиент/Сервер"
-
-#: src/setupwizard.cpp:468
-msgid "Client:"
-msgstr "Клиент:"
-
-#: src/setupwizard.cpp:539
-msgid "In this dialog you can adjust SQLite settings."
-msgstr ""
-
-#: src/setupwizard.cpp:562
-msgid "Open file dialog"
-msgstr "Открыть файл"
-
-#: src/setupwizard.cpp:607
-msgid ""
-"Congratulations; all the necessary configuration setup is done. Press 'Finish' "
-"to continue, and enjoy cooking!"
-msgstr ""
-
-#: src/setupwizard.cpp:699
-msgid ""
-"Krecipes comes with some delicious default recipes and useful data. "
-"<br>"
-"<br>Would you like to initialize your database with those? Note that this will "
-"erase all your previous recipes if you have any. "
-msgstr ""
-
-#: src/setupwizard.cpp:718
-msgid "Yes please, initialize the database with the examples"
-msgstr "Да, заполните базу примерами"
-
-#: src/setupwizard.cpp:724
-msgid ""
-"Krecipes can import nutrient data from the USDA's nutrient database for over "
-"400 foods.  A total of 43 food properties are included for each food, such as "
-"energy, fat, vitamin C, etc."
-"<br>"
-"<br>Would you like to import this data now?  Note that this operation is safe "
-"to use on an existing database, and no data loss will occur.  This operation "
-"may take several minutes."
-msgstr ""
-"Krecipes может импортировать данные о различных продуктах из базы данных USDA с "
-"описнием всего 43 свойств, таких как енергетическая ценность, жирность, "
-"витамины."
-"<br>"
-"<br>Сделать это сейчас? Это может занять несколько минут."
-
-#: src/setupwizard.cpp:730
-msgid ""
-"Yes please, load the database with nutrient data for 400+ foods. (Note: English "
-"only.)"
-msgstr "Да, загрузить данные о более 400 продуктах. (на английском)"
-
-#: src/setupwizard.cpp:767
-msgid ""
-"Choose the type of database that you want to use. Most users will want to "
-"choose a simple local database here. However, you can also use remote servers "
-"by means of a MySQL or PostgreSQL database."
-msgstr ""
-
-#: src/setupwizard.cpp:783
-msgid "Simple Local File (SQLite)"
-msgstr "Локальный файл (SQLite)"
-
-#: src/setupwizard.cpp:784
-msgid "Local or Remote MySQL Database"
-msgstr "Локальная или удалённая база данных MySQL"
-
-#: src/setupwizard.cpp:785
-msgid "Local or Remote PostgreSQL Database"
-msgstr "Локальная или удалённая база данных PostgreSQL"
-
-#: src/exporters/htmlexporter.cpp:130
-msgid ""
-"<html><body>\n"
-"<p><b>Error: </b>Unable to find a layout file, which is needed to view the "
-"recipe.</p>"
-"<p>Krecipes was probably not properly installed.</p></body></html>"
-msgstr ""
-
-#: src/exporters/htmlexporter.cpp:162
-msgid "Krecipes Recipes"
-msgstr "Krecipes"
-
-#: src/exporters/htmlexporter.cpp:396 src/exporters/htmlexporter.cpp:419
-#: src/exporters/plaintextexporter.cpp:116
-#: src/exporters/plaintextexporter.cpp:126
-msgid "or"
-msgstr "OR"
-
-#: src/exporters/htmlexporter.cpp:520
-msgid "Overall Rating"
-msgstr "Общий рейтинг"
-
-#: src/exporters/recipemlexporter.cpp:140
-msgid "Total"
-msgstr "Всего"
-
-#: src/exporters/plaintextexporter.cpp:90
-#, fuzzy
-msgid "Yields"
-msgstr "Порций"
-
-#: src/exporters/plaintextexporter.cpp:153
-#, c-format
-msgid ""
-"_n: 1 star\n"
-"%n stars"
-msgstr ""
-
 #: src/main.cpp:25
 msgid "The TDE Cookbook"
 msgstr "Книга рецептов TDE"
@@ -1825,218 +4242,249 @@ msgstr "Николай Шафоростов"
 msgid "INSERT YOUR EMAIL ADDRESS"
 msgstr "student@program.net.ua"
 
-#: src/recipeactionshandler.cpp:51
-msgid "&Open"
-msgstr "&Открыть"
+#: src/mmdata.h:26
+msgid "bunch"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:55 src/recipeactionshandler.cpp:77
-msgid "E&xport"
-msgstr "&Экспортировать"
+#: src/mmdata.h:26
+msgid "bunches"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:57
-msgid "&Remove From Category"
-msgstr "Удалить из &категории"
+#: src/mmdata.h:27
+#, fuzzy
+msgid "cup"
+msgstr "Резервное копирование"
 
-#: src/recipeactionshandler.cpp:62
-msgid "&Add to Shopping List"
-msgstr "&Добавить в список покупок"
+#: src/mmdata.h:27
+msgid "cups"
+msgstr ""
 
-#: src/krecipes.cpp:215 src/recipeactionshandler.cpp:64
-msgid "&Copy to Clipboard"
-msgstr "&Скопировать в буфер обмена"
+#: src/mmdata.h:28
+msgid "cubic cm"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:67
-#, fuzzy
-msgid "Ca&tegorize..."
-msgstr "Категории"
+#: src/mmdata.h:29
+msgid "centigram"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:73
-msgid "&Expand All"
-msgstr "&Развернуть всё"
+#: src/mmdata.h:29
+msgid "centigrams"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:75
-msgid "&Collapse All"
-msgstr "&Свернуть всё"
+#: src/mmdata.h:30
+msgid "centiliter"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:214
-msgid "Please select only one recipe."
+#: src/mmdata.h:30
+msgid "centiliters"
 msgstr ""
 
-#: src/krecipesview.cpp:442 src/krecipesview.cpp:444
-#: src/recipeactionshandler.cpp:237
-msgid "Export Recipe"
-msgstr "Экспортировать рецепт"
+#: src/mmdata.h:31
+msgid "can"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:243
-msgid ""
-"No recipes are currently selected.\n"
-"Would you like to export all recipes in the current view?"
+#: src/mmdata.h:31
+msgid "cans"
 msgstr ""
 
-#: src/recipeactionshandler.cpp:246
-msgid "Export Recipes"
-msgstr "Экспортировать рецепты"
+#: src/mmdata.h:32
+msgid "carton"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:347
-msgid "Compressed Krecipes format"
-msgstr "Сжатый файл Krecipes"
+#: src/mmdata.h:32
+msgid "cartons"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:347
-msgid "Web page"
-msgstr "Web-страница"
+#: src/mmdata.h:33
+msgid "decigram"
+msgstr ""
 
-#: src/pref.cpp:571 src/recipeactionshandler.cpp:347
-msgid "Plain Text"
-msgstr "Открытый текст"
+#: src/mmdata.h:33
+msgid "decigrams"
+msgstr ""
 
-#: src/krecipes.cpp:498 src/recipeactionshandler.cpp:383
-msgid "File \"%1\" exists.  Are you sure you want to overwrite it?"
-msgstr "Файл \"%1\" уже существует. Заменить его?"
+#: src/mmdata.h:34
+msgid "deciliter"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:383
-msgid "Saving recipe"
-msgstr "Сохранение рецепта"
+#: src/mmdata.h:34
+msgid "deciliters"
+msgstr ""
 
-#: src/recipeactionshandler.cpp:387
-msgid "Saving recipes..."
-msgstr "Сохранение рецептов..."
+#: src/mmdata.h:35
+msgid "drop"
+msgstr ""
 
-#: src/krecipes.cpp:117
-#, fuzzy
-msgid ""
-"Gathering recipe data from file.\n"
-"Please wait..."
-msgstr "Открытие рецепта..."
+#: src/mmdata.h:35
+msgid "drops"
+msgstr ""
 
-#: src/krecipes.cpp:167
-msgid "Reloa&d"
-msgstr "&Перезагрузить"
+#: src/mmdata.h:36
+msgid "dash"
+msgstr ""
 
-#: src/krecipes.cpp:169
-msgid "&Edit Recipe"
-msgstr "&Изменить рецепт"
+#: src/mmdata.h:36
+msgid "dashes"
+msgstr ""
 
-#: src/krecipes.cpp:173
-msgid "&Measurement Converter"
+#: src/mmdata.h:37
+msgid "each"
 msgstr ""
 
-#: src/krecipes.cpp:180
-msgid "&Merge Similar Categories..."
+#: src/mmdata.h:38
+msgid "kilogram"
 msgstr ""
 
-#: src/krecipes.cpp:184
-#, fuzzy
-msgid "&Merge Similar Ingredients..."
-msgstr "Недостающие ингредиенты"
+#: src/mmdata.h:38
+msgid "kilograms"
+msgstr ""
 
-#: src/krecipes.cpp:190
-msgid "&New Recipe"
-msgstr "&Добавить рецепт"
+#: src/mmdata.h:39
+msgid "fluid ounce"
+msgstr ""
 
-#: src/krecipes.cpp:203
-msgid "Import from File..."
-msgstr "Импортировать из файла..."
+#: src/mmdata.h:39
+msgid "fluid ounces"
+msgstr ""
 
-#: src/krecipes.cpp:207
-msgid "Import from Database..."
-msgstr "Импортировать из базы данных..."
+#: src/mmdata.h:40
+msgid "gram"
+msgstr ""
 
-#: src/krecipes.cpp:211
-msgid "Export..."
-msgstr "Экспортировать..."
+#: src/mmdata.h:40
+msgid "grams"
+msgstr ""
 
-#: src/krecipes.cpp:220
-msgid "Page Setup..."
-msgstr "Настройка печати..."
+#: src/mmdata.h:41
+msgid "gallon"
+msgstr ""
 
-#: src/krecipes.cpp:224
+#: src/mmdata.h:41
+msgid "gallons"
+msgstr ""
+
+#: src/mmdata.h:42
 #, fuzzy
-msgid "Print Setup..."
-msgstr "Настройка печати..."
+msgid "liter"
+msgstr "Условие отбора"
 
-#: src/krecipes.cpp:228
-msgid "Backup..."
-msgstr "Создать резервную копию..."
+#: src/mmdata.h:42
+msgid "liters"
+msgstr ""
 
-#: src/krecipes.cpp:232
-msgid "Restore..."
-msgstr "Восстановить..."
+#: src/mmdata.h:43
+msgid "pound"
+msgstr ""
 
-#: src/krecipes.cpp:356
-msgid ""
-"Filter \"%1\" not recognized.\n"
-"Please select one of the provided filters."
+#: src/mmdata.h:43
+msgid "pounds"
 msgstr ""
 
-#: src/krecipes.cpp:358
-msgid "Unrecognized Filter"
-msgstr "Фильтр нераспознаваем"
+#: src/mmdata.h:44
+msgid "large"
+msgstr ""
 
-#: src/krecipes.cpp:390
-msgid ""
-"NOTE: We recommend that all recipes generating warnings be checked to ensure "
-"that they were properly imported, and no loss of recipe data has occurred."
-"<br>"
-"<br>"
+#: src/mmdata.h:45
+msgid "medium"
 msgstr ""
 
-#: src/krecipes.cpp:393
-msgid "Import Warnings"
-msgstr "Сообщения импортирования"
+#: src/mmdata.h:46
+msgid "milligram"
+msgstr ""
 
-#: src/krecipes.cpp:458 src/krecipes.cpp:477
-msgid ""
-"The recipe print and view layouts use the same file for their style, meaning "
-"changing one view's look changes them both.  If this is not the behavior you "
-"desire, load one style and save it under a different name."
+#: src/mmdata.h:46
+msgid "milligrams"
 msgstr ""
 
-#: src/krecipes.cpp:494
-msgid "Save Backup As..."
+#: src/mmdata.h:47
+msgid "milliliter"
 msgstr ""
 
-#: src/krecipes.cpp:507
-msgid "Backup Failed"
+#: src/mmdata.h:47
+msgid "milliliters"
 msgstr ""
 
-#: src/krecipes.cpp:514
-msgid "Krecipes Backup File"
-msgstr "Резервная копия Krecipes"
+#: src/mmdata.h:48 src/mmdata.h:49
+msgid "package"
+msgstr ""
 
-#: src/krecipes.cpp:515
-msgid "Restore Backup"
-msgstr "Восстановить из резервной копии"
+#: src/mmdata.h:48 src/mmdata.h:49
+msgid "packages"
+msgstr ""
 
-#: src/krecipes.cpp:518
-msgid ""
-"<b>Restoring this file will erase ALL data currently in the database!</b><br />"
-"<br />If you want to keep the recipes in your database, click \"Cancel\" and "
-"first export your recipes.  These can then be imported once the restore is "
-"complete.<br /><br />Are you sure you want to proceed?"
+#: src/mmdata.h:50
+msgid "pinch"
 msgstr ""
 
-#: src/krecipes.cpp:525
-msgid "Restore successful."
+#: src/mmdata.h:50
+msgid "pinches"
 msgstr ""
 
-#: src/backends/recipedb.cpp:472 src/krecipes.cpp:527
-msgid "Restore Failed"
+#: src/mmdata.h:51
+msgid "pint"
 msgstr ""
 
-#: src/krecipes.cpp:589
-msgid ""
-"A recipe contains unsaved changes.\n"
-"Do you want to save the changes before exiting?"
+#: src/mmdata.h:51
+msgid "pints"
 msgstr ""
 
-#: src/krecipes.cpp:591
-msgid "Unsaved Changes"
-msgstr "Несохраненные изменения"
+#: src/mmdata.h:52
+msgid "ounce"
+msgstr ""
+
+#: src/mmdata.h:52
+msgid "ounces"
+msgstr ""
+
+#: src/mmdata.h:53
+msgid "quart"
+msgstr ""
+
+#: src/mmdata.h:53
+msgid "quarts"
+msgstr ""
+
+#: src/mmdata.h:54
+msgid "slice"
+msgstr ""
+
+#: src/mmdata.h:54
+msgid "slices"
+msgstr ""
+
+#: src/mmdata.h:55
+msgid "small"
+msgstr ""
+
+#: src/mmdata.h:56 src/mmdata.h:58
+msgid "teaspoon"
+msgstr ""
+
+#: src/mmdata.h:56 src/mmdata.h:58
+msgid "teaspoons"
+msgstr ""
+
+#: src/mmdata.h:57 src/mmdata.h:59
+msgid "tablespoon"
+msgstr ""
+
+#: src/mmdata.h:57 src/mmdata.h:59
+msgid "tablespoons"
+msgstr ""
+
+#: src/mmdata.h:60
+#, fuzzy
+msgid "per serving"
+msgstr "Порядок подачи"
 
 #: src/pref.cpp:45
 msgid "Krecipes Preferences"
 msgstr "Настройки"
 
+#: src/pref.cpp:57 src/setupwizard.cpp:45 src/setupwizard.cpp:54
+msgid "Server Settings"
+msgstr "Параметры сервера"
+
 #: src/pref.cpp:58
 msgid "Database Server Options (%1)"
 msgstr "Сервер базы данных (%1)"
@@ -2107,6 +4555,11 @@ msgstr "Дробный"
 msgid "Decimal"
 msgstr "Десятичный"
 
+#: src/pref.cpp:553
+#, fuzzy
+msgid "Import"
+msgstr "Импортировать/Экспортировать"
+
 #: src/pref.cpp:555
 msgid "Overwrite recipes with same title"
 msgstr "Заменять рецпты с одинакоым заголовком"
@@ -2115,16 +4568,25 @@ msgstr "Заменять рецпты с одинакоым заголовком
 msgid "Ask which recipes to import"
 msgstr ""
 
+#: src/pref.cpp:565 src/recipeactionshandler.cpp:252
+#, fuzzy
+msgid "Export"
+msgstr "&Экспортировать"
+
 #: src/pref.cpp:569
 msgid "'Copy to Clipboard' format:"
 msgstr ""
 
+#: src/pref.cpp:571 src/recipeactionshandler.cpp:347
+msgid "Plain Text"
+msgstr "Открытый текст"
+
 #: src/pref.cpp:595
 msgid ""
 "When this is enabled, the importer will show every recipe in the file(s) and "
 "allow you to select which recipes you want imported.\n"
-" \t\t\t\t\t\t\t\t\tDisable this to always import every recipe, which allows for "
-"faster and less memory-intensive imports."
+" \t\t\t\t\t\t\t\t\tDisable this to always import every recipe, which allows "
+"for faster and less memory-intensive imports."
 msgstr ""
 
 #: src/pref.cpp:630
@@ -2133,9 +4595,10 @@ msgstr ""
 
 #: src/pref.cpp:633
 msgid ""
-"In most instances these options do not need to be changed.  However, limiting "
-"the amount of items displayed at once will <b>allow Krecipes to better perform "
-"when the database is loaded with many thousands of recipes</b>."
+"In most instances these options do not need to be changed.  However, "
+"limiting the amount of items displayed at once will <b>allow Krecipes to "
+"better perform when the database is loaded with many thousands of recipes</"
+"b>."
 msgstr ""
 
 #: src/pref.cpp:638
@@ -2150,165 +4613,220 @@ msgstr "Без ограничений"
 msgid "Number of elements to display at once:"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:65
-msgid "QSqlRecipeDB: Opening Database..."
-msgstr ""
+#: src/recipeactionshandler.cpp:51
+msgid "&Open"
+msgstr "&Открыть"
 
-#: src/backends/qsqlrecipedb.cpp:83
-msgid ""
-"The Qt database plug-in (%1) is not installed.  This plug-in is required for "
-"using this database backend."
-msgstr ""
+#: src/recipeactionshandler.cpp:55 src/recipeactionshandler.cpp:77
+msgid "E&xport"
+msgstr "&Экспортировать"
 
-#: src/backends/qsqlrecipedb.cpp:104
-msgid "Parameters set. Calling db->open()"
-msgstr ""
+#: src/recipeactionshandler.cpp:57
+msgid "&Remove From Category"
+msgstr "Удалить из &категории"
 
-#: src/backends/qsqlrecipedb.cpp:109
-msgid "Failing to open database. Trying to create it"
+#: src/recipeactionshandler.cpp:62
+msgid "&Add to Shopping List"
+msgstr "&Добавить в список покупок"
+
+#: src/recipeactionshandler.cpp:67
+#, fuzzy
+msgid "Ca&tegorize..."
+msgstr "Категории"
+
+#: src/recipeactionshandler.cpp:73
+msgid "&Expand All"
+msgstr "&Развернуть всё"
+
+#: src/recipeactionshandler.cpp:75
+msgid "&Collapse All"
+msgstr "&Свернуть всё"
+
+#: src/recipeactionshandler.cpp:214
+msgid "Please select only one recipe."
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:114 src/backends/qsqlrecipedb.cpp:123
+#: src/recipeactionshandler.cpp:243
 msgid ""
-"Krecipes could not open the database using the driver '%2' (with username: "
-"\"%1\"). You may not have the necessary permissions, or the server may be down."
+"No recipes are currently selected.\n"
+"Would you like to export all recipes in the current view?"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:119
-#, c-format
-msgid "Database message: %1"
-msgstr "Сообщение мя базы данных: %1"
+#: src/recipeactionshandler.cpp:246
+msgid "Export Recipes"
+msgstr "Экспортировать рецепты"
 
-#: src/backends/qsqlrecipedb.cpp:120
+#: src/recipeactionshandler.cpp:347
+msgid "Compressed Krecipes format"
+msgstr "Сжатый файл Krecipes"
+
+#: src/recipeactionshandler.cpp:347
+msgid "Web page"
+msgstr "Web-страница"
+
+#: src/recipeactionshandler.cpp:383
+msgid "Saving recipe"
+msgstr "Сохранение рецепта"
+
+#: src/recipeactionshandler.cpp:387
+msgid "Saving recipes..."
+msgstr "Сохранение рецептов..."
+
+#: src/setupwizard.cpp:39
+msgid "Welcome to Krecipes"
+msgstr "Добро пожаловать в Krecipes"
+
+#: src/setupwizard.cpp:42
+msgid "Database Type"
+msgstr "Тип базы данных"
+
+#: src/setupwizard.cpp:48 src/setupwizard.cpp:51
+msgid "Database Permissions"
+msgstr "Права доступа к базе данных"
+
+#: src/setupwizard.cpp:57
+msgid "Initialize Database"
+msgstr "Инициализировать базу данных"
+
+#: src/setupwizard.cpp:60
+msgid "Finish & Save Settings"
+msgstr "Окончить и сохранить настройки"
+
+#: src/setupwizard.cpp:130
 msgid ""
-"Failing to open database. Exiting\n"
+"<b><font size=\"+1\">Thank you very much for choosing Krecipes.</font></"
+"b><br>It looks like this is the first time you are using it. This wizard "
+"will help you with the initial setup so that you can start using it quickly."
+"<br><br>Welcome, and enjoy cooking!"
 msgstr ""
-"не удалось открыть базу данных. Выход...\n"
 
-#: src/backends/qsqlrecipedb.cpp:129
+#: src/setupwizard.cpp:162
 msgid ""
-"This database was created with a newer version of Krecipes and cannot be "
-"opened."
+"This dialog will allow you to specify a MySQL account that has the necessary "
+"permissions to access the Krecipes MySQL database.<br><br><b><font size="
+"\"+1\">Most users that use Krecipes and MySQL for the first time can just "
+"leave the default parameters and press 'Next'.</font></b> <br><br>If you set "
+"a MySQL root password before, or you have already permissions as normal "
+"user, click on the appropriate option. Otherwise the account 'root' will be "
+"used, with no password.<br><br>[For security reasons, we strongly encourage "
+"you to setup a MySQL root password if you have not done so yet. Just type as "
+"root: mysqladmin password <i>your_password</i>]"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:138
-msgid ""
-"Failed to fix database structure.\n"
-"If you are using SQLite, this is often caused by using an SQLite 2 database "
-"with SQLite 3 installed.  If this is the case, make sure both SQLite 2 and 3 "
-"are installed, and then run 'krecipes --convert-sqlite3' to update your "
-"database to the new structure."
+#: src/setupwizard.cpp:174 src/setupwizard.cpp:282
+msgid "I have already set the necessary permissions"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:1754
-msgid "In ingredient '%1': weight [%2/%3%4]"
+#: src/setupwizard.cpp:181
+msgid "I have already set a MySQL root/admin account"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:1804
-msgid "In ingredient '%1': property \"%2\" [%3/%4]"
+#: src/setupwizard.cpp:189
+msgid "MySQL Administrator Account"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:1969
+#: src/setupwizard.cpp:270
 msgid ""
-"<!doc>The database was created with a previous version of Krecipes.  Would you "
-"like Krecipes to update this database to work with this version of Krecipes?  "
-"Depending on the number of recipes and amount of data, this could take some "
-"time."
-"<br>"
-"<br><b>Warning: After updating, this database will no longer be compatible with "
-"previous versions of Krecipes."
-"<br>"
-"<br>Cancelling this operation may result in corrupting the database.</b>"
+"This dialog will allow you to specify a PostgreSQL account that has the "
+"necessary permissions to access the Krecipes PostgreSQL database.  This "
+"account may either be a <b>PostgreSQL superuser</b> or have the ability to "
+"both <b>create new PostgreSQL users and databases</b>.<br><br>If no "
+"superuser or privileged account is given, the account 'postgres' will be "
+"attempted, with no password.  If this is insufficient for your PostgreSQL "
+"setup, you <b>must</b> select the appropriate option below to enter the "
+"information of a privileged PostgreSQL account."
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:1971
-msgid "Porting database structure..."
+#: src/setupwizard.cpp:289
+msgid "I have already set a superuser or privileged account"
 msgstr ""
 
-#: src/backends/qsqlrecipedb.cpp:2041
-msgid "Loading category list"
+#: src/setupwizard.cpp:297
+msgid "PostgreSQL Superuser or Privileged Account"
 msgstr ""
 
-#: src/backends/MySQL/mysqlrecipedb.cpp:473
-#: src/backends/PostgreSQL/psqlrecipedb.cpp:370
-#: src/backends/SQLite/literecipedb.cpp:752
-msgid "Overall"
-msgstr "Общая"
+#: src/setupwizard.cpp:378
+msgid ""
+"In this dialog you can adjust the database server settings."
+"<br><br><b>Warning: Passwords are stored in plain text and could potentially "
+"be compromised.  We recommend that you create a username and password "
+"combination solely for use by Krecipes.</b>"
+msgstr ""
 
-#: src/backends/MySQL/mysqlrecipedb.cpp:474
-#: src/backends/PostgreSQL/psqlrecipedb.cpp:371
-#: src/backends/SQLite/literecipedb.cpp:753
-msgid "Taste"
-msgstr "Вкус"
+#: src/setupwizard.cpp:446
+msgid "The server is remote"
+msgstr "Удалённый сервер"
 
-#: src/backends/MySQL/mysqlrecipedb.cpp:476
-#: src/backends/PostgreSQL/psqlrecipedb.cpp:373
-#: src/backends/SQLite/literecipedb.cpp:755
-msgid "Originality"
-msgstr "Оригинальность"
+#: src/setupwizard.cpp:455
+msgid "Server / Client Settings"
+msgstr "Клиент/Сервер"
 
-#: src/backends/MySQL/mysqlrecipedb.cpp:477
-#: src/backends/PostgreSQL/psqlrecipedb.cpp:374
-#: src/backends/SQLite/literecipedb.cpp:756
-msgid "Ease of Preparation"
-msgstr "Простота приготовления"
+#: src/setupwizard.cpp:468
+msgid "Client:"
+msgstr "Клиент:"
 
-#: src/backends/recipedb.cpp:303
-msgid "Creating complete backup"
+#: src/setupwizard.cpp:539
+msgid "In this dialog you can adjust SQLite settings."
 msgstr ""
 
-#: src/backends/recipedb.cpp:304 src/backends/recipedb.cpp:428
+#: src/setupwizard.cpp:562
+msgid "Open file dialog"
+msgstr "Открыть файл"
+
+#: src/setupwizard.cpp:607
 msgid ""
-"Depending on the number of recipes and amount of data, this could take some "
-"time."
+"Congratulations; all the necessary configuration setup is done. Press "
+"'Finish' to continue, and enjoy cooking!"
 msgstr ""
 
-#: src/backends/recipedb.cpp:308
+#: src/setupwizard.cpp:699
 msgid ""
-"Unable to find or run the program '%1'.  Either it is not installed on your "
-"system or it is not in $PATH."
+"Krecipes comes with some delicious default recipes and useful data. "
+"<br><br>Would you like to initialize your database with those? Note that "
+"this will erase all your previous recipes if you have any. "
 msgstr ""
 
-#: src/backends/recipedb.cpp:343
-msgid "Backup failed."
-msgstr ""
+#: src/setupwizard.cpp:718
+msgid "Yes please, initialize the database with the examples"
+msgstr "Да, заполните базу примерами"
 
-#: src/backends/recipedb.cpp:390
+#: src/setupwizard.cpp:724
 msgid ""
-"This backup was created with a newer version of Krecipes and cannot be "
-"restored."
+"Krecipes can import nutrient data from the USDA's nutrient database for over "
+"400 foods.  A total of 43 food properties are included for each food, such "
+"as energy, fat, vitamin C, etc.<br><br>Would you like to import this data "
+"now?  Note that this operation is safe to use on an existing database, and "
+"no data loss will occur.  This operation may take several minutes."
 msgstr ""
+"Krecipes может импортировать данные о различных продуктах из базы данных "
+"USDA с описнием всего 43 свойств, таких как енергетическая ценность, "
+"жирность, витамины.<br><br>Сделать это сейчас? Это может занять несколько "
+"минут."
 
-#: src/backends/recipedb.cpp:400
-#, fuzzy
-msgid "This file is not a Krecipes backup file or has become corrupt."
-msgstr "\"%1\" в строке %2, столбце %3.  Возможно, это не файл Krecipes."
-
-#: src/backends/recipedb.cpp:405
+#: src/setupwizard.cpp:730
 msgid ""
-"This backup was created using the \"%1\" backend.  It can only be restored into "
-"a database using this backend."
-msgstr ""
+"Yes please, load the database with nutrient data for 400+ foods. (Note: "
+"English only.)"
+msgstr "Да, загрузить данные о более 400 продуктах. (на английском)"
 
-#: src/backends/recipedb.cpp:427
-msgid "Restoring backup"
+#: src/setupwizard.cpp:767
+msgid ""
+"Choose the type of database that you want to use. Most users will want to "
+"choose a simple local database here. However, you can also use remote "
+"servers by means of a MySQL or PostgreSQL database."
 msgstr ""
 
-#: src/backends/recipedb.cpp:808
-msgid "Nutrient Import"
-msgstr "Импорт данных о продуктах"
-
-#: src/backends/recipedb.cpp:808
-msgid "Importing USDA nutrient data"
-msgstr "Импорт данных о продуктах USDA"
+#: src/setupwizard.cpp:783
+msgid "Simple Local File (SQLite)"
+msgstr "Локальный файл (SQLite)"
 
-#: src/widgets/unitlistview.cpp:117 src/widgets/unitlistview.cpp:119
-msgid "Abbreviation"
-msgstr "Аббревиатура"
+#: src/setupwizard.cpp:784
+msgid "Local or Remote MySQL Database"
+msgstr "Локальная или удалённая база данных MySQL"
 
-#: src/widgets/unitlistview.cpp:118
-msgid "Plural"
-msgstr "Множественное число"
+#: src/setupwizard.cpp:785
+msgid "Local or Remote PostgreSQL Database"
+msgstr "Локальная или удалённая база данных PostgreSQL"
 
 #: src/widgets/authorlistview.cpp:70 src/widgets/categorylistview.cpp:317
 #: src/widgets/headerlistview.cpp:73 src/widgets/ingredientlistview.cpp:122
@@ -2324,48 +4842,33 @@ msgstr "&Создать"
 msgid "&Rename"
 msgstr "&Переименовать"
 
-#: src/widgets/unitlistview.cpp:341
-msgid ""
-"This unit already exists.  Continuing will merge these two units into one.  Are "
-"you sure?"
-msgstr ""
-
-#: src/widgets/kdateedit.cpp:354
-msgid "tomorrow"
-msgstr "завтра"
-
-#: src/widgets/kdateedit.cpp:355
-msgid "today"
-msgstr "сегодня"
-
-#: src/widgets/kdateedit.cpp:356
-msgid "yesterday"
-msgstr "вчера"
-
-#: src/widgets/kdatepickerpopup.cpp:61
-msgid "&Today"
-msgstr "&Сегодня"
-
-#: src/widgets/kdatepickerpopup.cpp:62
-msgid "&Yesterday"
-msgstr ""
+#: src/widgets/authorlistview.cpp:92
+msgid "New Author"
+msgstr "Новый автор"
 
-#: src/widgets/kdatepickerpopup.cpp:63
-msgid "Last &Week"
-msgstr ""
+#: src/widgets/authorlistview.cpp:115
+msgid "Are you sure you want to delete this author?"
+msgstr "Вы действительно хотите удалить этого автора?"
 
-#: src/widgets/kdatepickerpopup.cpp:64
-msgid "Last M&onth"
+#: src/widgets/authorlistview.cpp:170
+msgid ""
+"This author already exists.  Continuing will merge these two authors into "
+"one.  Are you sure?"
 msgstr ""
 
-#: src/widgets/kdatepickerpopup.cpp:71
-msgid "No Date"
-msgstr "Нет даты"
+#: src/widgets/categorycombobox.cpp:37 src/widgets/categorycombobox.cpp:64
+msgid "All Categories"
+msgstr "Все категории"
 
 #: src/widgets/categorylistview.cpp:322
 msgid "Cu&t"
 msgstr "&Вырезать"
 
+#: src/widgets/categorylistview.cpp:323
+#, fuzzy
+msgid "&Paste"
+msgstr "Вкус"
+
 #: src/widgets/categorylistview.cpp:324
 msgid "Paste as Subcategory"
 msgstr "Вставить как подчинённую категорию"
@@ -2377,50 +4880,31 @@ msgstr "Вы действительно хотите удалить эту и п
 
 #: src/widgets/categorylistview.cpp:538
 msgid ""
-"This category already exists.  Continuing will merge these two categories into "
-"one.  Are you sure?"
-msgstr ""
-
-#: src/widgets/propertylistview.cpp:178
-msgid "Are you sure you want to delete this property?"
-msgstr "Вы действительно хотите удалить это свойство?"
-
-#: src/widgets/propertylistview.cpp:227
-msgid ""
-"This property already exists.  Continuing will merge these two properties into "
-"one.  Are you sure?"
+"This category already exists.  Continuing will merge these two categories "
+"into one.  Are you sure?"
 msgstr ""
 
-#: src/widgets/propertylistview.cpp:245
-msgid "Property name cannot be longer than %1 characters."
-msgstr "Имя свойства не может быть больше %1 символов."
-
-#: src/widgets/propertylistview.cpp:258
-msgid "Min. Value"
-msgstr "Мин. значение"
-
-#: src/widgets/propertylistview.cpp:259
-msgid "Max. Value"
-msgstr "Максю значение"
+#: src/widgets/dblistviewbase.cpp:32
+msgid "Previous"
+msgstr "Предыдущий"
 
-#: src/widgets/recipelistview.cpp:239
-msgid "Loading recipes"
-msgstr "Загрузка рецептов"
+#: src/widgets/dblistviewbase.cpp:48
+msgid "Next"
+msgstr "Следующий"
 
-#: src/widgets/ingredientlistview.cpp:144
-msgid "New Ingredient"
-msgstr "Новый ингрежиент"
+#: src/widgets/headerlistview.cpp:60 src/widgets/headerlistview.cpp:95
+msgid "Header"
+msgstr "Заголовок"
 
-#: src/widgets/ingredientlistview.cpp:216
+#: src/widgets/headerlistview.cpp:168
 msgid ""
-"This ingredient already exists.  Continuing will merge these two ingredients "
-"into one.  Are you sure?"
+"This header already exists.  Continuing will merge these two headers into "
+"one.  Are you sure?"
 msgstr ""
 
-#: src/widgets/ingredientinputwidget.cpp:245
-#: src/widgets/ingredientlistview.cpp:235
-msgid "Ingredient name cannot be longer than %1 characters."
-msgstr "Имя ингредиента не может быть больше %1 символов."
+#: src/widgets/headerlistview.cpp:187
+msgid "Header cannot be longer than %1 characters."
+msgstr "Заголовок не может быть больше %1 символов."
 
 #: src/widgets/ingredientinputwidget.cpp:48
 #: src/widgets/ingredientinputwidget.cpp:58
@@ -2445,311 +4929,151 @@ msgstr "Единица:"
 msgid "Preparation Method:"
 msgstr "Метод приготовления:"
 
-#: src/widgets/inglistviewitem.cpp:29 src/widgets/inglistviewitem.cpp:41
-#: src/widgets/ingredientinputwidget.cpp:94
-msgid "OR"
-msgstr ""
-
 #: src/widgets/ingredientinputwidget.cpp:235
 msgid "Please enter an ingredient"
 msgstr "Введите ингредиент"
 
-#: src/widgets/kreruler.cpp:752
-msgid "Top margin"
-msgstr "Верхнее поле"
-
-#: src/widgets/kreruler.cpp:756
-msgid "Bottom margin"
-msgstr "Нижнее поле"
-
-#: src/widgets/kreruler.cpp:870
-msgid "Page Layout..."
-msgstr "Настройка страницы..."
-
-#: src/widgets/kreruler.cpp:873
-msgid "Remove Tabulator"
-msgstr "Убрать табуляцию"
-
-#: src/widgets/authorlistview.cpp:92
-msgid "New Author"
-msgstr "Новый автор"
-
-#: src/widgets/authorlistview.cpp:115
-msgid "Are you sure you want to delete this author?"
-msgstr "Вы действительно хотите удалить этого автора?"
-
-#: src/widgets/authorlistview.cpp:170
-msgid ""
-"This author already exists.  Continuing will merge these two authors into one.  "
-"Are you sure?"
-msgstr ""
-
-#: src/widgets/dblistviewbase.cpp:32
-msgid "Previous"
-msgstr "Предыдущий"
-
-#: src/widgets/dblistviewbase.cpp:48
-msgid "Next"
-msgstr "Следующий"
-
-#: src/widgets/categorycombobox.cpp:37 src/widgets/categorycombobox.cpp:64
-msgid "All Categories"
-msgstr "Все категории"
-
-#: src/widgets/headerlistview.cpp:60 src/widgets/headerlistview.cpp:95
-msgid "Header"
-msgstr "Заголовок"
-
-#: src/widgets/headerlistview.cpp:168
-msgid ""
-"This header already exists.  Continuing will merge these two headers into one.  "
-"Are you sure?"
-msgstr ""
-
-#: src/widgets/headerlistview.cpp:187
-msgid "Header cannot be longer than %1 characters."
-msgstr "Заголовок не может быть больше %1 символов."
-
-#: src/widgets/kremenu.cpp:139
-msgid "Up"
-msgstr "Вверх"
-
-#: src/widgets/prepmethodlistview.cpp:92
-msgid "New Preparation Method"
-msgstr "Новый метод приготовления"
-
-#: src/widgets/prepmethodlistview.cpp:163
-msgid ""
-"This preparation method already exists.  Continuing will merge these two into "
-"one.  Are you sure?"
-msgstr ""
-
-#: src/importers/mx2importer.cpp:55
-msgid "\"%1\" at line %2, column %3.  This may not be a *.mx2 file."
-msgstr ""
-
-#: src/importers/mx2importer.cpp:63
-msgid "This file does not appear to be a *.mx2 file"
-msgstr ""
-
-#: src/importers/mmfimporter.cpp:73 src/importers/mx2importer.cpp:86
-#: src/importers/mxpimporter.cpp:57 src/importers/nycgenericimporter.cpp:47
-#: src/importers/recipemlimporter.cpp:65 src/importers/rezkonvimporter.cpp:55
-msgid "Unable to open file."
-msgstr "Невозможно открыть файл."
-
-#: src/importers/mmfimporter.cpp:305 src/importers/mx2importer.cpp:101
-#: src/importers/mxpimporter.cpp:102 src/importers/mxpimporter.cpp:251
-#, fuzzy
-msgid "servings"
-msgstr "Порядок подачи"
-
-#: src/importers/mmfimporter.cpp:70 src/importers/mxpimporter.cpp:54
-#: src/importers/rezkonvimporter.cpp:52
-msgid "No recipes found in this file."
-msgstr "Нет рецептов в этом файле."
-
-#: src/importers/mxpimporter.cpp:86
-msgid ""
-"While loading recipe \"%1\" the field \"Recipe By:\" is either missing or could "
-"not be detected."
-msgstr ""
-
-#: src/importers/mxpimporter.cpp:106
-msgid ""
-"While loading recipe \"%1\" the field \"Serving Size:\" is either missing or "
-"could not be detected."
-msgstr ""
+#: src/widgets/ingredientinputwidget.cpp:245
+#: src/widgets/ingredientlistview.cpp:235
+msgid "Ingredient name cannot be longer than %1 characters."
+msgstr "Имя ингредиента не может быть больше %1 символов."
 
-#: src/importers/mxpimporter.cpp:117
-msgid ""
-"While loading recipe \"%1\" the field \"Preparation Time:\" is either missing "
-"or could not be detected."
-msgstr ""
+#: src/widgets/ingredientlistview.cpp:144
+msgid "New Ingredient"
+msgstr "Новый ингрежиент"
 
-#: src/importers/mxpimporter.cpp:161
+#: src/widgets/ingredientlistview.cpp:216
 msgid ""
-"While loading recipe \"%1\" the field \"Categories:\" is either missing or "
-"could not be detected."
-msgstr ""
-
-#: src/importers/mxpimporter.cpp:188
-msgid "While loading recipe \"%1\" Invalid amount \"%2\" in the line \"%3\""
+"This ingredient already exists.  Continuing will merge these two ingredients "
+"into one.  Are you sure?"
 msgstr ""
 
-#: src/importers/mxpimporter.cpp:352
-msgid ""
-"MasterCook's Generic Export format is currently not supported.  Please write to "
-"jkivlighn@gmail.com to request support for this format."
-msgstr ""
+#: src/widgets/kdateedit.cpp:354
+msgid "tomorrow"
+msgstr "завтра"
 
-#: src/importers/mxpimporter.cpp:358
-msgid ""
-"MasterCook Mac's Export format is currently not supported.  Please write to "
-"jkivlighn@gmail.com to request support for this format."
-msgstr ""
+#: src/widgets/kdateedit.cpp:355
+msgid "today"
+msgstr "сегодня"
 
-#: src/importers/kreimporter.cpp:50
-msgid "Archive does not contain a valid Krecipes file"
-msgstr ""
+#: src/widgets/kdateedit.cpp:356
+msgid "yesterday"
+msgstr "вчера"
 
-#: src/importers/kreimporter.cpp:71
-msgid "\"%1\" at line %2, column %3"
-msgstr ""
+#: src/widgets/kdatepickerpopup.cpp:61
+msgid "&Today"
+msgstr "&Сегодня"
 
-#: src/importers/kreimporter.cpp:78
-msgid "This file does not appear to be a *.kreml file"
+#: src/widgets/kdatepickerpopup.cpp:62
+msgid "&Yesterday"
 msgstr ""
 
-#: src/importers/kreimporter.cpp:84
-#, c-format
-msgid "KreML version %1"
+#: src/widgets/kdatepickerpopup.cpp:63
+msgid "Last &Week"
 msgstr ""
 
-#: src/importers/mmfimporter.cpp:137
-msgid ""
-"While loading recipe <b>%1</b> an ingredient line was found after the "
-"directions. While this is valid, it most commonly indicates an incorrectly "
-"formatted recipe."
+#: src/widgets/kdatepickerpopup.cpp:64
+msgid "Last M&onth"
 msgstr ""
 
-#: src/importers/recipemlimporter.cpp:37
-msgid "\"%1\" at line %2, column %3.  This may not be a RecipeML file."
-msgstr ""
+#: src/widgets/kdatepickerpopup.cpp:71
+msgid "No Date"
+msgstr "Нет даты"
 
-#: src/importers/recipemlimporter.cpp:44
-msgid "This file does not appear to be a valid RecipeML archive."
-msgstr ""
+#: src/widgets/kremenu.cpp:139
+msgid "Up"
+msgstr "Вверх"
 
-#: src/importers/nycgenericimporter.cpp:42
-msgid "File does not appear to be a valid NYC export."
-msgstr ""
+#: src/widgets/kreruler.cpp:752
+msgid "Top margin"
+msgstr "Верхнее поле"
 
-#: src/importers/baseimporter.cpp:99 src/importers/baseimporter.cpp:124
-msgid "Importing selected recipes"
-msgstr "Импортирование выбранных рецептов"
+#: src/widgets/kreruler.cpp:756
+msgid "Bottom margin"
+msgstr "Нижнее поле"
 
-#: src/importers/baseimporter.cpp:127
-msgid "%v/%m Recipes"
-msgstr "%v/%m"
+#: src/widgets/kreruler.cpp:870
+msgid "Page Layout..."
+msgstr "Настройка страницы..."
 
-#: src/importers/baseimporter.cpp:221
-msgid "All recipes up unto this point have been successfully imported."
-msgstr ""
+#: src/widgets/kreruler.cpp:873
+msgid "Remove Tabulator"
+msgstr "Убрать табуляцию"
 
-#: src/importers/baseimporter.cpp:230
-#, c-format
-msgid "Importing recipe: %1"
-msgstr "Импортирование рецепта: %1"
+#: src/widgets/prepmethodlistview.cpp:92
+msgid "New Preparation Method"
+msgstr "Новый метод приготовления"
 
-#: src/importers/baseimporter.cpp:388
+#: src/widgets/prepmethodlistview.cpp:163
 msgid ""
-"<!doc>Import of recipes from the file <b>\"%1\"</b> <b>failed</b> "
-"due to the following error(s):"
-msgstr ""
-
-#: src/importers/baseimporter.cpp:394
-msgid "The file <b>%1</b> generated the following warning(s):"
+"This preparation method already exists.  Continuing will merge these two "
+"into one.  Are you sure?"
 msgstr ""
 
-#: src/krecipesview.cpp:106 src/krecipesview.cpp:318 src/krecipesview.cpp:348
-msgid "Find/Edit Recipes"
-msgstr "Поиск/Изменение рецептов"
-
-#: src/krecipesview.cpp:133
-msgid "Data"
-msgstr "Данные"
+#: src/widgets/propertylistview.cpp:178
+msgid "Are you sure you want to delete this property?"
+msgstr "Вы действительно хотите удалить это свойство?"
 
-#: src/krecipesview.cpp:302
+#: src/widgets/propertylistview.cpp:227
 msgid ""
-"\n"
-"Would you like to run the setup wizard again? Otherwise, the application will "
-"be closed."
+"This property already exists.  Continuing will merge these two properties "
+"into one.  Are you sure?"
 msgstr ""
 
-#: src/krecipesview.cpp:308
-msgid "Exiting"
-msgstr "Выход"
-
-#: src/krecipesview.cpp:323 src/krecipesview.cpp:383
-msgid "Preparation Methods"
-msgstr "Методы приготовления"
-
-#: src/krecipesview.cpp:326 src/krecipesview.cpp:357
-msgid "Diet Helper"
-msgstr "Помощник по диетам"
+#: src/widgets/propertylistview.cpp:245
+msgid "Property name cannot be longer than %1 characters."
+msgstr "Имя свойства не может быть больше %1 символов."
 
-#: src/krecipesview.cpp:327 src/krecipesview.cpp:362
-msgid "Ingredient Matcher"
-msgstr "Сопоставление ингредиентов"
+#: src/widgets/propertylistview.cpp:258
+msgid "Min. Value"
+msgstr "Мин. значение"
 
-#: src/krecipesview.cpp:402
-msgid "View Recipe"
-msgstr "Просмотреть рецепт"
+#: src/widgets/propertylistview.cpp:259
+msgid "Max. Value"
+msgstr "Максю значение"
 
-#: src/krecipesview.cpp:460
-msgid ""
-"A recipe contains unsaved changes.\n"
-"Do you want to save changes made to this recipe before editing another recipe?"
-msgstr ""
+#: src/widgets/recipelistview.cpp:239
+msgid "Loading recipes"
+msgstr "Загрузка рецептов"
 
-#: src/krecipesview.cpp:480
-msgid "Are you sure you want to permanently remove the recipe, %1?"
-msgstr "Удалить рецепт %1?"
+#: src/widgets/unitlistview.cpp:117 src/widgets/unitlistview.cpp:119
+msgid "Abbreviation"
+msgstr "Аббревиатура"
 
-#: src/krecipesview.cpp:481
-msgid "Confirm remove"
-msgstr "Подтверждение удаления"
+#: src/widgets/unitlistview.cpp:118
+msgid "Plural"
+msgstr "Множественное число"
 
-#: src/krecipesview.cpp:512
+#: src/widgets/unitlistview.cpp:341
 msgid ""
-"A recipe contains unsaved changes.\n"
-"Do you want to save changes made to this recipe before creating a new recipe?"
-msgstr ""
-
-#: src/krecipesview.cpp:665
-msgid "Unable to setup database"
-msgstr "Невозможно настроить базу данных"
-
-#: src/krecipesview.cpp:676
-msgid "Code error. No DB support has been included. Exiting"
+"This unit already exists.  Continuing will merge these two units into one.  "
+"Are you sure?"
 msgstr ""
 
-#: src/krecipesview.cpp:846 src/krecipesview.cpp:872
-msgid "Code error. No DB support was built in. Exiting"
+#: src/krecipesui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#: src/krecipesview.cpp:854
-msgid "Unable to open database"
-msgstr "Невозможно открыть базу данных"
-
-#: src/krecipesview.cpp:877
-msgid ""
-"DB started correctly\n"
+#: src/krecipesui.rc:20
+#, no-c-format
+msgid "&Tools"
 msgstr ""
-"База данных запущена\n"
 
-#: src/krecipesview.cpp:885
-msgid "The configured database type (%1) is unsupported."
-msgstr ""
+#: src/widgets/ratingdisplaywidget.ui:167
+#, no-c-format
+msgid "Comments"
+msgstr "Комментарии"
 
-#: src/krecipesview.cpp:885
-msgid ""
-"Unsupported database type. Database must be either MySQL, SQLite, or "
-"PostgreSQL."
+#: src/widgets/ratingdisplaywidget.ui:203
+#, no-c-format
+msgid "Remove"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Николай Шафоростов"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "shafff@ukr.net"
+#: src/widgets/ratingdisplaywidget.ui:214
+#, no-c-format
+msgid "Edit..."
+msgstr "Изменить..."
 
 #~ msgid "Loading..."
 #~ msgstr "Загрузка..."
@@ -2820,26 +5144,34 @@ msgstr "shafff@ukr.net"
 #~ msgid "Head Line"
 #~ msgstr "Верхний колонтитул"
 
-#~ msgid "Left:"
-#~ msgstr "Слева:"
-
 #~ msgid "Mid:"
 #~ msgstr "Посередине:"
 
-#~ msgid "Right:"
-#~ msgstr "Справа:"
-
 #~ msgid "Foot Line"
 #~ msgstr "Нижний колонтитул"
 
 #~ msgid "You can insert several tags in the text:"
 #~ msgstr "Вы можете вставить в текст следующие теги:"
 
-#~ msgid "<qt><ul><li>&lt;sheet&gt; The sheet name</li><li>&lt;page&gt; The current page</li><li>&lt;pages&gt; The total number of pages</li><li>&lt;name&gt; The filename or URL</li><li>&lt;file&gt; The filename with complete path or the URL</li></ul></qt>"
-#~ msgstr "<qt><ul><li>&lt;sheet&gt; имя листа</li><li>&lt;page&gt; номер страницы</li><li>&lt;pages&gt; общее количество страниц</li><li>&lt;name&gt; имя файла или адрес</li><li>&lt;file&gt; полное имя файла или адрес</li></ul></qt>"
-
-#~ msgid "<qt><ul><li>&lt;time&gt; The current time</li><li>&lt;date&gt; The current date</li><li>&lt;author&gt; Your full name</li><li>&lt;org&gt; Your organization</li><li>&lt;email&gt; Your email address</li></ul></qt>"
-#~ msgstr "<qt><ul><li>&lt;time&gt;: текущее время</li><li>&lt;date&gt;: текущая дата</li><li>&lt;author&gt;: ваше полное имя</li><li>&lt;org&gt;: ваша организация</li><li>&lt;email&gt;: ваш электронный адрес</li></ul></qt>"
+#~ msgid ""
+#~ "<qt><ul><li>&lt;sheet&gt; The sheet name</li><li>&lt;page&gt; The current "
+#~ "page</li><li>&lt;pages&gt; The total number of pages</li><li>&lt;name&gt; "
+#~ "The filename or URL</li><li>&lt;file&gt; The filename with complete path "
+#~ "or the URL</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><ul><li>&lt;sheet&gt; имя листа</li><li>&lt;page&gt; номер страницы</"
+#~ "li><li>&lt;pages&gt; общее количество страниц</li><li>&lt;name&gt; имя "
+#~ "файла или адрес</li><li>&lt;file&gt; полное имя файла или адрес</li></"
+#~ "ul></qt>"
+
+#~ msgid ""
+#~ "<qt><ul><li>&lt;time&gt; The current time</li><li>&lt;date&gt; The "
+#~ "current date</li><li>&lt;author&gt; Your full name</li><li>&lt;org&gt; "
+#~ "Your organization</li><li>&lt;email&gt; Your email address</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><ul><li>&lt;time&gt;: текущее время</li><li>&lt;date&gt;: текущая "
+#~ "дата</li><li>&lt;author&gt;: ваше полное имя</li><li>&lt;org&gt;: ваша "
+#~ "организация</li><li>&lt;email&gt;: ваш электронный адрес</li></ul></qt>"
 
 #, fuzzy
 #~ msgid "Col&umns"