Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Use JText to translate strings #100

Merged
merged 3 commits into from
Feb 25, 2017
Merged

Use JText to translate strings #100

merged 3 commits into from
Feb 25, 2017

Commits on Feb 24, 2017

  1. Use JText to translate strings

    @laoneo
    laoneo committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    5895af2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/milestone1-j4' into feature/clie… 

    …nt/translate

Conflicts:
	administrator/components/com_media/resources/components/toolbar/toolbar.vue
	media/com_media/js/mediamanager.js
    @laoneo
    laoneo committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    43820ba View commit details
    Browse the repository at this point in the history

  3. Change strings in modal

    @laoneo
    laoneo committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    1dd4371 View commit details
    Browse the repository at this point in the history