From 41b8b5d11e229a3140e1cf77f8eb9848817d1a0e Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Thu, 16 May 2019 22:25:46 +0200 Subject: [PATCH] Prepared new release --- changelog/48_2.4.1_2019-05-16.md | 2 + localization/fr/userfield_types.po | 20 ++-- localization/pl/strings.po | 10 +- localization/ru/demo_data.po | 180 ++++++++++++++--------------- localization/ru/strings.po | 20 ++-- localization/ru/userfield_types.po | 6 +- version.json | 4 +- 7 files changed, 127 insertions(+), 115 deletions(-) create mode 100644 changelog/48_2.4.1_2019-05-16.md diff --git a/changelog/48_2.4.1_2019-05-16.md b/changelog/48_2.4.1_2019-05-16.md new file mode 100644 index 00000000..dd082c1e --- /dev/null +++ b/changelog/48_2.4.1_2019-05-16.md @@ -0,0 +1,2 @@ +- Fixed a performance problem for loading data tables related to the new Userfields feature +- Fixed that when using single quotes in a product name did not trigger the workflow popup diff --git a/localization/fr/userfield_types.po b/localization/fr/userfield_types.po index 04095559..0fccc4d6 100644 --- a/localization/fr/userfield_types.po +++ b/localization/fr/userfield_types.po @@ -1,3 +1,5 @@ +# Translators: +# Hydreliox Hydreliox , 2019 # msgid "" msgstr "" @@ -5,6 +7,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n" "PO-Revision-Date: 2019-05-01 17:43+0000\n" +"Last-Translator: Hydreliox Hydreliox , 2019\n" "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,22 +17,25 @@ msgstr "" "X-Domain: grocy/userfield_types\n" msgid "text-single-line" -msgstr "" +msgstr "texte simple" msgid "text-multi-line" -msgstr "" +msgstr "texte multi-lignes" msgid "number-integral" -msgstr "" +msgstr "nombre entier" msgid "number-decimal" -msgstr "" +msgstr "nombre décimal" msgid "date" -msgstr "" +msgstr "date" msgid "datetime" -msgstr "" +msgstr "date et heure" msgid "checkbox" -msgstr "" +msgstr "case à cocher" + +msgid "preset-list" +msgstr "liste prédéfinie" diff --git a/localization/pl/strings.po b/localization/pl/strings.po index 5a2eb66a..6afbd148 100644 --- a/localization/pl/strings.po +++ b/localization/pl/strings.po @@ -2,8 +2,8 @@ # Agata Prymuszewska , 2019 # Marcin Redlica , 2019 # Bernd Bestel , 2019 -# Maczuga , 2019 # Zbigniew Żołnierowicz , 2019 +# Maczuga , 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n" "PO-Revision-Date: 2019-05-01 17:42+0000\n" -"Last-Translator: Zbigniew Żołnierowicz , 2019\n" +"Last-Translator: Maczuga , 2019\n" "Language-Team: Polish (https://www.transifex.com/grocy/teams/93189/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1377,13 +1377,13 @@ msgid "A predefined list of values, one per line" msgstr "Lista predefiniowanych wartości, jedna na linię" msgid "Chores due soon days" -msgstr "" +msgstr "Dni \"blisko terminu wykonania obowiązku\"" msgid "Batteries due to be charged soon days" -msgstr "" +msgstr "Dni \"blisko terminu ładowania baterii\"" msgid "Tasks due soon days" -msgstr "" +msgstr "Dni \"blisko terminu wykonania zadania\"" msgid "Products" msgstr "Produkty" diff --git a/localization/ru/demo_data.po b/localization/ru/demo_data.po index 0a3c4b12..9dcd01c3 100644 --- a/localization/ru/demo_data.po +++ b/localization/ru/demo_data.po @@ -23,64 +23,64 @@ msgid "Chocolate" msgstr "Шоколад" msgid "Pantry" -msgstr "" +msgstr "Кладовая" msgid "Candy cupboard" -msgstr "" +msgstr "Шкаф для конфет" msgid "Tinned food cupboard" -msgstr "" +msgstr "Шкаф для консервов" msgid "Fridge" msgstr "Холодильник" msgid "Piece" msgid_plural "Pieces" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Штука" +msgstr[1] "Штуки" +msgstr[2] "Штук" +msgstr[3] "Штук" msgid "Pack" msgid_plural "Packs" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Упаковка" +msgstr[1] "Упаковки" +msgstr[2] "Упаковок" +msgstr[3] "Упаковок" msgid "Glass" msgid_plural "Glasses" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Стакан" +msgstr[1] "Стакана" +msgstr[2] "Стаканов" +msgstr[3] "Стаканов" msgid "Tin" msgid_plural "Tins" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Консервная Банка" +msgstr[1] "Консервных Банки" +msgstr[2] "Консервных Банок" +msgstr[3] "Консервных Банок" msgid "Can" msgid_plural "Cans" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Банка" +msgstr[1] "Банки" +msgstr[2] "Банок" +msgstr[3] "Банок" msgid "Bunch" msgid_plural "Bunches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Пучок" +msgstr[1] "Пучка" +msgstr[2] "Пучков" +msgstr[3] "Пучков" msgid "Gummy bears" -msgstr "" +msgstr "Мармеладные мишки" msgid "Crisps" -msgstr "" +msgstr "Чипсы" msgid "Eggs" msgstr "Яйца" @@ -92,7 +92,7 @@ msgid "Pickles" msgstr "Огурцы" msgid "Gulash soup" -msgstr "" +msgstr "Суп-гуляш" msgid "Yogurt" msgstr "Йогурт" @@ -101,25 +101,25 @@ msgid "Cheese" msgstr "Сыр" msgid "Cold cuts" -msgstr "" +msgstr "Вырезка" msgid "Paprika" -msgstr "" +msgstr "Паприка" msgid "Cucumber" -msgstr "" +msgstr "Огурец" msgid "Radish" -msgstr "" +msgstr "Редиска" msgid "Tomato" msgstr "Помидор" msgid "Changed towels in the bathroom" -msgstr "" +msgstr "Сменены полотенца в ванной" msgid "Cleaned the kitchen floor" -msgstr "" +msgstr "Очищен пол на кухне" msgid "Warranty ends" msgstr "Гарантия заканчивается" @@ -131,143 +131,143 @@ msgid "Alarm clock" msgstr "Часы с будильником" msgid "Heat remote control" -msgstr "" +msgstr "Пульт ДУ для печки" msgid "Lawn mowed in the garden" -msgstr "" +msgstr "Пострижен газон в саду" msgid "Some good snacks" -msgstr "" +msgstr "Немного хорошего перекуса" msgid "Pizza dough" -msgstr "" +msgstr "Тесто для пиццы" msgid "Sieved tomatoes" -msgstr "" +msgstr "Отборные помидоры" msgid "Salami" -msgstr "" +msgstr "Салями" msgid "Toast" -msgstr "" +msgstr "Тост" msgid "Minced meat" -msgstr "" +msgstr "Фарш" msgid "Pizza" -msgstr "" +msgstr "Пицца" msgid "Spaghetti bolognese" -msgstr "" +msgstr "Спагетти болоньезе" msgid "Sandwiches" -msgstr "" +msgstr "Сендвичи" msgid "English" -msgstr "" +msgstr "Английски" msgid "German" -msgstr "" +msgstr "Немецкий" msgid "Italian" -msgstr "" +msgstr "Итальянский" msgid "Demo in different language" -msgstr "" +msgstr "Демо на другом языке" msgid "This is the note content of the recipe ingredient" -msgstr "" +msgstr "Это тело заметки по игредиенту рецепта" msgid "Demo User" -msgstr "" +msgstr "Пользователь Демо" msgid "Gram" msgid_plural "Grams" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Грамм" +msgstr[1] "Грамма" +msgstr[2] "Грамм" +msgstr[3] "Грамм" msgid "Flour" -msgstr "" +msgstr "Мука" msgid "Pancakes" -msgstr "" +msgstr "Блины" msgid "Sugar" -msgstr "" +msgstr "Сахар" msgid "Home" -msgstr "" +msgstr "Дом" msgid "Life" -msgstr "" +msgstr "Жизнь" msgid "Projects" -msgstr "" +msgstr "Проект" msgid "Repair the garage door" -msgstr "" +msgstr "Починить дверь гаража" msgid "Fork and improve grocy" -msgstr "" +msgstr "Отфоркнуть и улучшить grocy" msgid "Find a solution for what to do when I forget the door keys" -msgstr "" +msgstr "Найти решение, что делать, когда я забываю ключи от двери" msgid "Sweets" -msgstr "" +msgstr "Конфеты" msgid "Bakery products" -msgstr "" +msgstr "Хлебобулочные изделия" msgid "Tinned food" -msgstr "" +msgstr "Консервы" msgid "Butchery products" -msgstr "" +msgstr "Мясные изделия" msgid "Vegetables/Fruits" -msgstr "" +msgstr "Фрукт/овощи" msgid "Refrigerated products" -msgstr "" +msgstr "Замороженные продукты" msgid "Coffee machine" -msgstr "" +msgstr "Кофемашина" msgid "Dishwasher" -msgstr "" +msgstr "Посудомоечная машина" msgid "Liter" -msgstr "" +msgstr "Литр" msgid "Liters" -msgstr "" +msgstr "Литры" msgid "Bottle" -msgstr "" +msgstr "Бутылка" msgid "Bottles" -msgstr "" +msgstr "Бутылки" msgid "Milk" -msgstr "" +msgstr "Молоко" msgid "Chocolate sauce" -msgstr "" +msgstr "Шоколадный соус" msgid "Milliliters" -msgstr "" +msgstr "Милилитры" msgid "Milliliter" -msgstr "" +msgstr "Милилитр" msgid "Bottom" -msgstr "" +msgstr "Низ" msgid "Topping" -msgstr "" +msgstr "Топпинг" msgid "French" msgstr "Французский" @@ -279,19 +279,19 @@ msgid "Spanish" msgstr "Испанский" msgid "Russian" -msgstr "" +msgstr "Русский" msgid "The thing which happens on the 5th of every month" -msgstr "" +msgstr "Штука, которая происходит каждое 5 число каждого месяца" msgid "The thing which happens daily" -msgstr "" +msgstr "Штука, происходящая едедневно" msgid "The thing which happens on Mondays and Wednesdays" -msgstr "" +msgstr "Штука, которая происходит по понедельникам и средам" msgid "Swedish" -msgstr "" +msgstr "Шведский" msgid "Polish" -msgstr "" +msgstr "Польский" diff --git a/localization/ru/strings.po b/localization/ru/strings.po index c8d500d6..ed314ec0 100644 --- a/localization/ru/strings.po +++ b/localization/ru/strings.po @@ -1366,28 +1366,28 @@ msgstr "Добавить рецепт в %s" msgid "%s serving" msgid_plural "%s servings" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%s порция" +msgstr[1] "%s порции" +msgstr[2] "%s порций" +msgstr[3] "%s порций" msgid "Week costs" -msgstr "" +msgstr "Затраты на неделю" msgid "Configuration" -msgstr "" +msgstr "Конфигурация" msgid "A predefined list of values, one per line" -msgstr "" +msgstr "Предопределённый список значений, по одному на строку" msgid "Chores due soon days" -msgstr "" +msgstr "Критерий для \"подходит срок работы по дому\" в днях" msgid "Batteries due to be charged soon days" -msgstr "" +msgstr "Критерий для \"подходит срок заряда батарей\" в днях" msgid "Tasks due soon days" -msgstr "" +msgstr "Критерий для \"подходит срок задач\" в днях" msgid "Products" msgstr "Продукты" diff --git a/localization/ru/userfield_types.po b/localization/ru/userfield_types.po index d0c4ff06..f25171e8 100644 --- a/localization/ru/userfield_types.po +++ b/localization/ru/userfield_types.po @@ -1,5 +1,6 @@ # Translators: # Bernd Bestel , 2019 +# Pavel Pletenev , 2019 # msgid "" msgstr "" @@ -7,7 +8,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n" "PO-Revision-Date: 2019-05-01 17:43+0000\n" -"Last-Translator: Bernd Bestel , 2019\n" +"Last-Translator: Pavel Pletenev , 2019\n" "Language-Team: Russian (https://www.transifex.com/grocy/teams/93189/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,3 +37,6 @@ msgstr "Дата и время" msgid "checkbox" msgstr "Флажок" + +msgid "preset-list" +msgstr "предопределённый-список" diff --git a/version.json b/version.json index 025e2937..d0a20878 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "Version": "2.4.0", - "ReleaseDate": "2019-05-10" + "Version": "2.4.1", + "ReleaseDate": "2019-05-16" }