[SCM] krecipes packaging branch, master, updated. upstream/2.0_beta2-24-gdcd6d01

Pino Toscano pino at moszumanska.debian.org
Sun Nov 29 09:14:26 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=8e55ce8

The following commit has been merged in the master branch:
commit 8e55ce8701eb5c65a62ac8faf5af529f4879b4c8
Merge: 5ab2179bc16faa247d1b59e78a6010602b877c0b f12ca4733e11f58db7785eabca72bfd78ebc4e6c
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 29 09:56:03 2015 +0100

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 CMakeLists.txt                                     |   10 +-
 COPYING                                            |    2 +-
 ChangeLog                                          |   11 +
 README                                             |   55 +-
 TODO                                               |   35 +-
 cmake/COPYING-CMAKE-SCRIPTS                        |   22 -
 cmake/FindSqlite2.cmake                            |   53 -
 data/property-data-en_US.txt                       |   28 +-
 data/samples-en_US.kreml                           |   18 +-
 database_design/Changelog                          |    5 +
 doc-translations/CMakeLists.txt                    |    4 -
 .../pt_BR_krecipes/krecipes/CMakeLists.txt         |    1 -
 .../pt_krecipes/krecipes/CMakeLists.txt            |    1 -
 .../pt_krecipes/krecipes/index.docbook             | 8698 --------------------
 .../sv_krecipes/krecipes/CMakeLists.txt            |    1 -
 doc-translations/sv_krecipes/krecipes/addunit.png  |  Bin 5325 -> 0 bytes
 .../sv_krecipes/krecipes/adv-cat-search.png        |  Bin 49484 -> 0 bytes
 .../sv_krecipes/krecipes/adv-recipe-found.png      |  Bin 71961 -> 0 bytes
 .../sv_krecipes/krecipes/adv-search-parts.png      |  Bin 40010 -> 0 bytes
 .../sv_krecipes/krecipes/adv-srch-multi.png        |  Bin 47869 -> 0 bytes
 .../sv_krecipes/krecipes/authors-adding.png        |  Bin 34882 -> 0 bytes
 .../sv_krecipes/krecipes/categories.png            |  Bin 31962 -> 0 bytes
 .../sv_krecipes/krecipes/config-email.png          |  Bin 49673 -> 0 bytes
 .../krecipes/configure-shortcuts-adv.png           |  Bin 14282 -> 0 bytes
 .../krecipes/configure-shortcuts-basic.png         |  Bin 9723 -> 0 bytes
 .../sv_krecipes/krecipes/configure-shortcuts.png   |  Bin 23319 -> 0 bytes
 .../sv_krecipes/krecipes/configure-toolbars.png    |  Bin 47976 -> 0 bytes
 .../sv_krecipes/krecipes/diet-help.png             |  Bin 48561 -> 0 bytes
 .../sv_krecipes/krecipes/enter-recipe-tabs.png     |  Bin 29545 -> 0 bytes
 .../sv_krecipes/krecipes/formatting.png            |  Bin 19445 -> 0 bytes
 .../sv_krecipes/krecipes/import-other-sql.png      |  Bin 16074 -> 0 bytes
 .../sv_krecipes/krecipes/import-recipe-screen.png  |  Bin 13233 -> 0 bytes
 .../sv_krecipes/krecipes/import-settings.png       |  Bin 20979 -> 0 bytes
 .../sv_krecipes/krecipes/import-sqlite.png         |  Bin 11464 -> 0 bytes
 .../sv_krecipes/krecipes/ingredient-match.png      |  Bin 41713 -> 0 bytes
 .../sv_krecipes/krecipes/ingredients.png           |  Bin 52376 -> 0 bytes
 .../sv_krecipes/krecipes/krecipes-main.png         |  Bin 41416 -> 0 bytes
 .../sv_krecipes/krecipes/mass-convert.png          |  Bin 13130 -> 0 bytes
 .../sv_krecipes/krecipes/measure-convert.png       |  Bin 6863 -> 0 bytes
 doc-translations/sv_krecipes/krecipes/menu.png     |  Bin 749 -> 0 bytes
 .../sv_krecipes/krecipes/page-setup.png            |  Bin 24275 -> 0 bytes
 doc-translations/sv_krecipes/krecipes/parser.png   |  Bin 36019 -> 0 bytes
 .../sv_krecipes/krecipes/performance.png           |  Bin 24755 -> 0 bytes
 .../sv_krecipes/krecipes/prep-method.png           |  Bin 27238 -> 0 bytes
 .../sv_krecipes/krecipes/print-preview.png         |  Bin 22507 -> 0 bytes
 .../sv_krecipes/krecipes/properties.png            |  Bin 36709 -> 0 bytes
 .../sv_krecipes/krecipes/property_details.png      |  Bin 10174 -> 0 bytes
 doc-translations/sv_krecipes/krecipes/ratings.png  |  Bin 28173 -> 0 bytes
 .../krecipes/recipe-description-tab.png            |  Bin 29438 -> 0 bytes
 .../krecipes/recipe-ingredients-tab.png            |  Bin 31233 -> 0 bytes
 .../krecipes/recipe-instructions-tab.png           |  Bin 29140 -> 0 bytes
 .../sv_krecipes/krecipes/restore-msg.png           |  Bin 20530 -> 0 bytes
 .../sv_krecipes/krecipes/server-settings.png       |  Bin 27312 -> 0 bytes
 .../sv_krecipes/krecipes/shop-list.png             |  Bin 30437 -> 0 bytes
 .../sv_krecipes/krecipes/submit-bug.png            |  Bin 43195 -> 0 bytes
 .../sv_krecipes/krecipes/unit-conversions.png      |  Bin 33376 -> 0 bytes
 doc-translations/sv_krecipes/krecipes/units.png    |  Bin 34091 -> 0 bytes
 .../sv_krecipes/krecipes/volume-convert.png        |  Bin 16850 -> 0 bytes
 .../uk_krecipes/krecipes/CMakeLists.txt            |    1 -
 doc/CMakeLists.txt                                 |    6 +-
 doc/addunit.png                                    |  Bin 29550 -> 0 bytes
 doc/adv-cat-search.png                             |  Bin 78396 -> 0 bytes
 doc/adv-recipe-found.png                           |  Bin 74284 -> 0 bytes
 doc/adv-search-parts.png                           |  Bin 59005 -> 0 bytes
 doc/adv-srch-multi.png                             |  Bin 77731 -> 0 bytes
 doc/arrow-left-double.png                          |  Bin 653 -> 0 bytes
 doc/arrow-left.png                                 |  Bin 512 -> 0 bytes
 doc/arrow-right-double.png                         |  Bin 666 -> 0 bytes
 doc/arrow-right.png                                |  Bin 527 -> 0 bytes
 doc/authors-adding.png                             |  Bin 74599 -> 0 bytes
 doc/categories.png                                 |  Bin 74524 -> 0 bytes
 doc/clear_right.png                                |  Bin 330 -> 0 bytes
 doc/config-email.png                               |  Bin 37645 -> 0 bytes
 doc/configure-shortcuts-adv.png                    |  Bin 15159 -> 0 bytes
 doc/configure-shortcuts-basic.png                  |  Bin 12400 -> 0 bytes
 doc/configure-shortcuts.png                        |  Bin 32016 -> 0 bytes
 doc/configure-toolbars.png                         |  Bin 63705 -> 0 bytes
 doc/diet-help.png                                  |  Bin 88414 -> 0 bytes
 doc/document-new.png                               |  Bin 579 -> 0 bytes
 doc/document-print.png                             |  Bin 619 -> 0 bytes
 doc/edit-clear.png                                 |  Bin 802 -> 0 bytes
 doc/edit-paste.png                                 |  Bin 529 -> 0 bytes
 doc/edit-property-information.png                  |  Bin 62932 -> 0 bytes
 doc/{ => en_US}/CMakeLists.txt                     |    3 +-
 doc/en_US/addunit.png                              |  Bin 0 -> 23813 bytes
 doc/en_US/adv-cat-search.png                       |  Bin 0 -> 74361 bytes
 doc/en_US/adv-recipe-found.png                     |  Bin 0 -> 71328 bytes
 doc/en_US/adv-search-parts.png                     |  Bin 0 -> 56191 bytes
 doc/en_US/adv-srch-multi.png                       |  Bin 0 -> 73833 bytes
 doc/en_US/arrow-left-double.png                    |  Bin 0 -> 580 bytes
 doc/en_US/arrow-left.png                           |  Bin 0 -> 414 bytes
 doc/en_US/arrow-right-double.png                   |  Bin 0 -> 579 bytes
 doc/en_US/arrow-right.png                          |  Bin 0 -> 438 bytes
 doc/en_US/authors-adding.png                       |  Bin 0 -> 68396 bytes
 doc/en_US/categories.png                           |  Bin 0 -> 70078 bytes
 doc/en_US/clear_right.png                          |  Bin 0 -> 428 bytes
 doc/en_US/configure-shortcuts.png                  |  Bin 0 -> 30502 bytes
 doc/en_US/configure-toolbars.png                   |  Bin 0 -> 53714 bytes
 doc/en_US/diet-help.png                            |  Bin 0 -> 81780 bytes
 doc/en_US/document-new.png                         |  Bin 0 -> 517 bytes
 doc/en_US/document-print.png                       |  Bin 0 -> 508 bytes
 doc/en_US/edit-clear.png                           |  Bin 0 -> 750 bytes
 doc/en_US/edit-paste.png                           |  Bin 0 -> 565 bytes
 doc/en_US/edit-property-information.png            |  Bin 0 -> 51172 bytes
 doc/en_US/enter-recipe-tabs.png                    |  Bin 0 -> 71533 bytes
 doc/en_US/face-smile.png                           |  Bin 0 -> 1770 bytes
 doc/en_US/formatting.png                           |  Bin 0 -> 39976 bytes
 doc/en_US/go-down.png                              |  Bin 0 -> 608 bytes
 doc/en_US/go-next.png                              |  Bin 0 -> 615 bytes
 doc/en_US/go-previous.png                          |  Bin 0 -> 591 bytes
 doc/en_US/import-other-sql.png                     |  Bin 0 -> 30374 bytes
 doc/en_US/import-recipe-screen.png                 |  Bin 0 -> 24958 bytes
 doc/en_US/import-settings.png                      |  Bin 0 -> 44043 bytes
 doc/en_US/import-sqlite.png                        |  Bin 0 -> 25728 bytes
 doc/{ => en_US}/index.docbook                      | 1015 +--
 doc/en_US/ingredient-match.png                     |  Bin 0 -> 77533 bytes
 doc/en_US/ingredients.png                          |  Bin 0 -> 67383 bytes
 doc/en_US/krecipes-main.png                        |  Bin 0 -> 69940 bytes
 doc/en_US/list-add.png                             |  Bin 0 -> 516 bytes
 doc/en_US/list-remove.png                          |  Bin 0 -> 258 bytes
 doc/en_US/mass-convert.png                         |  Bin 0 -> 52073 bytes
 doc/en_US/measure-convert.png                      |  Bin 0 -> 22678 bytes
 doc/en_US/menu.png                                 |  Bin 0 -> 1603 bytes
 doc/en_US/page-setup.png                           |  Bin 0 -> 113346 bytes
 doc/en_US/parser.png                               |  Bin 0 -> 47481 bytes
 doc/en_US/performance.png                          |  Bin 0 -> 49102 bytes
 doc/en_US/prep-method.png                          |  Bin 0 -> 51048 bytes
 doc/en_US/print-preview.png                        |  Bin 0 -> 55366 bytes
 doc/en_US/properties.png                           |  Bin 0 -> 77050 bytes
 doc/en_US/property_details.png                     |  Bin 0 -> 29964 bytes
 doc/en_US/ratings.png                              |  Bin 0 -> 65728 bytes
 doc/en_US/recipe-description-tab.png               |  Bin 0 -> 93807 bytes
 doc/en_US/recipe-ingredients-tab.png               |  Bin 0 -> 72737 bytes
 doc/en_US/recipe-instructions-tab.png              |  Bin 0 -> 135314 bytes
 doc/en_US/recipe-ratings-tab.png                   |  Bin 0 -> 65728 bytes
 doc/en_US/restore-msg.png                          |  Bin 0 -> 32557 bytes
 doc/en_US/server-settings.png                      |  Bin 0 -> 55625 bytes
 doc/en_US/shop-list.png                            |  Bin 0 -> 72847 bytes
 doc/en_US/submit-bug.png                           |  Bin 0 -> 34218 bytes
 doc/en_US/system-help.png                          |  Bin 0 -> 788 bytes
 doc/en_US/units.png                                |  Bin 0 -> 89612 bytes
 doc/en_US/up.png                                   |  Bin 0 -> 633 bytes
 doc/en_US/volume-convert.png                       |  Bin 0 -> 77760 bytes
 doc/en_US/wildcard-table.png                       |  Bin 0 -> 5519 bytes
 doc/enter-recipe-tabs.png                          |  Bin 72340 -> 0 bytes
 doc/face-smile.png                                 |  Bin 1598 -> 0 bytes
 doc/formatting.png                                 |  Bin 48074 -> 0 bytes
 doc/go-down.png                                    |  Bin 623 -> 0 bytes
 doc/go-next.png                                    |  Bin 721 -> 0 bytes
 doc/go-previous.png                                |  Bin 634 -> 0 bytes
 doc/import-other-sql.png                           |  Bin 37639 -> 0 bytes
 doc/import-recipe-screen.png                       |  Bin 31708 -> 0 bytes
 doc/import-settings.png                            |  Bin 52738 -> 0 bytes
 doc/import-sqlite.png                              |  Bin 31450 -> 0 bytes
 doc/ingredient-match.png                           |  Bin 81622 -> 0 bytes
 doc/ingredients.png                                |  Bin 71861 -> 0 bytes
 doc/krecipes-main.png                              |  Bin 75502 -> 0 bytes
 doc/list-add.png                                   |  Bin 564 -> 0 bytes
 doc/list-remove.png                                |  Bin 332 -> 0 bytes
 doc/mass-convert.png                               |  Bin 53909 -> 0 bytes
 doc/measure-convert.png                            |  Bin 29229 -> 0 bytes
 doc/menu.png                                       |  Bin 1367 -> 0 bytes
 doc/page-setup.png                                 |  Bin 121080 -> 0 bytes
 doc/parser.png                                     |  Bin 46794 -> 0 bytes
 doc/performance.png                                |  Bin 60286 -> 0 bytes
 doc/prep-method.png                                |  Bin 52962 -> 0 bytes
 doc/print-preview.png                              |  Bin 65202 -> 0 bytes
 doc/properties.png                                 |  Bin 84420 -> 0 bytes
 doc/property_details.png                           |  Bin 37489 -> 0 bytes
 doc/{ => pt_BR}/CMakeLists.txt                     |    3 +-
 .../krecipes => doc/pt_BR}/index.docbook           | 2374 ++----
 doc/ratings.png                                    |  Bin 68627 -> 0 bytes
 doc/recipe-description-tab.png                     |  Bin 93604 -> 0 bytes
 doc/recipe-ingredients-tab.png                     |  Bin 77419 -> 0 bytes
 doc/recipe-instructions-tab.png                    |  Bin 147393 -> 0 bytes
 doc/recipe-ratings-tab.png                         |  Bin 68627 -> 0 bytes
 doc/restore-msg.png                                |  Bin 39185 -> 0 bytes
 doc/server-settings.png                            |  Bin 67225 -> 0 bytes
 doc/shop-list.png                                  |  Bin 78311 -> 0 bytes
 doc/submit-bug.png                                 |  Bin 60500 -> 0 bytes
 doc/{ => sv}/CMakeLists.txt                        |    3 +-
 .../sv_krecipes/krecipes => doc/sv}/index.docbook  | 1960 +----
 doc/system-help.png                                |  Bin 897 -> 0 bytes
 doc/{ => uk}/CMakeLists.txt                        |    3 +-
 doc/uk/addunit.png                                 |  Bin 0 -> 10337 bytes
 doc/uk/adv-cat-search.png                          |  Bin 0 -> 27447 bytes
 doc/uk/adv-recipe-found.png                        |  Bin 0 -> 28383 bytes
 doc/uk/adv-search-parts.png                        |  Bin 0 -> 24933 bytes
 doc/uk/adv-srch-multi.png                          |  Bin 0 -> 28792 bytes
 doc/uk/authors-adding.png                          |  Bin 0 -> 8346 bytes
 doc/uk/categories.png                              |  Bin 0 -> 19813 bytes
 doc/uk/configure-shortcuts.png                     |  Bin 0 -> 16511 bytes
 doc/uk/configure-toolbars.png                      |  Bin 0 -> 21190 bytes
 doc/uk/diet-help.png                               |  Bin 0 -> 27493 bytes
 doc/uk/edit-property-information.png               |  Bin 0 -> 18222 bytes
 doc/uk/enter-recipe-tabs.png                       |  Bin 0 -> 29789 bytes
 doc/uk/formatting.png                              |  Bin 0 -> 16543 bytes
 doc/uk/import-other-sql.png                        |  Bin 0 -> 12234 bytes
 doc/uk/import-recipe-screen.png                    |  Bin 0 -> 11304 bytes
 doc/uk/import-settings.png                         |  Bin 0 -> 17269 bytes
 doc/uk/import-sqlite.png                           |  Bin 0 -> 11008 bytes
 .../uk_krecipes/krecipes => doc/uk}/index.docbook  | 2074 ++---
 doc/uk/ingredient-match.png                        |  Bin 0 -> 27338 bytes
 doc/uk/ingredients.png                             |  Bin 0 -> 24942 bytes
 doc/uk/krecipes-main.png                           |  Bin 0 -> 22264 bytes
 doc/uk/mass-convert.png                            |  Bin 0 -> 18286 bytes
 doc/uk/measure-convert.png                         |  Bin 0 -> 11380 bytes
 doc/uk/page-setup.png                              |  Bin 0 -> 32840 bytes
 doc/uk/parser.png                                  |  Bin 0 -> 16410 bytes
 doc/uk/performance.png                             |  Bin 0 -> 20823 bytes
 doc/uk/prep-method.png                             |  Bin 0 -> 18904 bytes
 doc/uk/print-preview.png                           |  Bin 0 -> 16783 bytes
 doc/uk/properties.png                              |  Bin 0 -> 17929 bytes
 doc/uk/property_details.png                        |  Bin 0 -> 11937 bytes
 doc/uk/ratings.png                                 |  Bin 0 -> 25037 bytes
 doc/uk/recipe-description-tab.png                  |  Bin 0 -> 30188 bytes
 doc/uk/recipe-ingredients-tab.png                  |  Bin 0 -> 28642 bytes
 doc/uk/recipe-instructions-tab.png                 |  Bin 0 -> 33020 bytes
 doc/uk/recipe-ratings-tab.png                      |  Bin 0 -> 25037 bytes
 doc/uk/restore-msg.png                             |  Bin 0 -> 12946 bytes
 doc/uk/server-settings.png                         |  Bin 0 -> 23768 bytes
 doc/uk/shop-list.png                               |  Bin 0 -> 22559 bytes
 doc/uk/submit-bug.png                              |  Bin 0 -> 15238 bytes
 doc/uk/units.png                                   |  Bin 0 -> 22536 bytes
 doc/uk/volume-convert.png                          |  Bin 0 -> 18140 bytes
 doc/uk/wildcard-table.png                          |  Bin 0 -> 5318 bytes
 doc/units.png                                      |  Bin 95983 -> 0 bytes
 doc/up.png                                         |  Bin 672 -> 0 bytes
 doc/volume-convert.png                             |  Bin 83899 -> 0 bytes
 doc/wildcard-table.png                             |  Bin 4742 -> 0 bytes
 mimetypes/XmlMessages.sh                           |   23 +
 mimetypes/krecipes-mime.xml                        |   57 +
 pics/startlogo.png                                 |  Bin 444171 -> 474600 bytes
 po/CMakeLists.txt                                  |   79 +-
 po/bg/CMakeLists.txt                               |    2 -
 po/bg/krecipes.po                                  | 4008 ---------
 po/bs/CMakeLists.txt                               |    2 +
 po/bs/krecipes.po                                  | 4103 +++++++++
 po/ca/CMakeLists.txt                               |    2 +-
 po/ca/krecipes.po                                  | 6236 +++++++-------
 po/ca at valencia/CMakeLists.txt                      |    2 +-
 po/ca at valencia/krecipes.po                         | 6257 +++++++-------
 po/cs/CMakeLists.txt                               |    2 +-
 po/cs/krecipes.po                                  | 5911 +++++++------
 po/da/CMakeLists.txt                               |    2 +-
 po/da/krecipes.po                                  | 6452 +++++++--------
 po/de/CMakeLists.txt                               |    2 +-
 po/de/krecipes.po                                  | 6956 +++++++---------
 po/el/CMakeLists.txt                               |    2 +-
 po/el/krecipes.po                                  | 7435 ++++++++---------
 po/en_GB/CMakeLists.txt                            |    2 +-
 po/en_GB/krecipes.po                               | 6444 ++++++++-------
 po/eo/CMakeLists.txt                               |    2 -
 po/eo/krecipes.po                                  | 4253 ----------
 po/es/CMakeLists.txt                               |    2 +-
 po/es/krecipes.po                                  | 6581 ++++++++-------
 po/et/CMakeLists.txt                               |    2 +-
 po/et/krecipes.po                                  | 6444 +++++++--------
 po/fi/CMakeLists.txt                               |    2 +
 po/fi/krecipes.po                                  | 4109 +++++++++
 po/fr/CMakeLists.txt                               |    2 +-
 po/fr/krecipes.po                                  | 7048 ++++++++--------
 po/ga/CMakeLists.txt                               |    2 -
 po/ga/krecipes.po                                  | 4538 ----------
 po/gl/CMakeLists.txt                               |    2 +-
 po/gl/krecipes.po                                  | 7518 ++++++++---------
 po/hi/CMakeLists.txt                               |    2 -
 po/hi/krecipes.po                                  | 4941 -----------
 po/hne/CMakeLists.txt                              |    2 -
 po/hne/krecipes.po                                 | 4897 -----------
 po/hr/CMakeLists.txt                               |    2 -
 po/hr/krecipes.po                                  | 3998 ---------
 po/hu/CMakeLists.txt                               |    2 +-
 po/hu/krecipes.po                                  | 5906 ++++++-------
 po/is/CMakeLists.txt                               |    2 -
 po/is/krecipes.po                                  | 4360 ----------
 po/it/CMakeLists.txt                               |    2 +-
 po/it/krecipes.po                                  | 8169 +++++++++---------
 po/ja/CMakeLists.txt                               |    2 +-
 po/ja/krecipes.po                                  | 6135 +++++++-------
 po/kk/CMakeLists.txt                               |    2 +
 po/kk/krecipes.po                                  | 4136 ++++++++++
 po/lt/CMakeLists.txt                               |    2 -
 po/lt/krecipes.po                                  | 4059 ---------
 po/mai/CMakeLists.txt                              |    2 -
 po/mai/krecipes.po                                 | 3996 ---------
 po/nb/CMakeLists.txt                               |    2 +-
 po/nb/krecipes.po                                  | 5891 +++++++------
 po/nds/CMakeLists.txt                              |    2 +-
 po/nds/krecipes.po                                 | 6648 ++++++++-------
 po/nl/CMakeLists.txt                               |    2 +-
 po/nl/krecipes.po                                  | 6833 +++++++--------
 po/nn/CMakeLists.txt                               |    2 -
 po/nn/krecipes.po                                  | 3993 ---------
 po/pl/CMakeLists.txt                               |    2 +-
 po/pl/krecipes.po                                  | 7445 ++++++++---------
 po/pt/CMakeLists.txt                               |    2 +-
 po/pt/krecipes.po                                  | 5918 +++++++------
 po/pt_BR/CMakeLists.txt                            |    2 +-
 po/pt_BR/krecipes.po                               | 6514 +++++++--------
 po/ro/CMakeLists.txt                               |    2 -
 po/ro/krecipes.po                                  | 4646 -----------
 po/ru/CMakeLists.txt                               |    2 +
 po/ru/krecipes.po                                  | 4113 +++++++++
 po/sk/CMakeLists.txt                               |    2 +-
 po/sk/krecipes.po                                  | 5961 +++++++-------
 po/sl/CMakeLists.txt                               |    2 +
 po/sl/krecipes.po                                  | 4125 ++++++++++
 po/sv/CMakeLists.txt                               |    2 +-
 po/sv/krecipes.po                                  | 6001 +++++++-------
 po/tr/CMakeLists.txt                               |    2 +-
 po/tr/krecipes.po                                  | 6423 +++++++--------
 po/uk/CMakeLists.txt                               |    2 +-
 po/uk/krecipes.po                                  | 6067 +++++++-------
 po/zh_TW/CMakeLists.txt                            |    2 +-
 po/zh_TW/krecipes.po                               | 7025 ++++++++--------
 src/CMakeLists.txt                                 |  195 +-
 src/ConfigureChecks.cmake                          |    8 -
 src/Messages.sh                                    |    5 +-
 src/actionshandlers/authoractionshandler.cpp       |  126 -
 src/actionshandlers/ingredientactionshandler.cpp   |    2 +-
 src/actionshandlers/kreauthoractionshandler.cpp    |  127 +
 ...ractionshandler.h => kreauthoractionshandler.h} |   37 +-
 src/actionshandlers/krecategoryactionshandler.cpp  |  225 +
 src/actionshandlers/krecategoryactionshandler.h    |   64 +
 src/actionshandlers/kregenericactionshandler.cpp   |   64 +
 src/actionshandlers/kregenericactionshandler.h     |   50 +
 src/actionshandlers/prepmethodactionshandler.cpp   |    2 +-
 src/actionshandlers/recipeactionshandler.cpp       |   12 +-
 src/actionshandlers/recipeactionshandler.h         |    4 +
 src/actionshandlers/unitactionshandler.cpp         |    2 +-
 src/backends/MySQL/mysqlrecipedb.cpp               |   93 +-
 src/backends/MySQL/mysqlrecipedb.h                 |   14 +-
 src/backends/PostgreSQL/psqlrecipedb.cpp           |   60 +-
 src/backends/PostgreSQL/psqlrecipedb.h             |   13 +-
 src/backends/SQLite/libqsqlite/krecqsqlitedb.cpp   |  156 -
 src/backends/SQLite/libqsqlite/krecqsqlitedb.h     |   57 -
 .../SQLite/libqsqlite/krecqsqliteresult.cpp        |  170 -
 src/backends/SQLite/libqsqlite/krecqsqliteresult.h |  127 -
 src/backends/SQLite/literecipedb.cpp               |  134 +-
 src/backends/SQLite/literecipedb.h                 |   29 +-
 src/backends/SQLite/qsql_sqlite.cpp                |  483 --
 src/backends/SQLite/qsql_sqlite.h                  |   57 -
 src/backends/qsqlrecipedb.cpp                      |  171 +-
 src/backends/qsqlrecipedb.h                        |   39 +-
 src/backends/recipedb.cpp                          |   67 +-
 src/backends/recipedb.h                            |   92 +-
 src/backends/usda_property_data.cpp                |    6 +-
 src/backends/usda_property_data.h                  |    5 +-
 src/config-krecipes.h.cmake                        |    5 -
 src/datablocks/elementlist.h                       |    3 +
 src/datablocks/ingredient.cpp                      |   18 +-
 src/datablocks/ingredientlist.cpp                  |   13 +-
 src/datablocks/mixednumber.cpp                     |  177 +-
 src/datablocks/mixednumber.h                       |    7 +-
 src/datablocks/rating.cpp                          |    2 +-
 src/datablocks/yield.cpp                           |    6 +-
 src/dialogs/advancedsearchdialog.cpp               |  131 +-
 src/dialogs/advancedsearchdialog.h                 |   10 +-
 src/dialogs/authorsdialog.cpp                      |   38 +-
 src/dialogs/authorsdialog.h                        |   38 +-
 src/dialogs/borderdialog.cpp                       |    1 -
 src/dialogs/categorieseditordialog.cpp             |   35 +-
 src/dialogs/categorieseditordialog.h               |   37 +-
 src/dialogs/conversiondialog.cpp                   |    1 -
 src/dialogs/createingredientweightdialog.cpp       |    1 -
 src/dialogs/createunitconversiondialog.cpp         |    1 -
 src/dialogs/dbimportdialog.cpp                     |    9 -
 src/dialogs/dependanciesdialog.cpp                 |   29 +-
 src/dialogs/dependanciesdialog.h                   |   15 +-
 src/dialogs/dietviewdialog.cpp                     |    7 +-
 src/dialogs/dietviewdialog.h                       |    6 +-
 src/dialogs/editpropertiesdialog.cpp               |   19 +-
 src/dialogs/editpropertiesdialog.h                 |    3 +-
 src/dialogs/editratingdialog.cpp                   |   10 +-
 src/dialogs/ingredientmatcherdialog.cpp            |    8 +-
 src/dialogs/ingredientmatcherdialog.h              |    4 -
 src/dialogs/ingredientsdialog.cpp                  |    1 -
 src/dialogs/pagesetupdialog.cpp                    |    7 +-
 src/dialogs/propertiesdialog.cpp                   |    3 -
 src/dialogs/recipeimportdialog.cpp                 |    4 +-
 src/dialogs/recipeimportdialog.h                   |    1 -
 src/dialogs/recipeinputdialog.cpp                  |   15 +-
 src/dialogs/refineshoppinglistdialog.cpp           |    9 +-
 src/dialogs/resizerecipedialog.cpp                 |  150 +-
 src/dialogs/resizerecipedialog.h                   |   25 +-
 src/dialogs/resizerecipedialog.ui                  |  132 +
 src/dialogs/selectauthorsdialog.cpp                |   73 +-
 src/dialogs/selectauthorsdialog.h                  |   13 +-
 src/dialogs/selectcategoriesdialog.cpp             |    7 +-
 src/dialogs/selectpropertydialog.cpp               |    6 +-
 src/dialogs/selectrecipedialog.cpp                 |    2 +-
 src/dialogs/selectunitdialog.cpp                   |    2 +-
 src/dialogs/setupdisplay.cpp                       |    4 +-
 src/dialogs/shoppinglistdialog.cpp                 |    2 +-
 src/dialogs/similarcategoriesdialog.cpp            |    3 -
 src/dialogs/unitsdialog.cpp                        |   23 +-
 src/dialogs/unitsdialog.h                          |    8 +-
 src/exporters/htmlbookexporter.h                   |    1 -
 src/exporters/htmlexporter.cpp                     |    2 -
 src/exporters/kreexporter.cpp                      |   10 +-
 src/exporters/mx2exporter.cpp                      |    5 +-
 src/exporters/plaintextexporter.cpp                |   12 +-
 src/exporters/xsltexporter.cpp                     |    5 +-
 src/importers/baseimporter.cpp                     |   33 +-
 src/importers/kreimporter.cpp                      |    4 +-
 src/importers/mmfimporter.cpp                      |    8 +-
 src/importers/mx2importer.cpp                      |   21 +-
 src/importers/mxpimporter.cpp                      |    9 +-
 src/importers/nycgenericimporter.cpp               |   14 +-
 src/importers/recipemlimporter.cpp                 |   23 +-
 src/importers/rezkonvimporter.cpp                  |   10 +-
 src/krecipes.cpp                                   |   12 +-
 src/krecipes.desktop                               |   34 +-
 src/krecipes.h                                     |    2 -
 src/krecipesview.cpp                               |   48 +-
 src/krecipesview.h                                 |    6 +-
 src/krepagelayout.cpp                              |  241 -
 src/krepagelayout.h                                |  255 -
 src/main.cpp                                       |    7 +-
 src/nukedb/README                                  |    5 +
 src/nukedb/main.cpp                                |   35 +
 .../kreborder.cpp => nukedb/mainwindow.cpp}        |   28 +-
 .../recipelist.cpp => nukedb/mainwindow.h}         |   31 +-
 src/nukedb/nukeconfigwidget.cpp                    |  210 +
 src/nukedb/nukeconfigwidget.h                      |   48 +
 src/nukedb/nukeconfigwidget.ui                     |  365 +
 src/pref.cpp                                       |   16 +-
 src/profiling.h                                    |    2 +-
 src/setupassistant.cpp                             |   14 +-
 src/tests/database/authors.cpp                     |   77 +
 src/tests/{test_unit.h => database/authors.h}      |   29 +-
 src/tests/database/encoding.cpp                    |  139 +
 src/tests/{test_unit.h => database/encoding.h}     |   30 +-
 .../datablocks/mixednumber.cpp}                    |   35 +-
 .../mixednumber.h}                                 |   17 +-
 .../{test_rating.cpp => datablocks/rating.cpp}     |    4 +-
 src/tests/{test_rating.h => datablocks/rating.h}   |    0
 .../ratingcriteria.cpp}                            |    4 +-
 .../ratingcriteria.h}                              |    0
 src/tests/{test_unit.cpp => datablocks/unit.cpp}   |    4 +-
 src/tests/{test_unit.h => datablocks/unit.h}       |    0
 .../unitratio.cpp}                                 |    4 +-
 .../{test_unitratio.h => datablocks/unitratio.h}   |    0
 .../unitratiolist.cpp}                             |    4 +-
 .../unitratiolist.h}                               |    0
 .../{test_weight.cpp => datablocks/weight.cpp}     |    4 +-
 src/tests/{test_weight.h => datablocks/weight.h}   |    0
 src/tests/{test_yield.cpp => datablocks/yield.cpp} |    4 +-
 src/tests/{test_yield.h => datablocks/yield.h}     |    0
 src/tests/{ => import-export}/checks.h             |    2 -
 src/tests/{ => import-export}/exportertest.h       |    0
 src/tests/{ => import-export}/importertest.h       |    0
 src/tests/{ => import-export}/kretest.cpp          |    0
 src/tests/{ => import-export}/kretest.txt          |    0
 src/tests/{ => import-export}/mmftest.cpp          |    0
 src/tests/{ => import-export}/mmftest.txt          |    0
 src/tests/{ => import-export}/mx2test.cpp          |    2 +-
 src/tests/{ => import-export}/mx2test.txt          |    0
 src/tests/{ => import-export}/mxptest.cpp          |    0
 src/tests/{ => import-export}/mxptest.txt          |    0
 src/tests/{ => import-export}/nyctest.cpp          |    0
 src/tests/{ => import-export}/nyctest.txt          |    0
 src/tests/{ => import-export}/recipemltest.cpp     |    0
 src/tests/{ => import-export}/recipemltest.txt     |    0
 src/tests/{ => import-export}/rezkonvtest.cpp      |    0
 src/tests/{ => import-export}/rezkonvtest.txt      |    0
 src/tests/{ => import-export}/test_photo.jpg       |  Bin
 src/threadedqueries/loadingauthorsthread.cpp       |   52 +
 src/threadedqueries/loadingauthorsthread.h         |   44 +
 .../mixednumbervalidator.cpp}                      |   21 +-
 .../mixednumbervalidator.h}                        |   20 +-
 src/widgets/authorlistview.cpp                     |    8 +-
 src/widgets/categorylistview.cpp                   |   12 +-
 src/widgets/conversiontable.cpp                    |    3 +-
 src/widgets/criteriacombobox.cpp                   |    2 -
 src/widgets/dblistviewbase.cpp                     |    6 +-
 src/widgets/fractioninput.cpp                      |    2 +-
 src/widgets/headerlistview.cpp                     |    4 +-
 src/widgets/ingredientcombobox.cpp                 |    1 -
 src/widgets/ingredientinputwidget.cpp              |   34 +-
 src/widgets/ingredientinputwidget.h                |    6 +-
 src/widgets/ingredientlistview.cpp                 |   12 +-
 src/widgets/kratingpainter.cpp                     |  356 -
 src/widgets/kratingpainter.h                       |  217 -
 src/widgets/kratingwidget.cpp                      |  261 -
 src/widgets/kratingwidget.h                        |  202 -
 src/widgets/kreauthorlistwidget.cpp                |  120 +
 src/widgets/kreauthorlistwidget.h                  |   50 +
 src/widgets/krecategorieslistwidget.cpp            |  136 +
 src/widgets/krecategorieslistwidget.h              |   44 +
 src/widgets/kreconversiontable.cpp                 |  150 +
 src/widgets/kreconversiontable.h                   |   61 +
 src/widgets/kregenericlistwidget.cpp               |  231 +
 src/widgets/kregenericlistwidget.h                 |   95 +
 src/widgets/kregenericlistwidget.ui                |   98 +
 src/widgets/kremenu.cpp                            |  127 +-
 src/widgets/kremenu.h                              |    6 +-
 src/widgets/kreruler.cpp                           | 1052 ---
 src/widgets/kreruler.h                             |  368 -
 src/widgets/kretextedit.cpp                        |    1 +
 src/widgets/kwidgetlistbox.cpp                     |   17 +-
 src/widgets/kwidgetlistbox.h                       |    1 -
 src/widgets/paneldeco.cpp                          |    2 +-
 src/widgets/paneldeco.h                            |    2 +-
 src/widgets/prepmethodcombobox.cpp                 |    1 -
 src/widgets/prepmethodlistview.cpp                 |    4 +-
 src/widgets/propertylistview.cpp                   |   14 +-
 src/widgets/propertylistview.h                     |    2 +-
 src/widgets/recipelistview.cpp                     |    2 +-
 src/widgets/thumbbar.cpp                           |   23 +-
 src/widgets/unitcombobox.cpp                       |    2 -
 src/widgets/unitlistview.cpp                       |    2 +-
 513 files changed, 105966 insertions(+), 152723 deletions(-)

-- 
krecipes packaging



More information about the pkg-kde-commits mailing list