Adds Popcorn, sorts final JSON

README.md

@@ -1,39 +1,34 @@
 # FoundryVTT en Galego
 
-* **Author**: Xurxo Diz Pico [Discord: xurxodiz#5885]
-* **Version**: 0.7.7.9
-* **Foundry VTT compatibility**: 0.7.7
-
-## Links to translation
-
-* Github: https://github.com/xurxodiz/foundryvtt-gl
-* Manifest: https://github.com/xurxodiz/foundryvtt-gl/releases/latest/download/module.json
-
-## Description
-
 Galician translation of core FoundryVTT and other systems and modules.
 
-Available in the integrated module browser (or manually using the manifest URL). 
-
-To enable it in your world, go to Game Settings > Manage modules and enable the `FoundryVTT en Galego` module,
-then go to Game Settings > Configure Settings and change the Language to Galego.
-
-You can also set it as the default language for Foundry in Settings > Default language. Restart needed.
-
 ## Module translations included
 
 - **FoundryVTT Core**: 0.7.7
 - **[FateX](https://github.com/anvil-vtt/FateX)**: 0.8.0
 - **[X-Card](https://github.com/Sk1mble/XCard)**: 0.0.4
+- **[Popcorn](https://github.com/Sk1mble/Popcorn)**: 1.2.0
+
+## Installation
+
+Available in the integrated module browser, or manually using
+[the manifest URL](https://github.com/xurxodiz/foundryvtt-gl/releases/latest/download/module.json).
+
+To enable it in your world, go to `Game Settings > Manage modules` and enable the `FoundryVTT en Galego` module,
+then go to `Game Settings > Configure Settings` and change the `Language` to `Galego`.
+
+You can also set it as the default language for Foundry in `Settings > Default language`. Restart needed.
 
 ## Contributing
 
 - Every FoundryVTT package has a JSON file with the strings needed to localize it.
-- Add new files for modules inside an appropriately named folder in the `i18n` directory.
+- Add new files for modules inside an appropriately named folder in the `i18n` directory (see existing examples)
 - Then use [i18n-editor](https://github.com/andi34/i18n-editor) to open that folder and add a `gl` locale.
 - The editor will show you the original English and (empty) Galician keys side by side.
 - Translate the keys by filling the `gl` textbox for each one.
-- Once done, run `make combine` in the root folder to integrate your additions (you will need [gulp](https://gulpjs.com/docs/en/getting-started/quick-start))
+- Once done, run `make combine` in the root folder to integrate your additions
+	- The first time you do, make sure you install [npm](https://www.npmjs.com/) and [gulp](https://gulpjs.com/docs/en/getting-started/quick-start))
+	before and run `npm install` in the root folder to get the rest of the dependencies
 - Create a new branch, add the new and changed files, commit, push & pull-request.
 - Pat yourself in the back! Castelao would be proud.
 
@@ -53,3 +48,6 @@ as the setup with the different folders and gulp pipeline was shameslessly rippe
 
 Tip of the hat to [FateX](https://github.com/anvil-vtt/FateX), as I took the Github workflows for releases from that project!
 
+### Contributors
+
+- Xurxo Diz Pico [Discord: xurxodiz#5885]

gulpfile.js

@@ -1,10 +1,12 @@
 var gulp = require('gulp');
 var merge = require('gulp-merge-json');
+var sortJSON = require('gulp-json-sort').default;
 
 function defaultTask(cb) {
 
     gulp.src('./source/*.json')
         .pipe(merge())
+        .pipe(sortJSON({ space: 2 }))
         .pipe(gulp.dest('./dist'));
 
     cb();

i18n/popcorn/.i18n-editor-metadata

@@ -0,0 +1,7 @@
+preserve_comments=0
+minify_resources=0
+resource_definition=popcorn
+resource_structure=Nested
+use_single_quotes=0
+resource_type=JSON
+flatten_json=1

i18n/popcorn/en/popcorn.json

@@ -0,0 +1,16 @@
+{
+  "Popcorn.Act": "Act",
+  "Popcorn.ActNow": "Act Now?",
+  "Popcorn.ButtonHint": "Pop-out popcorn initiative tracker",
+  "Popcorn.ButtonName": "PopcornInitiative",
+  "Popcorn.Character": "Character",
+  "Popcorn.EndConflict": "End this conflict",
+  "Popcorn.EndingConflict": "Ending the conflict.",
+  "Popcorn.Exchange": "<h1>Exchange {round}</h1>",
+  "Popcorn.Game": "Game:",
+  "Popcorn.IsActing": "{name} is acting now.",
+  "Popcorn.NewExchange": "Starting a new exchange.",
+  "Popcorn.NextExchange": "Next Exchange",
+  "Popcorn.NoConflicts": "<h1>No Conflicts Detected!</h1>",
+  "Popcorn.WindowTitle": "Popcorn Initiative Tracker"
+}

i18n/popcorn/gl/popcorn.json

@@ -0,0 +1,16 @@
+{
+  "Popcorn.ActNow": "Actuar agora?",
+  "Popcorn.ButtonHint": "Mostra o xestor de iniciativa pipoca",
+  "Popcorn.Act": "Actuar",
+  "Popcorn.ButtonName": "Iniciativa pipoca",
+  "Popcorn.Character": "Personaxe",
+  "Popcorn.EndConflict": "Rematar o conflito",
+  "Popcorn.EndingConflict": "Rematou o conflito.",
+  "Popcorn.Exchange": "<h1>Rolda {round}</h1>",
+  "Popcorn.Game": "Partida:",
+  "Popcorn.IsActing": "{name} ten o turno agora.",
+  "Popcorn.NewExchange": "Comeza unha nova rolda.",
+  "Popcorn.NextExchange": "Seguinte rolda",
+  "Popcorn.NoConflicts": "<h1>Non hai conflitos activos!</h1>",
+  "Popcorn.WindowTitle": "Xestor de iniciativa pipoca"
+}

module.json

@@ -2,7 +2,7 @@
     "name": "foundryvtt-gl",
     "title": "FoundryVTT en Galego",
     "description": "Galician translation of core FoundryVTT and other systems and modules.",
-    "version": "0.7.7.9",
+    "version": "0.7.7.10",
     "minimumCoreVersion": "0.7.6",
     "compatibleCoreVersion": "0.7.7",
     "author": "Xurxo Diz Pico (xurxodiz#5885)",

package.json

@@ -4,6 +4,7 @@
         "gulp": "^4.0.2"
     },
     "dependencies": {
+        "gulp-json-sort": "^1.0.0",
         "gulp-merge-json": "^2.1.1",
         "set-blocking": "^2.0.0"
     }