-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from asdoria/develop
Develop
- Loading branch information
Showing
5 changed files
with
51 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
asdoria: | ||
menu: | ||
admin: | ||
main: | ||
pictogram_groups: | ||
header: Pictogram Groups | ||
ui: | ||
pictograms: Pictograms | ||
pictogram_groups: Pictogram Groups | ||
pictogram_group: Pictogram Group | ||
new_pictogram: New Pictogram | ||
new_pictogram_group: New pictogram group | ||
edit_pictogram_group: Modify ictogram group | ||
edit_pictogram: Modify pictogram | ||
manage_pictograms: Modify Pictograms | ||
form: | ||
pictogram: | ||
main_image: Main image | ||
pictogram_group: Pictogram group | ||
name: Name | ||
pictogram_group: | ||
name: Name | ||
pictograms: Pictograms | ||
pictogram_image: | ||
file: Image |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
asdoria: | ||
menu: | ||
admin: | ||
main: | ||
pictogram_groups: | ||
header: Groupe de Pictogramme | ||
ui: | ||
pictograms: Pictogrammes | ||
pictogram_groups: Groupes de pictogramme | ||
pictogram_group: Groupe de pictogramme | ||
new_pictogram: Nouveau pictogramme | ||
new_pictogram_group: Nouveau groupe de pictogramme | ||
edit_pictogram_group: Modifier le groupe de pictogramme | ||
edit_pictogram: Modifier le pictogramme | ||
manage_pictograms: Gérer les pictogrammes | ||
form: | ||
pictogram: | ||
main_image: Image principale | ||
pictogram_group: Groupe de pictogramme | ||
name: Nom | ||
pictogram_group: | ||
name: Nom | ||
pictograms: Pictogrammes | ||
pictogram_image: | ||
file: Image |