Skip to content

Commit

Permalink
chore: squash merged epic branch
Browse files Browse the repository at this point in the history
commit 7a2c972
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Thu Nov 21 12:00:17 2019 +0100

    chore: squash merge master into epic branch

    commit 26a95e8
    Author: Martin <martin@moid.se>
    Date:   Thu Nov 21 10:25:25 2019 +0100

        fix: added icons to tooltip for warning and locked (#447)

        * added icons for warning and locked to dimension tooltip

    commit 445f1d8
    Author: Martin <martin@moid.se>
    Date:   Thu Nov 21 10:13:48 2019 +0100

        fix: rules dim handling (#446)

        * fix: passing dimension id instead of whole dimension object

        * fix: updated imports to follow latest Analytics signature

        * fix: Updated Analytics dep to v2.6.9

    commit b75967a
    Author: Jan Henrik Øverland <jan@dhis2.org>
    Date:   Thu Nov 21 08:14:04 2019 +0100

        fix: rename axis name constants (#445)

        * fix: rename axis name to axis id

        * fix: rename axis display name to axis name

        * fix: Updated Analytics dep to v2.6.8

    commit 883304f
    Author: Jan Henrik Øverland <jan@dhis2.org>
    Date:   Wed Nov 20 16:52:43 2019 +0100

        fix: use locked dimensions rule from analytics (#444)

        * fix: use locked dimensions rule from Analytics in chip

        * fix: show locked in tooltip

        * fix: use axis constants

        * fix: Updated Analytics dep to v2.6.6

    commit ded0ee9
    Author: Martin <martin@moid.se>
    Date:   Wed Nov 20 10:09:54 2019 +0100

        fix: use max items rule (#373)

        * feat: use max items rule

        * fix: use layout rules in DialogManager

        * fix: use rules logic for single value items

        * fix: Updated Analytics dep to v2.6.5

    commit 7fa8693
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:29 2019 +0100

        chore(translations): sync Arabic translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c3c5753
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:27 2019 +0100

        chore(translations): sync Spanish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 84e30cf
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:25 2019 +0100

        chore(translations): sync PersianAfghanistan translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 613e818
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:22 2019 +0100

        chore(translations): sync French translations from transifex (master)

        Automatically merged to resolve the avalance

    commit f0a73e7
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:19 2019 +0100

        chore(translations): sync Lao translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a251cc0
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:16 2019 +0100

        chore(translations): sync Burmese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a9d70dd
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:13 2019 +0100

        chore(translations): sync Pushto translations from transifex (master)

        Automatically merged to resolve the avalance

    commit bf94c6d
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:11 2019 +0100

        chore(translations): sync Portuguese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 41c2f38
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:09 2019 +0100

        chore(translations): sync PortugueseBrazil translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 782e55a
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:06 2019 +0100

        chore(translations): sync Russian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c6d5f76
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:03 2019 +0100

        chore(translations): sync Swedish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 3ed9dcb
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:00 2019 +0100

        chore(translations): sync TetumTetun translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 6b76689
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:30:56 2019 +0100

        chore(translations): sync Tajik translations from transifex (master)

        Automatically merged to resolve the avalance

    commit f95ef04
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:30:54 2019 +0100

        chore(translations): sync Ukrainian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit ecbf268
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:30:51 2019 +0100

        chore(translations): sync Vietnamese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit e6c7fa6
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:13:48 2019 +0100

        chore(translations): sync Chinese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c96ac09
    Author: Martin <martin@moid.se>
    Date:   Fri Nov 15 14:11:55 2019 +0100

        fix: changed incorrect prop types and tests (#372)

        * fix: changed incorrect prop types and tests

        * fix: upgraded to Analytics v2.6.2

    commit 22c36e2
    Author: Martin <martin@moid.se>
    Date:   Fri Nov 15 13:06:07 2019 +0100

        fix: map is not vis type (#371)

        * fix: extracted map from vis type to a static item

        * fix: renamed chart to vis

        * refactor: removed legacy native type to use only vis type instead

        * fix: issue with 'selected' prop

        * fix: added missing comment from Analytics

        * fix: added prop types

        * fix: added more prop types

        * fix: removed unnecessary prop type

    commit 91847d2
    Author: Martin <martin@moid.se>
    Date:   Thu Nov 14 15:57:02 2019 +0100

        Fix: Implement disallowed dims from Analytics UI rules (#370)

        * fix: using Analytics to calculate disallowed dimensions
        * fix: Analytics v2.6.0

    commit 26d12c6
    Author: Martin <martin@moid.se>
    Date:   Thu Nov 14 11:30:20 2019 +0100

        fix: use shared vis types (#368)

        * use vis types from analytics
        * upgrades to and depends on @dhis2/analytics to v2.5.2
        * implemented layout rules for the "add to layout" button

    commit a3dbb9f
    Author: Jan Henrik Øverland <jan@dhis2.org>
    Date:   Mon Nov 11 14:46:30 2019 +0100

        feat: use layout rules for add-to-layout ui (#362)

        * feat: generate add to layout button/menu based on rules

        * feat: refactor logic to use rules

        * upgrade @dhis2/analytics dep

        * tmp fix add to button tests

        * TODO fix tests

        * remove comment

        * replace local fn with analytics fn

        * todo: tmp commented out tests

        * remove folder

    commit d6ba4a3
    Author: Jan Henrik Øverland <jan@dhis2.org>
    Date:   Mon Nov 11 14:09:50 2019 +0100

        refactor: use dimension menu from @dhis2/analytics (#364)

        * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus

        * refactor: upgraded @dhis2/analytics to v2.5.1

    commit 204fe7a
    Author: Jan Henrik Overland <janhenrik.overland@gmail.com>
    Date:   Tue Nov 5 14:02:06 2019 +0100

        fix: use axisName instead of axisKey

    commit dd8b563
    Author: Martin <martin@moid.se>
    Date:   Tue Nov 5 11:22:22 2019 +0100

        updated analytics repo (#363)

    commit 8c0ed13
    Author: Martin <martin@moid.se>
    Date:   Tue Nov 5 11:20:18 2019 +0100

        fix: changed height to min-height for the axes area (#361)

    commit 74edb3c
    Author: Viktor Varland <viktor@dhis2.org>
    Date:   Thu Oct 24 19:39:35 2019 +0200

        chore(deps): upgrade d2-i18n(-generate) deps (master) (#359)

        * chore(deps): upgrade d2-i18n(-generate) deps (master)

        * chore(deps): update i18n for packages

    commit 4bcb913
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Thu Oct 24 12:22:35 2019 +0200

        chore(translations): sync Russian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 2941ee9
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:24 2019 +0200

        chore(translations): sync Arabic translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 6067063
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:21 2019 +0200

        chore(translations): sync Danish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 5f8ec50
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:19 2019 +0200

        chore(translations): sync Spanish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit ee07b7b
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:16 2019 +0200

        chore(translations): sync PersianAfghanistan translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 3e5ab95
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:14 2019 +0200

        chore(translations): sync French translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 754984e
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:11 2019 +0200

        chore(translations): sync Indonesian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit b0c23c8
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:07 2019 +0200

        chore(translations): sync Lao translations from transifex (master)

        Automatically merged to resolve the avalance

    commit e1531d0
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:01 2019 +0200

        chore(translations): sync Burmese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 9af084b
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:58 2019 +0200

        chore(translations): sync Pushto translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 21f72cb
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:56 2019 +0200

        chore(translations): sync Portuguese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit e0d1207
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:53 2019 +0200

        chore(translations): sync PortugueseBrazil translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a9c2ace
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:51 2019 +0200

        chore(translations): sync Swedish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 8e8e467
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:49 2019 +0200

        chore(translations): sync TetumTetun translations from transifex (master)

        Automatically merged to resolve the avalance

    commit cdce03b
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:46 2019 +0200

        chore(translations): sync Tajik translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a63b9ec
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:44 2019 +0200

        chore(translations): sync Ukrainian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c37f5a2
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:42 2019 +0200

        chore(translations): sync Urdu translations from transifex (master)

        Automatically merged to resolve the avalance

    commit bbc8ebf
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:39 2019 +0200

        chore(translations): sync Vietnamese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 8c5b0c7
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:36 2019 +0200

        chore(translations): sync Chinese translations from transifex (master)

        Automatically merged to resolve the avalance

commit fe435d5
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Thu Nov 21 11:49:23 2019 +0100

    chore: update @dhis2/analytics for PT support

commit df7e3f5
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Thu Nov 21 11:44:21 2019 +0100

    fix: solve problems after merge

commit f14aad3
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Thu Nov 21 11:31:56 2019 +0100

    chore: squash merge master into epic branch

    commit 7fa8693
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:29 2019 +0100

        chore(translations): sync Arabic translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c3c5753
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:27 2019 +0100

        chore(translations): sync Spanish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 84e30cf
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:25 2019 +0100

        chore(translations): sync PersianAfghanistan translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 613e818
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:22 2019 +0100

        chore(translations): sync French translations from transifex (master)

        Automatically merged to resolve the avalance

    commit f0a73e7
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:19 2019 +0100

        chore(translations): sync Lao translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a251cc0
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:16 2019 +0100

        chore(translations): sync Burmese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a9d70dd
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:13 2019 +0100

        chore(translations): sync Pushto translations from transifex (master)

        Automatically merged to resolve the avalance

    commit bf94c6d
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:11 2019 +0100

        chore(translations): sync Portuguese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 41c2f38
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:09 2019 +0100

        chore(translations): sync PortugueseBrazil translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 782e55a
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:06 2019 +0100

        chore(translations): sync Russian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c6d5f76
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:03 2019 +0100

        chore(translations): sync Swedish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 3ed9dcb
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:31:00 2019 +0100

        chore(translations): sync TetumTetun translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 6b76689
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:30:56 2019 +0100

        chore(translations): sync Tajik translations from transifex (master)

        Automatically merged to resolve the avalance

    commit f95ef04
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:30:54 2019 +0100

        chore(translations): sync Ukrainian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit ecbf268
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:30:51 2019 +0100

        chore(translations): sync Vietnamese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit e6c7fa6
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Tue Nov 19 09:13:48 2019 +0100

        chore(translations): sync Chinese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c96ac09
    Author: Martin <martin@moid.se>
    Date:   Fri Nov 15 14:11:55 2019 +0100

        fix: changed incorrect prop types and tests (#372)

        * fix: changed incorrect prop types and tests

        * fix: upgraded to Analytics v2.6.2

    commit 22c36e2
    Author: Martin <martin@moid.se>
    Date:   Fri Nov 15 13:06:07 2019 +0100

        fix: map is not vis type (#371)

        * fix: extracted map from vis type to a static item

        * fix: renamed chart to vis

        * refactor: removed legacy native type to use only vis type instead

        * fix: issue with 'selected' prop

        * fix: added missing comment from Analytics

        * fix: added prop types

        * fix: added more prop types

        * fix: removed unnecessary prop type

    commit 91847d2
    Author: Martin <martin@moid.se>
    Date:   Thu Nov 14 15:57:02 2019 +0100

        Fix: Implement disallowed dims from Analytics UI rules (#370)

        * fix: using Analytics to calculate disallowed dimensions
        * fix: Analytics v2.6.0

    commit 26d12c6
    Author: Martin <martin@moid.se>
    Date:   Thu Nov 14 11:30:20 2019 +0100

        fix: use shared vis types (#368)

        * use vis types from analytics
        * upgrades to and depends on @dhis2/analytics to v2.5.2
        * implemented layout rules for the "add to layout" button

    commit a3dbb9f
    Author: Jan Henrik Øverland <jan@dhis2.org>
    Date:   Mon Nov 11 14:46:30 2019 +0100

        feat: use layout rules for add-to-layout ui (#362)

        * feat: generate add to layout button/menu based on rules

        * feat: refactor logic to use rules

        * upgrade @dhis2/analytics dep

        * tmp fix add to button tests

        * TODO fix tests

        * remove comment

        * replace local fn with analytics fn

        * todo: tmp commented out tests

        * remove folder

    commit d6ba4a3
    Author: Jan Henrik Øverland <jan@dhis2.org>
    Date:   Mon Nov 11 14:09:50 2019 +0100

        refactor: use dimension menu from @dhis2/analytics (#364)

        * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus

        * refactor: upgraded @dhis2/analytics to v2.5.1

    commit 204fe7a
    Author: Jan Henrik Overland <janhenrik.overland@gmail.com>
    Date:   Tue Nov 5 14:02:06 2019 +0100

        fix: use axisName instead of axisKey

    commit dd8b563
    Author: Martin <martin@moid.se>
    Date:   Tue Nov 5 11:22:22 2019 +0100

        updated analytics repo (#363)

    commit 8c0ed13
    Author: Martin <martin@moid.se>
    Date:   Tue Nov 5 11:20:18 2019 +0100

        fix: changed height to min-height for the axes area (#361)

    commit 74edb3c
    Author: Viktor Varland <viktor@dhis2.org>
    Date:   Thu Oct 24 19:39:35 2019 +0200

        chore(deps): upgrade d2-i18n(-generate) deps (master) (#359)

        * chore(deps): upgrade d2-i18n(-generate) deps (master)

        * chore(deps): update i18n for packages

    commit 4bcb913
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Thu Oct 24 12:22:35 2019 +0200

        chore(translations): sync Russian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 2941ee9
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:24 2019 +0200

        chore(translations): sync Arabic translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 6067063
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:21 2019 +0200

        chore(translations): sync Danish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 5f8ec50
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:19 2019 +0200

        chore(translations): sync Spanish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit ee07b7b
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:16 2019 +0200

        chore(translations): sync PersianAfghanistan translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 3e5ab95
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:14 2019 +0200

        chore(translations): sync French translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 754984e
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:11 2019 +0200

        chore(translations): sync Indonesian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit b0c23c8
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:07 2019 +0200

        chore(translations): sync Lao translations from transifex (master)

        Automatically merged to resolve the avalance

    commit e1531d0
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:02:01 2019 +0200

        chore(translations): sync Burmese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 9af084b
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:58 2019 +0200

        chore(translations): sync Pushto translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 21f72cb
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:56 2019 +0200

        chore(translations): sync Portuguese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit e0d1207
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:53 2019 +0200

        chore(translations): sync PortugueseBrazil translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a9c2ace
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:51 2019 +0200

        chore(translations): sync Swedish translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 8e8e467
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:49 2019 +0200

        chore(translations): sync TetumTetun translations from transifex (master)

        Automatically merged to resolve the avalance

    commit cdce03b
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:46 2019 +0200

        chore(translations): sync Tajik translations from transifex (master)

        Automatically merged to resolve the avalance

    commit a63b9ec
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:44 2019 +0200

        chore(translations): sync Ukrainian translations from transifex (master)

        Automatically merged to resolve the avalance

    commit c37f5a2
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:42 2019 +0200

        chore(translations): sync Urdu translations from transifex (master)

        Automatically merged to resolve the avalance

    commit bbc8ebf
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:39 2019 +0200

        chore(translations): sync Vietnamese translations from transifex (master)

        Automatically merged to resolve the avalance

    commit 8c5b0c7
    Author: @dhis2-bot <apps@dhis2.org>
    Date:   Wed Oct 23 15:01:36 2019 +0200

        chore(translations): sync Chinese translations from transifex (master)

        Automatically merged to resolve the avalance

commit 7ca2022
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Wed Nov 13 11:20:03 2019 +0100

    chore: add icon for PT vis type (#369)
  • Loading branch information
edoardo committed Nov 21, 2019
1 parent 0ef57b3 commit e9103fc
Show file tree
Hide file tree
Showing 57 changed files with 791 additions and 755 deletions.
7 changes: 4 additions & 3 deletions packages/app/i18n/ar.po
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Translators:
# Viktor Varland <viktor@dhis2.org>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: Arabic (https://www.transifex.com/hisp-uio/teams/100509/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -21,7 +22,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "البيانات المرئية"

msgid "Axis 1"
msgstr ""
Expand Down Expand Up @@ -256,7 +257,7 @@ msgid "Polynomial"
msgstr "متعدد الحدود"

msgid "Loess"
msgstr "Loess"
msgstr ""

msgid "Show values"
msgstr "إظهار القيم"
Expand Down
67 changes: 18 additions & 49 deletions packages/app/i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2019-11-19T09:44:28.453Z\n"
"PO-Revision-Date: 2019-11-19T09:44:28.453Z\n"
"POT-Creation-Date: 2019-11-21T07:25:38.180Z\n"
"PO-Revision-Date: 2019-11-21T07:25:38.180Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -38,8 +38,13 @@ msgid "Update"
msgstr ""

msgid ""
"'Single Value' is intended to show a single data item. Only the first item "
"will be used and saved."
"'{{visualiationType}}' is intended to show a single data item. Only the "
"first item will be used and saved."
msgstr ""

msgid ""
"'{{visualiationType}}' is intended to show maximum {{maxNumber}} number of "
"items. Only the first {{maxNumber}} items will be used and saved."
msgstr ""

msgid "Hide"
Expand Down Expand Up @@ -93,22 +98,22 @@ msgstr ""
msgid "Interpretations"
msgstr ""

msgid "{{total}} of 1 selected"
msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}"
msgstr ""

msgid "{{total}} selected"
msgid "{{total}} of {{maxNumberOfItemsPerAxis}} selected"
msgstr ""

msgid "Series"
msgid "{{total}} selected"
msgstr ""

msgid "Category"
msgid "Move to"
msgstr ""

msgid "Filter"
msgid "Remove"
msgstr ""

msgid "Move to"
msgid "Remove"
msgstr ""

msgid "Remove"
Expand All @@ -120,6 +125,9 @@ msgstr ""
msgid "Only '{{name}}' in use"
msgstr ""

msgid "Only '{{number}}' in use"
msgstr ""

msgid "Unsaved chart"
msgstr ""

Expand Down Expand Up @@ -413,45 +421,6 @@ msgstr ""
msgid "Options"
msgstr ""

msgid "Pivot table"
msgstr ""

msgid "Column"
msgstr ""

msgid "Stacked column"
msgstr ""

msgid "Bar"
msgstr ""

msgid "Stacked bar"
msgstr ""

msgid "Line"
msgstr ""

msgid "Area"
msgstr ""

msgid "Pie"
msgstr ""

msgid "Radar"
msgstr ""

msgid "Gauge"
msgstr ""

msgid "Year over year (line)"
msgstr ""

msgid "Year over year (column)"
msgstr ""

msgid "Single value"
msgstr ""

msgid "Open as Map"
msgstr ""

Expand Down
14 changes: 7 additions & 7 deletions packages/app/i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Translators:
# phil_dhis2, 2019
# Viktor Varland <viktor@dhis2.org>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: Spanish (https://www.transifex.com/hisp-uio/teams/100509/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -22,7 +22,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "Visualizador de Datos"

msgid "Axis 1"
msgstr ""
Expand Down Expand Up @@ -80,7 +80,7 @@ msgid "Data value set"
msgstr "Valor de los datos"

msgid "Other formats"
msgstr "Other formats"
msgstr ""

msgid "An error occurred in the DHIS2 Data Visualizer application."
msgstr ""
Expand Down Expand Up @@ -110,10 +110,10 @@ msgid "{{total}} selected"
msgstr ""

msgid "Series"
msgstr "Series"
msgstr ""

msgid "Category"
msgstr "Category"
msgstr "Categoría"

msgid "Filter"
msgstr "filtro"
Expand Down Expand Up @@ -356,7 +356,7 @@ msgid "Expected reports"
msgstr ""

msgid "Program"
msgstr "Program"
msgstr "Programa"

msgid "Select a program"
msgstr ""
Expand Down
10 changes: 5 additions & 5 deletions packages/app/i18n/fr.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Translators:
# Austin McGee <austin@dhis2.org>, 2019
# mrwine <matthieu@pinard.no>, 2019
# Viktor Varland <viktor@dhis2.org>, 2019
# Bram Piot <bram.piot@gmail.com>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Bram Piot <bram.piot@gmail.com>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: French (https://www.transifex.com/hisp-uio/teams/100509/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -24,7 +24,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "Visualiseur de données"

msgid "Axis 1"
msgstr ""
Expand Down Expand Up @@ -181,7 +181,7 @@ msgid "Standard deviation"
msgstr "Écart type"

msgid "Variance"
msgstr "Variance"
msgstr ""

msgid "Base line"
msgstr ""
Expand Down Expand Up @@ -400,7 +400,7 @@ msgid "Event data items"
msgstr "Eléments de données évènement"

msgid "Program indicators"
msgstr "Program indicators"
msgstr "Indicateurs de programme"

msgid "Add to series"
msgstr ""
Expand Down
Loading

0 comments on commit e9103fc

Please sign in to comment.