Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -1,3 +1,4 @@
+lokalise.cfg
 .DS_Store
 xcuserdata/
 compile/

Readme.md

@@ -147,7 +147,7 @@ You can easily check for yourself what to expect by opening a video in Quicktime
 - "You cannot use the Aerial screen saver with this version of macOS." error: Select Aerial, close `System Preferences` with Aerial still selected, re-open System Preferences and Aerial should now work. This is a known bug with Swift screensavers in macOS/OS X reported to Apple as [rdar://25569037](http://www.openradar.me/25569037).
 - High CPU usage/fan spinning all of a sudden: If you correctly configured the preferred video format according to your Mac and still experience high CPU usage/fan spinning all of a sudden, please look for the cause with `Activity Monitor`, you may see a `com.apple.photos.ImageConversionService` responsible for this CPU load.  This is the iCloud Photos process, you can find more about [what it does here](https://support.apple.com/en-gu/HT204264) and how to pause it.
 - Can't use Aerial as a login screensaver: As far as we know, using 3rd party screensavers before login is no longer possible on modern versions of macOS. More about this [here](https://github.com/JohnCoates/Aerial/issues/571).
-
+- Change cache location : This option simply changes *the location* of the Cache folder that Aerial uses. It does *not* move your files for you. Please note that this change will only be taken into account the next time Aerial starts (you may need to fully close System Preferences). We strongly recommend you use a path that's always accessible, as Aerial can't work without a Cache directory. In case the path is no longer available (missing USB key, etc), starting with Aerial 1.4.7, it will reset the Cache location to it's default location. 
 
 ## License
 [MIT License](https://raw.githubusercontent.com/JohnCoates/Aerial/master/LICENSE)

Resources/Community/Readme.md

@@ -0,0 +1,29 @@
+# Translations of the community strings
+
+Aerial features overlay descriptions of the main geographical features displayed in its videos. This is possible thanks to the collaboration and uninterested work of many. To best serve this international community we've a translation workflow defined that allows any person, even with no technical background to help translating the descriptions.
+
+In the following sections we explain how to collaborate in the internationalization process both as a translator and as a developer.
+
+## For translators
+
+1. Contact @glouel or @aitor to get added to the Translators team at Lokalise.
+2. Access the translations dashboard at https://lokalise.co/ and translate or update the existing strings to your language.
+3. PROFIT!
+
+## For developers
+
+The translation workflow follows a pull mode, meaning that new strings will be defined in the Lokalise service and pulled into the project once they have been translated. The pulling process will be repeated after any changes has been made to the strings.
+
+### Setting up the project
+
+1. Contact @glouel to get added to the Devs team at Lokalise.
+2. Use the existing configuration example file to create your local configuration
+   `cp lokalise.example.cfg lokalise.cfg`
+3. In the created file update the `Token` string with your token. To get your token visit the section `API Tokens` at https://lokalise.co/profile
+
+### Downloading/pulling translations
+
+1. Install Lokalise CLI: https://docs.lokalise.co/api-and-cli/lokalise-cli-tool
+2. Once the CLI has been installed you can pull the latest versions of each language with the following command:
+   `lokalise --config lokalise.cfg d --type json --dest Resources/Community --unzip_to Resources/Community`
+3. Commit and push the new `*.json` files to the repo.

lokalise.example.cfg

@@ -0,0 +1,2 @@
+Token = "YOUR_LOKALISE_TOKEN"
+Project = "526621525c59d35a304987.58424707"