From 3964bd142a3b0c73b05b99464a152c9b10a634bc Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Wed, 13 Feb 2019 18:44:39 +0100
Subject: [PATCH 1/8] Update appcast.xml
beta 5
---
appcast.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/appcast.xml b/appcast.xml
index 260237d3..05ab12ff 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -6,12 +6,12 @@
- Adds spanish community descriptions
+ Spanish and French community translations are now bundled, with early support for more. Check the readme for more information about the tooling we use (lokalise.co), we more than welcome new languages if you want to contribute !
]]>
-lun., 28 jan. 2019 16:45:29 +0100
+mer., 13 fev. 2019 18:45:29 +0100
10.9
-
+
From a1d095440d64819b0afd7e73e8e00022b5e740ad Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Wed, 13 Feb 2019 18:45:05 +0100
Subject: [PATCH 2/8] Update appcast.xml
---
appcast.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/appcast.xml b/appcast.xml
index 05ab12ff..7e136d21 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -2,7 +2,7 @@
Aerial
-
-1.4.7 beta 4
+1.4.7 beta 5
From 5e35b8be2d2f261ff3755062d7a0c8c0dfe4c0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa=20Rey?=
Date: Mon, 18 Feb 2019 15:40:53 +0100
Subject: [PATCH 3/8] Remove the temp file new_format_en.json now that the new
format has been adopted.
---
Resources/Community/new_format_en.json | 309 -------------------------
1 file changed, 309 deletions(-)
delete mode 100644 Resources/Community/new_format_en.json
diff --git a/Resources/Community/new_format_en.json b/Resources/Community/new_format_en.json
deleted file mode 100644
index 9a1c304f..00000000
--- a/Resources/Community/new_format_en.json
+++ /dev/null
@@ -1,309 +0,0 @@
-{
- "009BA758-7060-4479-8EE8-FB9B40C8FB97": {
- "name": "Korea and Japan Night"
- },
- "B1B5DDC5-73C8-4920-8133-BACCE38A08DE": {
- "name": "Mexico City to New York"
- },
- "7719B48A-2005-4011-9280-2F64EEC6FD91": {
- "name": "Northern California to Baja"
- },
- "B876B645-3955-420E-99DF-60139E451CF3": {
- "name": "Wulingyuan National Park 1"
- },
- "9CCB8297-E9F5-4699-AE1F-890CFBD5E29C": {
- "name": "Longji Rice Terraces"
- },
- "D5E76230-81A3-4F65-A1BA-51B8CADED625": {
- "name": "Wulingyuan National Park 2"
- },
- "F0236EC5-EE72-4058-A6CE-1F7D2E8253BF": {
- "name": "Great Wall 1"
- },
- "22162A9B-DB90-4517-867C-C676BC3E8E95": {
- "name": "Great Wall 2"
- },
- "044AD56C-A107-41B2-90CC-E60CCACFBCF5": {
- "name": "Great Wall 3"
- },
- "876D51F4-3D78-4221-8AD2-F9E78C0FD9B9": {
- "name": "Sheikh Zayed Road"
- },
- "E991AC0C-F272-44D8-88F3-05F44EDFE3AE": {
- "name": "Marina 1"
- },
- "00BA71CD-2C54-415A-A68A-8358E677D750": {
- "name": "Downtown"
- },
- "3FFA2A97-7D28-49EA-AA39-5BC9051B2745": {
- "name": "Marina 2"
- },
- "9680B8EB-CE2A-4395-AF41-402801F4D6A6": {
- "name": "Approaching Burj Khalifa"
- },
- "2F11E857-4F77-4476-8033-4A1E4610AFCC": {
- "name": "Sheikh Zayed Road",
- "pointsOfInterest": {
- "0": "Traveling along Sheikh Zayed Road in Dubai, United Arab Emirates"
- }
- },
- "B8F204CE-6024-49AB-85F9-7CA2F6DCD226": {
- "name": "Nuussuaq Peninsula"
- },
- "2F52E34C-39D4-4AB1-9025-8F7141FAA720": {
- "name": "Ilulissat Icefjord"
- },
- "EE01F02D-1413-436C-AB05-410F224A5B7B": {
- "name": "Ilulissat Icefjord"
- },
- "499995FA-E51A-4ACE-8DFD-BDF8AFF6C943": {
- "name": "Waimanu Valley"
- },
- "12E0343D-2CD9-48EA-AB57-4D680FB6D0C7": {
- "name": "Laupāhoehoe Nui"
- },
- "b2-2": {
- "name": "Honopū Valley"
- },
- "258A6797-CC13-4C3A-AB35-4F25CA3BF474": {
- "name": "Pu‘u O ‘Umi"
- },
- "3D729CFC-9000-48D3-A052-C5BD5B7A6842": {
- "name": "Kohala Coastline"
- },
- "82BD33C9-B6D2-47E7-9C42-AA3B7758921A": {
- "name": "Pu‘u O ‘Umi"
- },
- "FE8E1F9D-59BA-4207-B626-28E34D810D0A": {
- "name": "Victoria Harbour 1"
- },
- "C8559883-6F3E-4AF2-8960-903710CD47B7": {
- "name": "Victoria Peak"
- },
- "024891DE-B7F6-4187-BFE0-E6D237702EF0": {
- "name": "Wan Chai"
- },
- "64EA30BD-C4B5-4CDD-86D7-DFE47E9CB9AA": {
- "name": "Victoria Harbour 2"
- },
- "E99FA658-A59A-4A2D-9F3B-58E7BDC71A9A": {
- "name": "Victoria Harbour"
- },
- "001C94AE-2BA4-4E77-A202-F7DE60E8B1C8": {
- "name": "Liwa Oasis 1"
- },
- "AFA22C08-A486-4CE8-9A13-E355B6C38559": {
- "name": "Liwa Oasis 2"
- },
- "58754319-8709-4AB0-8674-B34F04E7FFE2": {
- "name": "River Thames",
- "pointsOfInterest": {
- "0": "Approaching Tower Bridge on the River Thames in London",
- "40": "Passing the Gherkin in the City of London, on the right",
- "70": "Passing over Tower Bridge on the River Thames, with City Hall behind and the Tower of London to the right",
- "85": "Approaching HMS Belfast in the River Thames, passing the Walkie-Talkie on the right",
- "115": "Traveling west up the River Thames, with The Shard on the left and Saint Paul’s Cathedral on the right",
- "135": "Passing over Southwark Cathedral, with Saint Paul’s Cathedral on the right",
- "175": "Passing Shakespeare’s Globe in Southwark (right foreground)",
- "230": "Passing Waterloo Station on the left, with the Palace of Westminster (Houses of Parliament) across the Thames behind",
- "260": "Passing BFI IMAX in the left foreground, with the London Eye behind",
- "280": "Heading towards Westminster over the River Thames",
- "300": "Approaching Charing Cross Station in the right foreground",
- "312": "Approaching Horse Guards Parade and Saint James’s Park in the left mid-ground",
- "324": "Passing Saint Martin-in-the-Fields on the right, with Admiralty Arch, Nelson’s Column, and Trafalgar Square to its left"
- }
- },
- "A5AAFF5D-8887-42BB-8AFD-867EF557ED85": {
- "name": "Buckingham Palace",
- "pointsOfInterest": {
- "0": "Passing Wellington Arch in London on the left",
- "12": "Flying over the Buckingham Palace Gardens, with Green Park on the left",
- "24": "Flying over Buckingham Palace in London",
- "40": "Flying over the Victoria Memorial, passing Wellington Barracks on the right",
- "55": "Following Birdcage Walk along Saint James’s Park",
- "90": "Passing over the Foreign & Commonwealth Office in Whitehall, with Horse Guards Parade on the left and Her Majesty’s Treasury on the right",
- "102": "Passing over the Cenotaph, with the Ministry of Defence on the left and Big Ben and the Palace of Westminster (Houses of Parliament) on the right",
- "125": "Crossing the River Thames, flying over the London Eye",
- "160": "Passing over Waterloo Station in South London, with BFI IMAX on the left",
- "270": "Passing Southwark Cathedral on the left",
- "285": "Passing The Shard on the right",
- "305": "Passing the cruiser HMS Belfast in the River Thames",
- "330": "Crossing the River Thames at Tower Bridge, with City Hall on the right and the Tower of London on the left"
- }
- },
- "F604AF56-EA77-4960-AEF7-82533CC1A8B3": {
- "name": "River Thames near Sunset",
- "pointsOfInterest": {
- "0": "Heading up the River Thames towards Tower Bridge, with the Tower of London to the right",
- "25": "Crossing the River Thames and passing over City Hall",
- "35": "Passing the cruiser HMS Belfast in the River Thames",
- "60": "Approaching The Shard",
- "92": "Flying west over Southwark towards Lambeth in South London",
- "200": "Passing Lambeth Palace on the left and Waterloo Station on the right",
- "245": "Crossing the River Thames towards the Palace of Westminster (Houses of Parliament)",
- "265": "Passing the Palace of Westminster (Houses of Parliament), with Westminster Abbey behind"
- }
- },
- "7F4C26C2-67C2-4C3A-8F07-8A7BF6148C97": {
- "name": "River Thames at Dusk",
- "pointsOfInterest": {
- "0": "Heading up the River Thames towards Tower Bridge, with the Tower of London to the right",
- "28": "Traveling west up the River Thames, past City Hall on the left",
- "40": "Passing HMS Belfast in the River Thames, with The Shard on the left and the Walkie-Talkie on the right",
- "75": "Passing Southwark Cathedral on the left",
- "110": "Passing Saint Paul’s Cathedral on the right",
- "130": "Passing Shakespeare’s Globe in the left foreground",
- "210": "Continuing up the River Thames towards Westminster",
- "300": "Passing the London Eye on the River Thames",
- "315": "Approaching Big Ben and the Houses of Parliament, with Westminster Abbey to the right"
- }
- },
- "CE279831-1CA7-4A83-A97B-FF1E20234396": {
- "name": "Los Angeles Int’l Airport",
- "pointsOfInterest": {
- "0": "Heading west over Los Angeles International Airport",
- "80": "Passing over the Theme Building",
- "210": "Passing over the Tom Bradley International Terminal"
- }
- },
- "35693AEA-F8C4-4A80-B77D-C94B20A68956": {
- "name": "Harbor Freeway",
- "pointsOfInterest": {
- "0": "Following the Harbor Freeway (Interstate 110) north through South Los Angeles",
- "50": "Crossing the Century Freeway (Interstate 105)",
- "65": "Passing over the Harbor Freeway Station on the Metro Green Line, which runs along the Century Freeway",
- "170": "Crossing Imperial Highway"
- }
- },
- "92E48DE9-13A1-4172-B560-29B4668A87EE": {
- "name": "Santa Monica Beach"
- },
- "89B1643B-06DD-4DEC-B1B0-774493B0F7B7": {
- "name": "Griffith Observatory"
- },
- "EC67726A-8212-4C5E-83CF-8412932740D2": {
- "name": "Hollywood Hills",
- "pointsOfInterest": {
- "0": "Traveling north along Beachwood Drive through the Hollywood Hills in Los Angeles",
- "60": "Continuing north through Beachwood Canyon",
- "250": "Passing the Mount Lee Communications Center, heading towards Burbank, California"
- }
- },
- "F5804DD6-5963-40DA-9FA0-39C0C6E6DEF9": {
- "name": "Downtown",
- "pointsOfInterest": {
- "0": "Approaching Downtown Los Angeles, with the MTA Building (in yellow) and Union Station (in pink) in the left mid-ground",
- "35": "Passing the Cathedral of Our Lady of the Angels (in the center)",
- "55": "Passing the Los Angeles County Music Center (in the center)",
- "65": "Crossing the Hollywood Freeway, traveling south through Downtown along the Harbor Freeway",
- "105": "Passing the Walt Disney Concert Hall (in the center)",
- "120": "Passing City Hall (in pale blue, in the left mid-ground)",
- "180": "Passing the Library Tower (in the center)",
- "200": "Passing the Bonaventure Hotel (in the center)",
- "230": "The Los Angeles Central Library, brightly lit, appears from behind the Bonaventure Hotel",
- "275": "Passing the Wilshire Grand Center (under construction)",
- "365": "Passing L.A. Live",
- "395": "Passing the Ritz-Carlton Hotel and Staples Center",
- "425": "Passing the Los Angeles Convention Center",
- "495": "Approaching the Santa Monica Freeway"
- }
- },
- "3BA0CFC7-E460-4B59-A817-B97F9EBB9B89": {
- "name": "Central Park"
- },
- "b1-3": {
- "name": "Lower Manhattan"
- },
- "840FE8E4-D952-4680-B1A7-AC5BACA2C1F8": {
- "name": "Upper East Side"
- },
-
- "44166C39-8566-4ECA-BD16-43159429B52F": {
- "name": "Seventh Avenue"
- },
- "640DFB00-FBB9-45DA-9444-9F663859F4BC": {
- "name": "Lower Manhattan"
- },
- "b8-2": {
- "name": "Marin Headlands"
- },
- "EE533FBD-90AE-419A-AD13-D7A60E2015D6": {
- "name": "Marin Headlands in Fog",
- "pointsOfInterest": {
- "0": "Moving over the Marin Headlands along Highway 101 towards the Golden Gate Bridge",
- "20": "Horseshoe Cove appearing on the left",
- "105": "Passing Battery Spencer on the right",
- "155": "Crossing the Golden Gate Bridge towards San Francisco"
- }
- },
- "DE851E6D-C2BE-4D9F-AB54-0F9CE994DC51": {
- "name": "Bay and Golden Gate"
- },
- "b8-3": {
- "name": "Alamo Square",
- "pointsOfInterest": {
- "0": "Painted Ladies across from Alamo Square in San Francisco",
- "35": "Saint Mary’s Cathedral in the left mid-ground, with downtown SF in the background",
- "70": "The dome of City Hall appearing in the right mid-ground",
- "210": "The dome of City Hall clear in the right mid-ground"
- }
- },
- "85CE77BF-3413-4A7B-9B0F-732E96229A73": {
- "name": "Embarcadero, Market Street",
- "pointsOfInterest": {
- "0": "Heading southwest over San Francisco Bay to the San Francisco Ferry Building",
- "150": "Approaching the Port of San Francisco Ferry Building and the Embarcadero",
- "210": "Heading southwest along Market Street in downtown San Francisco"
- }
- },
- "b4-3": {
- "name": "Presidio to Golden Gate",
- "pointsOfInterest": {
- "0": "Moving along the Presidio of San Francisco towards the Golden Gate Bridge",
- "190": "Crossing the Golden Gate Bridge towards the Marin Headlands"
- }
- },
- "72B4390D-DF1D-4D51-B179-229BBAEFFF2C": {
- "name": "Golden Gate from SF"
- },
- "b6-4": {
- "name": "Downtown and Coit Tower",
- "pointsOfInterest": {
- "0": "Downtown San Francisco with the Transamerica Pyramid in the center",
- "100": "Downtown San Francisco with Coit Tower coming into view"
- }
- },
- "29BDF297-EB43-403A-8719-A78DA11A2948": {
- "name": "Fisherman’s Wharf",
- "pointsOfInterest": {
- "0": "Heading southeast over Fisherman’s Wharf in San Francisco",
- "27": "Passing the Liberty ship SS Jeremiah O’Brien",
- "47": "Passing over the submarine USS Pampanito",
- "80": "Passing over North Beach in San Francisco",
- "115": "Approaching Coit Tower on Telegraph Hill, with the Bay Bridge and downtown SF in the background",
- "135": "Approaching Coit Tower on Telegraph Hill, with Saints Peter and Paul Church in the right mid-ground"
- }
- },
- "b5-3": {
- "name": "Embarcadero, Market Street",
- "pointsOfInterest": {
- "0": "Heading southwest over San Francisco Bay to the San Francisco Ferry Building",
- "150": "Approaching the Port of San Francisco Ferry Building and the Embarcadero",
- "210": "Heading southwest along Market Street in San Francisco"
- }
- },
- "3E94AE98-EAF2-4B09-96E3-452F46BC114E": {
- "name": "Bay Bridge"
- },
- "b2-4": {
- "name": "Downtown and Sutro Tower",
- "pointsOfInterest": {
- "0": "Heading into San Francisco’s Financial District, with Sutro Tower in the background",
- "10": "Passing the Transamerica Pyramid",
- "50": "Former Bank of America headquarters blotting out the sun"
- }
- },
- "4AD99907-9E76-408D-A7FC-8429FF014201": {
- "name": "Bay and Embarcadero"
- }
-}
From 5246f1ed085c5d562cfd004ec963b014e18fd181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa=20Rey?=
Date: Mon, 18 Feb 2019 16:06:28 +0100
Subject: [PATCH 4/8] Lint main Readme's markdown.
---
Readme.md | 101 +++++++++++++++++++++++++++++++-----------------------
1 file changed, 59 insertions(+), 42 deletions(-)
diff --git a/Readme.md b/Readme.md
index acaa4b4d..2f72137c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,53 +1,61 @@
-## Aerial - Apple TV Aerial Views Screen Saver
-Aerial is a Mac screensaver based on the new Apple TV screensaver that displays the Aerial movies Apple shot over New York, San Francisco, Hawaii, China, etc. Starting with version 1.4, this also includes the new ISS videos available in tvOS 12!
+# Aerial - Apple TV Aerial Views Screen Saver
+
+Aerial is a Mac screensaver based on the new Apple TV screensaver that displays the Aerial movies Apple shot over New York, San Francisco, Hawaii, China, etc. Starting with version 1.4, this also includes the new ISS videos available in tvOS 12!
Aerial is completely open source, so feel free to contribute to its development.
-[]()
-[]()
+
+
[](https://travis-ci.org/JohnCoates/Aerial)
[](https://codebeat.co/projects/github-com-johncoates-aerial-e1c8873e-7a9f-4c74-9e50-0380add2478a)
[](https://codeclimate.com/github/JohnCoates/Aerial)
[](https://codecov.io/gh/JohnCoates/Aerial)
###### Windows user? Try [cDima/Aerial](https://github.com/cDima/Aerial/)
+
###### Linux user? Try [graysky2/xscreensaver-aerial](https://github.com/graysky2/xscreensaver-aerial/)
#### Coded with Love by John Coates ([Twitter](https://twitter.com/JohnCoatesDev), [Email](mailto:john@johncoates.me))
Starting with version 1.4, Aerial is also maintained by:
+
- [Guillaume Louel](https://github.com/glouel) ([Twitter](https://twitter.com/C_Wiz))
-You can see a list of contributors [here](https://github.com/JohnCoates/Aerial/graphs/contributors).
+You can see a list of contributors [here](https://github.com/JohnCoates/Aerial/graphs/contributors).
## Installation
### Manual Installation
-*Rather install from Terminal or have auto-updates? Look at the Brew Cask section below!*
+
+_Rather install from Terminal or have auto-updates? Look at the Brew Cask section below!_
1. Quit **System Preferences**.
2. [Download the latest release of Aerial.saver.zip](https://github.com/JohnCoates/Aerial/releases/latest). (Version 1.4.6, December 12th 2018). Alternatively, you can try the latest beta version [following this link](https://github.com/JohnCoates/Aerial/releases). Version 1.4.7 brings support for the newest videos (updated January 25th 2019), and preliminary support for automatic updates through [Sparkle](https://sparkle-project.org).
3. Unzip the downloaded file (if you use Safari, it should already be done for you).
4. Double-click `Aerial.saver`; it will open in `System Preferences` > `Desktop & Screen Saver` and ask you if you want to install for all users or for your user only.
- If you see an error message saying "This app is damaged and can't be opened, you should move it to the trash", we suggest that **you download the file with Safari**, to prevent macOS Gatekeeper from throwing that error. Note that some outdated unzip software may cause that issue too.
+ If you see an error message saying "This app is damaged and can't be opened, you should move it to the trash", we suggest that **you download the file with Safari**, to prevent macOS Gatekeeper from throwing that error. Note that some outdated unzip software may cause that issue too.
- **Important**: If you haven't quit System Preferences before installation and were upgrading from a previous version, we strongly recommend you quit the application after installation, then reopen it, as updated Swift screensavers aren't loaded correctly in an active System Preferences session.
+ **Important**: If you haven't quit System Preferences before installation and were upgrading from a previous version, we strongly recommend you quit the application after installation, then reopen it, as updated Swift screensavers aren't loaded correctly in an active System Preferences session.
### Brew Cask Support - (Updated to 1.4.6)
If you're looking to install Aerial across many systems, remotely, or simply from Terminal we recommend [Brew Cask](https://caskroom.github.io). Prefer this method if you're looking for auto-updates.
-Simply issue the following Terminal command:
-```
+Simply issue the following Terminal command:
+
+```sh
brew cask install aerial
```
+
To upgrade Aerial, run the following Terminal command:
-```
+
+```sh
brew cask upgrade aerial
```
+
## Setting Aerial as Your Screen Saver
1. Open `System Preferences` -> `Desktop & Screen Saver` -> `Screen Saver`
@@ -59,69 +67,75 @@ brew cask upgrade aerial
There are three options to uninstall Aerial from your Mac.
-* Right-click on the Aerial screensaver in `System Preferences` and select `Delete "Aerial"`.
-* Or delete the file(s) directly. macOS can store screen savers in two locations. `/Library/Screen Savers` and `/Users/YOURUSERNAME/Library/Screen Savers`. Check both locations for a file called `Aerial.saver` and delete any copies you find.
-* If you installed Aerial using Brew Cask, then enter the following command in a Terminal window to uninstall:
-```
+- Right-click on the Aerial screensaver in `System Preferences` and select `Delete "Aerial"`.
+- Or delete the file(s) directly. macOS can store screen savers in two locations. `/Library/Screen Savers` and `/Users/YOURUSERNAME/Library/Screen Savers`. Check both locations for a file called `Aerial.saver` and delete any copies you find.
+- If you installed Aerial using Brew Cask, then enter the following command in a Terminal window to uninstall:
+
+```sh
brew cask uninstall aerial.
```
-You may also want to delete the folder `/Users/YOURUSERNAME/Library/Caches/Aerial` (or `/Library/Caches/Aerial`). This is where Aerial stores the cached copies of the Aerial videos. The last thing, you may want to delete the preferences `plist`. The file is `/Users/YOURUSERNAME/Library/Preferences/ByHost/com.JohnCoates.Aerial.{UUID}.plist`.
+
+You may also want to delete the folder `/Users/YOURUSERNAME/Library/Caches/Aerial` (or `/Library/Caches/Aerial`). This is where Aerial stores the cached copies of the Aerial videos. The last thing, you may want to delete the preferences `plist`. The file is `/Users/YOURUSERNAME/Library/Preferences/ByHost/com.JohnCoates.Aerial.{UUID}.plist`.
## New features in 1.4.6
-* **25 extra videos now available in 4K:** Following the content updates from October 30th and December 5th, Aerial now includes 70 videos, 60 of which are also available in 4K. Aerial will periodically check for new videos, you can disable this feature in the `Cache` tab.
-* **Show videos in Quicktime:** You can now right click a video to open it in Quicktime.
-* **Remove video duplicates:** Aerial can now cleanup your old videos (They are periodically updated to fix colors, provide longer versions of previously existing videos, or upgraded to 4K). Go to the `Advanced` Tab and either move the files away or send them to the trash to reclaim free space. The `Move old videos` button will move the video files to a directory created within the Aerial cache called `oldvideos`, which will contain a dated directory within it. You can find them at `/Users/YOURUSERNAME/Library/Caches/Aerial/oldvideos/YYYY-MM-DD`
+- **25 extra videos now available in 4K:** Following the content updates from October 30th and December 5th, Aerial now includes 70 videos, 60 of which are also available in 4K. Aerial will periodically check for new videos, you can disable this feature in the `Cache` tab.
+- **Show videos in Quicktime:** You can now right click a video to open it in Quicktime.
+- **Remove video duplicates:** Aerial can now cleanup your old videos (They are periodically updated to fix colors, provide longer versions of previously existing videos, or upgraded to 4K). Go to the `Advanced` Tab and either move the files away or send them to the trash to reclaim free space. The `Move old videos` button will move the video files to a directory created within the Aerial cache called `oldvideos`, which will contain a dated directory within it. You can find them at `/Users/YOURUSERNAME/Library/Caches/Aerial/oldvideos/YYYY-MM-DD`
-* **More battery controls:** Using Aerial on a Macbook ? You can now specify a different video format on battery mode if you wish, or simply video playback using the Power Saving mode (Aerial will show a blank screen and reduce screen brightness instead of showing videos).
+- **More battery controls:** Using Aerial on a Macbook ? You can now specify a different video format on battery mode if you wish, or simply video playback using the Power Saving mode (Aerial will show a blank screen and reduce screen brightness instead of showing videos).
## Features
-* **Every Aerial video:** From the very first Aerials in San Francisco to the new space videos shot from the ISS! Now with better titles too so you can find your favorite videos faster.
-* **4K HEVC:** With the launch of Apple TV 4K, many videos are now available in this format (With version 1.4.6, 60 of the 70 videos are available in 4K!). Aerial will show you the best format available, based on your preferences.
+- **Every Aerial video:** From the very first Aerials in San Francisco to the new space videos shot from the ISS! Now with better titles too so you can find your favorite videos faster.
+- **4K HEVC:** With the launch of Apple TV 4K, many videos are now available in this format (With version 1.4.6, 60 of the 70 videos are available in 4K!). Aerial will show you the best format available, based on your preferences.
-* **Different videos based on time:** Want to see night videos at night? Aerial can calculate for you the dusk/dawn times. You can also use Night Shift sunset and sunrise detection (See [here for a list of compatible Macs](https://support.apple.com/en-us/HT207513), you do not need to enable Night Shift).
-* **Feeling Dark?:** Aerial is now compatible with Dark Mode in macOS 10.14 Mojave and can play night videos when Dark Mode is enabled.
+- **Different videos based on time:** Want to see night videos at night? Aerial can calculate for you the dusk/dawn times. You can also use Night Shift sunset and sunrise detection (See [here for a list of compatible Macs](https://support.apple.com/en-us/HT207513), you do not need to enable Night Shift).
+- **Feeling Dark?:** Aerial is now compatible with Dark Mode in macOS 10.14 Mojave and can play night videos when Dark Mode is enabled.
-* **Descriptions:** Wondering where an Aerial view was shot? Aerial can now tell you as they play. We even have extended descriptions written by our community of users.
+- **Descriptions:** Wondering where an Aerial view was shot? Aerial can now tell you as they play. We even have extended descriptions written by our community of users.
-* **Brightness control:** Aerial can progressively dim the brightness of your screens before your Mac goes to sleep. You can even enable this feature only at night, or only on battery if you prefer.
-* **Full offline mode:** Behind a firewall? Just copy the cache folder from another Mac and you are all set. You can also disable all streaming.
-* **Better cache management:** You can now cache your favorite videos individually, no need to grab them all. Or just stream them as you go, they'll get cached automatically too.
-* **Clock:** We even have a properly styled clock if that's your thing!
-* **And many bug fixes!**
-
+- **Brightness control:** Aerial can progressively dim the brightness of your screens before your Mac goes to sleep. You can even enable this feature only at night, or only on battery if you prefer.
+- **Full offline mode:** Behind a firewall? Just copy the cache folder from another Mac and you are all set. You can also disable all streaming.
+- **Better cache management:** You can now cache your favorite videos individually, no need to grab them all. Or just stream them as you go, they'll get cached automatically too.
+- **Clock:** We even have a properly styled clock if that's your thing!
+- **And many bug fixes!**
## Compatibility
+
Aerial is written in Swift, which requires OS X Mavericks (10.9) or above.
## Community
+
- **Found a bug?** [Open an issue](https://github.com/JohnCoates/Aerial/issues/new). Try to be as specific as possible.
- **Have a feature request?** [Open an issue](https://github.com/JohnCoates/Aerial/issues/new). Tell us why this feature would be useful, and why you and others would want it.
- Curious about the videos and on a slow connection? Check [this guide](https://paper.dropbox.com/doc/Aerial-macOS-screen-saver-list-with-version-1.4.6-HvOeL0gNhLpqpIFgmLHaS) by [Hidehiro Nagaoka](https://github.com/hidehiro98).
## Contribute
+
We appreciate all pull requests.
## Offline Mode
-If you want to use Aerial on a Mac behind a firewall or with no network access, the easiest way starting with version 1.4 is to copy the content of the cache folder from another Mac where Aerial is already installed.
-If that's not an option, you can manually recreate a cache folder by downloading files manually.
-- Download and untar `https://sylvan.apple.com/Aerials/resources.tar` (tvOS12 resources, keep the tar *and* extracted files)
+If you want to use Aerial on a Mac behind a firewall or with no network access, the easiest way starting with version 1.4 is to copy the content of the cache folder from another Mac where Aerial is already installed.
+
+If that's not an option, you can manually recreate a cache folder by downloading files manually.
+
+- Download and untar `https://sylvan.apple.com/Aerials/resources.tar` (tvOS12 resources, keep the tar _and_ extracted files)
- Download and rename `https://sylvan.apple.com/Aerials/2x/entries.json` to `tvos11.json` (tvOS11 resources, also in 4K)
- Download and rename `http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/entries.json` to `tvos10.json` (The original Aerials, in 1080p H.264 only)
-You can then download the videos you want from the JSON files. In the 4K JSONs, you are looking for the `url-1080-H264` (1080p H.264, most compatible format), `url-1080-SDR` (1080p HEVC, better quality, requires a recent Mac for hardware decoding) or `url-4K-SDR` (4K HEVC).
+You can then download the videos you want from the JSON files. In the 4K JSONs, you are looking for the `url-1080-H264` (1080p H.264, most compatible format), `url-1080-SDR` (1080p HEVC, better quality, requires a recent Mac for hardware decoding) or `url-4K-SDR` (4K HEVC).
## About HEVC and hardware decoding
@@ -130,24 +144,27 @@ Aerial uses Apple's [AVFoundation framework](https://developer.apple.com/documen
While we wish to provide everyone with the best setting for their machine, the GVA framework from Apple doesn't let us distinguish HEVC `Main10` profile acceleration from general HEVC acceleration. Early feedback we gathered also seems to point that on machines with multiple decoding options (Intel QuickSync and AMD UVD), QuickSync will always be preferred (Even if you "force" the discrete GPU use with an external monitor).
These are our recommendations so far:
-- Macs older than 2011 may lack H.264 acceleration.
+
+- Macs older than 2011 may lack H.264 acceleration.
- Macs with an Intel CPU (With iGPU) from the Sandy Bridge (2011) generation to Broadwell (Early 2015) should have H.264 hardware acceleration available.
- Late 2015 and 2016 Macs (Skylake and Kaby Lake) may only have partially accelerated HEVC decoding. We recommended you stick to 1080p H.264 on laptops. You may consider the HEVC format on desktops but understand that decoding may be CPU intensive and spin up your fans.
-- Macs 2017 and up should have full HEVC acceleration.
+- Macs 2017 and up should have full HEVC acceleration.
You can easily check for yourself what to expect by opening a video in Quicktime (Use the `Show in Finder` option in the `Cache` tab to find the cached videos). In Activity Monitor, the AV Framework GVA process is called `VTDecoderXPCService`.
## Troubleshooting
+
- "Done" button doesn't close Aerial: Please update to latest available version, this is a bug on Mojave with very old versions of Aerial (1.2 and below).
-- Can't type into text fields with macOS High Sierra/Video corruption issue on High Sierra: Please make sure you have at least version 1.4.5.
+- Can't type into text fields with macOS High Sierra/Video corruption issue on High Sierra: Please make sure you have at least version 1.4.5.
- "This app is damaged and can't be opened, you should move it to the trash" when double-clicking the `Aerial.saver` file: Please see the installation notes above, this is a GateKeeper issue.
-- Brightness control does not control external displays: Aerial uses the brightness API from macOS to change the brightness of your screens. Depending on your external screens (brand, the way they are connected, etc), macOS may not be able to control their brightness. Please check first if you can control the brightness of your external screen(s) using the brightness keys from your keyboard. If you can't, Aerial won't be able to control their brightness either. If you can control their brightness through those keyboard keys but see an issue with Aerial, please open an issue.
+- Brightness control does not control external displays: Aerial uses the brightness API from macOS to change the brightness of your screens. Depending on your external screens (brand, the way they are connected, etc), macOS may not be able to control their brightness. Please check first if you can control the brightness of your external screen(s) using the brightness keys from your keyboard. If you can't, Aerial won't be able to control their brightness either. If you can control their brightness through those keyboard keys but see an issue with Aerial, please open an issue.
- Not seeing extended descriptions: Make sure you have version 1.4.2 or above.
-- Black screen: If you are behind a firewall (Like Little Snitch or Hands Off!) try creating exceptions for Aerial to allow it access to Apple's servers. Be sure the applications `ScreenSaverEngine.app` and `System Preferences.app` are not being blocked access to `*.phobos.apple.com`, `*.phobos.apple.com.edgesuite.net` and `sylvan.apple.com`. If that isn't an option, please look at the Offline mode section.
+- Black screen: If you are behind a firewall (Like Little Snitch or Hands Off!) try creating exceptions for Aerial to allow it access to Apple's servers. Be sure the applications `ScreenSaverEngine.app` and `System Preferences.app` are not being blocked access to `*.phobos.apple.com`, `*.phobos.apple.com.edgesuite.net` and `sylvan.apple.com`. If that isn't an option, please look at the Offline mode section.
- "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.
+- 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.
+- 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)
From 1fa135fe5940a8537ac3e2ba44be87fed7cb6546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa=20Rey?=
Date: Mon, 18 Feb 2019 16:17:27 +0100
Subject: [PATCH 5/8] New Multilanguage support section added to the main
Readme. Lokalise sponsorship added to the translation Readme.
---
Readme.md | 20 +++++++++++++++-----
Resources/Community/Readme.md | 6 ++++++
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/Readme.md b/Readme.md
index 2f72137c..2eb1a043 100644
--- a/Readme.md
+++ b/Readme.md
@@ -77,6 +77,16 @@ brew cask uninstall aerial.
You may also want to delete the folder `/Users/YOURUSERNAME/Library/Caches/Aerial` (or `/Library/Caches/Aerial`). This is where Aerial stores the cached copies of the Aerial videos. The last thing, you may want to delete the preferences `plist`. The file is `/Users/YOURUSERNAME/Library/Preferences/ByHost/com.JohnCoates.Aerial.{UUID}.plist`.
+## Multilanguage support
+
+Aerial features overlay descriptions of the main geographical features displayed in the videos.
+
+
+
+Currently these descriptions are available in **English**, **French** and **Spanish**. This is possible thanks to the collaboration and uninterested work of many. To best serve the international community we've defined a translation workflow that allows any person, even with **no technical background** to help translating these descriptions.
+
+If you want to collaborate, please [read the details here](Resources/Community/Readme.md).
+
## New features in 1.4.6
- **25 extra videos now available in 4K:** Following the content updates from October 30th and December 5th, Aerial now includes 70 videos, 60 of which are also available in 4K. Aerial will periodically check for new videos, you can disable this feature in the `Cache` tab.
@@ -101,7 +111,7 @@ You may also want to delete the folder `/Users/YOURUSERNAME/Library/Caches/Aeria
-- **Descriptions:** Wondering where an Aerial view was shot? Aerial can now tell you as they play. We even have extended descriptions written by our community of users.
+- **Descriptions:** Wondering where an Aerial view was shot? Aerial can now tell you as they play. We even have extended descriptions written by our community of users. Help us to improve these descriptions by [translating them to your language](Resources/Community/Readme.md).
@@ -118,13 +128,13 @@ Aerial is written in Swift, which requires OS X Mavericks (10.9) or above.
## Community
- **Found a bug?** [Open an issue](https://github.com/JohnCoates/Aerial/issues/new). Try to be as specific as possible.
-- **Have a feature request?** [Open an issue](https://github.com/JohnCoates/Aerial/issues/new). Tell us why this feature would be useful, and why you and others would want it.
-- Curious about the videos and on a slow connection? Check [this guide](https://paper.dropbox.com/doc/Aerial-macOS-screen-saver-list-with-version-1.4.6-HvOeL0gNhLpqpIFgmLHaS) by [Hidehiro Nagaoka](https://github.com/hidehiro98).
+- **Have fixed a bug?** We appreciate all pull requests.
+- **Can you translate the video descriptions?**. Awesome! [Read here for details](Resources/Community/Readme.md) on how to help us.
+- **Have a feature request?** [Open an issue](https://github.com/JohnCoates/Aerial/issues/new). Tell us why it be useful, and why you and others would want it.
+- **Curious about the videos and on a slow connection?** Check [this guide](https://paper.dropbox.com/doc/Aerial-macOS-screen-saver-list-with-version-1.4.6-HvOeL0gNhLpqpIFgmLHaS) by [Hidehiro Nagaoka](https://github.com/hidehiro98).
## Contribute
-We appreciate all pull requests.
-
## Offline Mode
If you want to use Aerial on a Mac behind a firewall or with no network access, the easiest way starting with version 1.4 is to copy the content of the cache folder from another Mac where Aerial is already installed.
diff --git a/Resources/Community/Readme.md b/Resources/Community/Readme.md
index d3ae2ee5..c29bc1ea 100644
--- a/Resources/Community/Readme.md
+++ b/Resources/Community/Readme.md
@@ -27,3 +27,9 @@ The translation workflow follows a pull mode, meaning that new strings will be d
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.
+
+## Sponsorship
+
+
+
+[Lokalise](https://lokalise.co) supports Aerial and provides us with a free plan to make the translation of this project possible. Check it out for your next i18n project!
From 3cc075c3767190c2c9cfe3ddcd4d427c1cbf292c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa=20Rey?=
Date: Mon, 18 Feb 2019 16:37:41 +0100
Subject: [PATCH 6/8] Remove now empty section.
---
Readme.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/Readme.md b/Readme.md
index 2eb1a043..c7913dda 100644
--- a/Readme.md
+++ b/Readme.md
@@ -133,8 +133,6 @@ Aerial is written in Swift, which requires OS X Mavericks (10.9) or above.
- **Have a feature request?** [Open an issue](https://github.com/JohnCoates/Aerial/issues/new). Tell us why it be useful, and why you and others would want it.
- **Curious about the videos and on a slow connection?** Check [this guide](https://paper.dropbox.com/doc/Aerial-macOS-screen-saver-list-with-version-1.4.6-HvOeL0gNhLpqpIFgmLHaS) by [Hidehiro Nagaoka](https://github.com/hidehiro98).
-## Contribute
-
## Offline Mode
If you want to use Aerial on a Mac behind a firewall or with no network access, the easiest way starting with version 1.4 is to copy the content of the cache folder from another Mac where Aerial is already installed.
From d2c04aae3a43c27cb7d55c40aa0a90b9f52fbdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa=20Rey?=
Date: Mon, 18 Feb 2019 16:39:33 +0100
Subject: [PATCH 7/8] Fix username refs in the translation process
documentation.
---
Resources/Community/Readme.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Resources/Community/Readme.md b/Resources/Community/Readme.md
index c29bc1ea..4c0c9bf7 100644
--- a/Resources/Community/Readme.md
+++ b/Resources/Community/Readme.md
@@ -6,7 +6,7 @@ In the following sections we explain how to collaborate in the internationalizat
## For translators
-1. Contact @glouel or @aitor to get added to the Translators team at Lokalise.
+1. Contact [glouel](/glouel) or [aitor](/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!
@@ -16,7 +16,7 @@ The translation workflow follows a pull mode, meaning that new strings will be d
### Setting up the project
-1. Contact @glouel to get added to the Devs team at Lokalise.
+1. Contact [glouel](/glouel) or [aitor](/aitor) to get added to the Translators 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
From 10c1176c4b170b84866291e8feb1b902f4c1a933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Garc=C3=ADa=20Rey?=
Date: Thu, 21 Feb 2019 19:11:52 +0100
Subject: [PATCH 8/8] Polish translation.
---
Resources/Community/pl.json | 350 ++++++++++++++++++++++++++++++++++++
1 file changed, 350 insertions(+)
create mode 100644 Resources/Community/pl.json
diff --git a/Resources/Community/pl.json b/Resources/Community/pl.json
new file mode 100644
index 00000000..38271172
--- /dev/null
+++ b/Resources/Community/pl.json
@@ -0,0 +1,350 @@
+{
+ "009BA758-7060-4479-8EE8-FB9B40C8FB97": {
+ "name": "Korea i Japonia"
+ },
+ "B1B5DDC5-73C8-4920-8133-BACCE38A08DE": {
+ "name": "Od Mexico City do Nowego Jorku"
+ },
+ "7719B48A-2005-4011-9280-2F64EEC6FD91": {
+ "name": "Od Kalifornii do Baja"
+ },
+ "B876B645-3955-420E-99DF-60139E451CF3": {
+ "name": "Park Narodowy Wulingyuan 1"
+ },
+ "9CCB8297-E9F5-4699-AE1F-890CFBD5E29C": {
+ "name": "Tarasy ryżowe Longji"
+ },
+ "D5E76230-81A3-4F65-A1BA-51B8CADED625": {
+ "name": "Park Narodowy Wulingyuan 2"
+ },
+ "F0236EC5-EE72-4058-A6CE-1F7D2E8253BF": {
+ "name": "Wielki Mur 1"
+ },
+ "22162A9B-DB90-4517-867C-C676BC3E8E95": {
+ "name": "Wielki Mur 2"
+ },
+ "044AD56C-A107-41B2-90CC-E60CCACFBCF5": {
+ "name": "Wielki Mur 3"
+ },
+ "876D51F4-3D78-4221-8AD2-F9E78C0FD9B9": {
+ "name": "Droga Sheikh Zayed"
+ },
+ "E991AC0C-F272-44D8-88F3-05F44EDFE3AE": {
+ "name": "Przystań 1"
+ },
+ "00BA71CD-2C54-415A-A68A-8358E677D750": {
+ "name": "Śródmieście"
+ },
+ "3FFA2A97-7D28-49EA-AA39-5BC9051B2745": {
+ "name": "Przystań 2"
+ },
+ "9680B8EB-CE2A-4395-AF41-402801F4D6A6": {
+ "name": "Zbliżając się do Burj Khalifa"
+ },
+ "2F11E857-4F77-4476-8033-4A1E4610AFCC": {
+ "name": "Droga Sheikh Zayed",
+ "pointsOfInterest": {
+ "0": "Nad drogą Sheikh Zayed w Dubaju, Zjednoczone Emiraty Arabskie"
+ }
+ },
+ "B8F204CE-6024-49AB-85F9-7CA2F6DCD226": {
+ "name": "Półwysep Nuussuaq"
+ },
+ "2F52E34C-39D4-4AB1-9025-8F7141FAA720": {
+ "name": "Fjord lodowy w llulissat"
+ },
+ "EE01F02D-1413-436C-AB05-410F224A5B7B": {
+ "name": "Fjord lodowy w llulissat"
+ },
+ "499995FA-E51A-4ACE-8DFD-BDF8AFF6C943": {
+ "name": "Dolina Waimanu"
+ },
+ "12E0343D-2CD9-48EA-AB57-4D680FB6D0C7": {
+ "name": "Laupāhoehoe Nui"
+ },
+ "b2-2": {
+ "name": "Dolina Honopū"
+ },
+ "258A6797-CC13-4C3A-AB35-4F25CA3BF474": {
+ "name": "Pu'u O 'Umi"
+ },
+ "3D729CFC-9000-48D3-A052-C5BD5B7A6842": {
+ "name": "Wybrzeże Kohala"
+ },
+ "82BD33C9-B6D2-47E7-9C42-AA3B7758921A": {
+ "name": "Pu'u O 'Umi"
+ },
+ "FE8E1F9D-59BA-4207-B626-28E34D810D0A": {
+ "name": "Port Wiktorii 1"
+ },
+ "C8559883-6F3E-4AF2-8960-903710CD47B7": {
+ "name": "Szczyt Wiktorii"
+ },
+ "024891DE-B7F6-4187-BFE0-E6D237702EF0": {
+ "name": "Wan Chai"
+ },
+ "64EA30BD-C4B5-4CDD-86D7-DFE47E9CB9AA": {
+ "name": "Port Wiktorii 2"
+ },
+ "E99FA658-A59A-4A2D-9F3B-58E7BDC71A9A": {
+ "name": "Port Wiktorii"
+ },
+ "001C94AE-2BA4-4E77-A202-F7DE60E8B1C8": {
+ "name": "Oaza Liwa 1"
+ },
+ "AFA22C08-A486-4CE8-9A13-E355B6C38559": {
+ "name": "Oaza Liwa 2"
+ },
+ "58754319-8709-4AB0-8674-B34F04E7FFE2": {
+ "name": "Tamiza",
+ "pointsOfInterest": {
+ "0": "Zbliżając się do mostu Tower Bridge na Tamizie w Londynie",
+ "40": "Mijając Gherkin w londyńskim City, po prawej stronie",
+ "70": "Przelot nad mostem Tower Bridge na Tamizie, z Ratuszem i Wieżą Londynu po prawej stronie",
+ "85": "Zbliżając się do krążownika HMS Belfast na Tamizie, mijając po prawej stronie Walkie-Talkie",
+ "115": "Podróżując na zachód w górę Tamizy, z The Shard po lewej stronie i Katedrą Świętego Pawła po prawej",
+ "135": "Mijająć Katedrę Southwark, z Katedry Świętego Pawła po prawej",
+ "175": "W pobliżu Globu Shakespeare'a (pierwszy plan po prawej stronie)",
+ "230": "Mijając stację Waterloo po lewej stronie, z Pałacem Westminster (Izby Parlamentu) po drugiej stronie Tamizy",
+ "260": "Mijając BFI IMAX na lewym pierwszym planie, z London Eye z tyłu",
+ "280": "W kierunku Westminster nad Tamizą",
+ "300": "Zbliżając się do stacji Charing Cross na prawym, pierwszym planie",
+ "312": "W pobliżu Parady Strażników Konnych i Parku Świętego Jakuba po lewej środkowym planie",
+ "324": "Przelot nad Saint Martin-in-the-Fields po prawej stronie, z Łukiem Admirała, Kolumną Nelsona i Placem Trafalgar po lewej stronie"
+ }
+ },
+ "A5AAFF5D-8887-42BB-8AFD-867EF557ED85": {
+ "name": "Pałac Buckingham",
+ "pointsOfInterest": {
+ "0": "W pobliżu Łuku Wellington w Londynie, po lewej stronie",
+ "12": "Przelot nad Ogrodami Pałacu Buckingham, z Zielonym Parkiem po lewej",
+ "24": "Przelot nad Pałacem Buckingham w Londynie",
+ "40": "Przelot nad Memorialem Wiktorii, mijając po prawej stronie Koszary Wellington",
+ "55": "Wzdłuż Ptasich Klatek w Parku Świętego Jakuba",
+ "90": "Przelot nad Biurem Spraw Zagranicznych i Brytyjskiej Wspólnoty Narodów w Whitehall, z Paradą Straży Konnej po lewej stronie i Skarbem Jej Królewskiej Mości po prawej",
+ "102": "Przelot nad Cenotaf, z Ministerstwem Obrony po lewej stronie i Big Ben oraz Pałacem Westminster (Izby Parlamentu) po prawej",
+ "125": "Przeprawa przez rzekę Tamizę, przelatując nad London Eye",
+ "160": "Nad stacją Waterloo w południowym Londynie, z BFI IMAX po lewej",
+ "270": "W pobliżu Katedry Southwark, po lewej",
+ "285": "Mijając The Shard po prawej stronie",
+ "305": "Nad krążownikiem HMS Belfast na Tamizie",
+ "330": "Przeprawa przez rzekę Tamizę na moście Tower Bridge, z Ratuszem po prawej stronie i Wieżą Londynu po lewej stronie"
+ }
+ },
+ "F604AF56-EA77-4960-AEF7-82533CC1A8B3": {
+ "name": "Rzeka Tamiza podczas zachodu słońca",
+ "pointsOfInterest": {
+ "0": "W kierunku mostu Tower Bridge na Tamizie, z Wieżą Londynu po prawej stronie",
+ "25": "Przeprawa przez rzekę Tamizę i przelot nad Ratuszem",
+ "35": "Nad krążownikiem HMS Belfast na Tamizie",
+ "60": "Zbliżając się do The Shard",
+ "92": "Lecąc na zachód nad Southwark, w kierunku Lambeth w południowym Londynie",
+ "200": "Pałac Lambeth po lewej stronie i stacja Waterloo po prawej",
+ "245": "Przeprawa przez rzekę Tamizę w kierunku Pałacu Westminsterskiego (Izby Parlamentu)",
+ "265": "W pobliżu Pałacu Westminster (Izby Parlamentu), z opactwem Westminster w tle"
+ }
+ },
+ "7F4C26C2-67C2-4C3A-8F07-8A7BF6148C97": {
+ "name": "Tamiza o zmierzchu",
+ "pointsOfInterest": {
+ "0": "Kierując się wzdłuż Tamizy w stronę mostu Tower Bridge, z Wieżą Londynu po prawej",
+ "28": "Podróżując na zachód wzdłuż Tamizy, mijając Ratusz po lewej stronie",
+ "40": "Nad krążownikiem HMS Belfast na Tamizie, z The Shard po lewej stronie i Walkie-Talkie po prawej",
+ "75": "W pobliżu katedry Southwark, po lewej",
+ "110": "W pobliżu katedry Św. Pawła, po prawej stronie",
+ "130": "W pobliżu Globu Shakespeare'a na pierwszym planie po lewej stronie",
+ "210": "Kontynuując wzdłuż Tamizy w kierunku Westminster",
+ "300": "Nad London Eye na Tamizie",
+ "315": "Zbliżając się do Big Bena i Izby Parlamentu, z opactwem Westminster po prawej"
+ }
+ },
+ "CE279831-1CA7-4A83-A97B-FF1E20234396": {
+ "name": "Międzynarodowy port lotniczy Los Angeles",
+ "pointsOfInterest": {
+ "0": "W kierunku zachodnim nad międzynarodowym portem lotniczym Los Angeles (LAX)",
+ "80": "Nad Theme Building",
+ "210": "Nad Międzynarodowym Terminalem Tom Bradley"
+ }
+ },
+ "35693AEA-F8C4-4A80-B77D-C94B20A68956": {
+ "name": "Harbor Freeway",
+ "pointsOfInterest": {
+ "0": "Przelot nad Harbor Freeway (Interstate 110) na południe od Los Angeles",
+ "50": "Skrzyżowanie z Century Freeway (interstate 105)",
+ "65": "Nad stacją Harbor Freeway na zielonej linii metra, która biegnie wzdłuż Century Freeway",
+ "170": "Skrzyżowanie Imperial Highway"
+ }
+ },
+ "92E48DE9-13A1-4172-B560-29B4668A87EE": {
+ "name": "Plaża Santa Monica"
+ },
+ "89B1643B-06DD-4DEC-B1B0-774493B0F7B7": {
+ "name": "Obserwatorium Griffitha"
+ },
+ "EC67726A-8212-4C5E-83CF-8412932740D2": {
+ "name": "Wzgórza Hollywood",
+ "pointsOfInterest": {
+ "0": "Podróżując na północ wzdłuż Beachwood Drive przez Hollywood Hills w Los Angeles",
+ "60": "Kontynuując na północ przez kanion Beachwood",
+ "250": "W pobliżu centrum komunikacji Mount Lee, w kierunku Burbank, Kalifornia"
+ }
+ },
+ "F5804DD6-5963-40DA-9FA0-39C0C6E6DEF9": {
+ "name": "Śródmieście",
+ "pointsOfInterest": {
+ "0": "Zbliżając się do śródmieścia Los Angeles, z budynkiem MTA (na żółto) i Union Station (na różowo) po lewej stronie",
+ "35": "W pobliżu katedry Matki Bożej Anielskiej (w środku)",
+ "55": "Nad Centrum Muzyki Hrabstwa Los Angeles (w środku)",
+ "65": "Przekraczając Hollywood Freeway, w kieurnku południowym przez centrum miasta wzdłuż Harbor Freeway",
+ "105": "W pobliżu sali koncertowej Walta Disneya (w środku)",
+ "120": "W pobliżu ratusza (w kolorze jasnoniebieskim, po lewej)",
+ "180": "W pobliżu Library Tower (w środku)",
+ "200": "W pobliżu hotelu Bonaventure (w środku)",
+ "230": "Centralna Biblioteka w Los Angeles, jaskrawo oświetlona, znajduje się za hotelem Bonaventure",
+ "275": "W pobliżu Wilshire Grand Center (w budowie)",
+ "365": "Nad L.A. Live",
+ "395": "W pobliżu hotelu Ritz-Carlton i Staples Center",
+ "425": "W pobliżu Centrum Kongresowego w Los Angeles",
+ "495": "Zbliżając się do autostrady Santa Monica"
+ }
+ },
+ "3BA0CFC7-E460-4B59-A817-B97F9EBB9B89": {
+ "name": "Central Park"
+ },
+ "b1-3": {
+ "name": "Dolny Manhattan"
+ },
+ "840FE8E4-D952-4680-B1A7-AC5BACA2C1F8": {
+ "name": "Upper East Side"
+ },
+ "44166C39-8566-4ECA-BD16-43159429B52F": {
+ "name": "Siódma Aleja"
+ },
+ "640DFB00-FBB9-45DA-9444-9F663859F4BC": {
+ "name": "Dolny Manhattan"
+ },
+ "b8-2": {
+ "name": "Marin Headlands"
+ },
+ "EE533FBD-90AE-419A-AD13-D7A60E2015D6": {
+ "name": "Marin Headlands we mgle",
+ "pointsOfInterest": {
+ "0": "Nad Headlands Marin wzdłuż autostrady 101 w kierunku mostu Golden Gate",
+ "20": "Horseshoe Cove pojawia się po lewej stronie",
+ "105": "Przemierzając przez Battery Spencer po prawej",
+ "155": "Przemierzając przez most Golden Gate w kierunku San Francisco"
+ }
+ },
+ "DE851E6D-C2BE-4D9F-AB54-0F9CE994DC51": {
+ "name": "Zatoka i Most Golden Gate"
+ },
+ "b8-3": {
+ "name": "Plac Alama",
+ "pointsOfInterest": {
+ "0": "\"Malowane Panie\" naprzeciwko placu Alamo w San Francisco",
+ "35": "Katedra Najświętszej Marii Panny po lewej, z centrum San Francisco w tle",
+ "70": "Kopuła ratusza pojawiająca się po prawej stronie",
+ "210": "Kopuła ratusza, widoczna po prawej"
+ }
+ },
+ "85CE77BF-3413-4A7B-9B0F-732E96229A73": {
+ "name": "Embarcadero, Market Street",
+ "pointsOfInterest": {
+ "0": "W kierunku południowo-zachodnim nad Zatoką San Francisco do \"Ferry Building\"",
+ "150": "Zbliżając się do \"Ferry Building\" w San Francisco i Embarcadero",
+ "210": "W kierunku południowo-zachodnim wzdłuż ulicy Market Street w centrum San Francisco"
+ }
+ },
+ "b4-3": {
+ "name": "Od Prezydium do Mostu Golden Gate",
+ "pointsOfInterest": {
+ "0": "Poruszając się wzdłuż Prezydium San Francisco w kierunku mostu Golden Gate",
+ "190": "Przekraczając most Golden Gate w kierunku Marin Headlands"
+ }
+ },
+ "72B4390D-DF1D-4D51-B179-229BBAEFFF2C": {
+ "name": "Most Golden Gate od strony San Franciso"
+ },
+ "b6-4": {
+ "name": "Śródmieście i Wieża Coit",
+ "pointsOfInterest": {
+ "0": "Śródmieście San Francisco z piramidą Transamerica w centrum",
+ "100": "Śródmieście San Francisco z widokiem na Wieżę Coit"
+ }
+ },
+ "29BDF297-EB43-403A-8719-A78DA11A2948": {
+ "name": "Fisherman's Wharf",
+ "pointsOfInterest": {
+ "0": "W kierunku południowo-wschodnim nad Fisherman's Wharf w San Francisco",
+ "27": "Przepłynięcie statku typu Liberty, SS Jeremiah O'Brien",
+ "47": "Nad okrętem podwodnym USS Pampanito",
+ "80": "Nad North Beach w San Francisco",
+ "115": "Zbliżając się do Wieży Coit na wzgórzu Telegraph, z Mostem Zatokowym i centrum miasta San Franciso w tle",
+ "135": "Zbliżając się do Wieży Coit na wzgórzu Telegraph, z Kościołem Świętych Piotra i Pawła na prawyo-środkowym planie"
+ }
+ },
+ "b5-3": {
+ "name": "Embarcadero, Market Street",
+ "pointsOfInterest": {
+ "0": "W kierunku południowo-zachodnim nad Zatoką San Francisco do \"Ferry Building\"",
+ "150": "Podejście do \"Ferry Building\" w San Francisco i Embarcadero",
+ "210": "W kierunku południowo-zachodnim wzdłuż Market Street w San Francisco"
+ }
+ },
+ "3E94AE98-EAF2-4B09-96E3-452F46BC114E": {
+ "name": "Most Zatokowy"
+ },
+ "b2-4": {
+ "name": "Śródmieście i wieża Sutro",
+ "pointsOfInterest": {
+ "0": "W kierunku dzielnicy finansowej San Francisco, z wieżą Sutro w tle",
+ "10": "Przelot nad Piramidą Transamerica",
+ "50": "Dawna siedziba Banku Centralnego Ameryki w słońcu"
+ }
+ },
+ "4AD99907-9E76-408D-A7FC-8429FF014201": {
+ "name": "Zatoka San Francisco i Embarcadero"
+ },
+ "03EC0F5E-CCA8-4E0A-9FEC-5BD1CE151182": {
+ "name": "Antarktyda"
+ },
+ "737E9E24-49BE-4104-9B72-F352DE1AD2BF": {
+ "name": "Zorza nad Ameryką Północną"
+ },
+ "A837FA8C-C643-4705-AE92-074EFDD067F7": {
+ "name": "Noc afrykańska"
+ },
+ "2F72BC1E-3D76-456C-81EB-842EBA488C27": {
+ "name": "Afryka i Bliski Wschód"
+ },
+ "12318CCB-3F78-43B7-A854-EFDCCE5312CD": {
+ "name": "Od Kalifornii do Vegas"
+ },
+ "D5CFB2FF-5F8C-4637-816B-3E42FC1229B8": {
+ "name": "Karaiby"
+ },
+ "4F881F8B-A7D9-4FDB-A917-17BF6AC5A589": {
+ "name": "Karaiby za dnia"
+ },
+ "7825C73A-658F-48EE-B14C-EC56673094AC": {
+ "name": "Chiny"
+ },
+ "E5DB138A-F04E-4619-B896-DE5CB538C534": {
+ "name": "Od Włoch do Azji"
+ },
+ "F439B0A7-D18C-4B14-9681-6520E6A74FE9": {
+ "name": "Iran i Afganistan"
+ },
+ "7C643A39-C0B2-4BA0-8BC2-2EAA47CC580E": {
+ "name": "Od Irlandii do Azji"
+ },
+ "63C042F0-90EF-4A95-B7CC-CC9A64BF8421": {
+ "name": "Od Afryki Zachodniej do Alp"
+ },
+ "78911B7E-3C69-47AD-B635-9C2486F6301D": {
+ "name": "Nowa Zelandia"
+ },
+ "E556BBC5-D0A0-4DB1-AC77-BC76E4A526F4": {
+ "name": "Sahara i Włochy"
+ }
+}
\ No newline at end of file