Merge branch 'development'

Author: PrestonN

.gitignore

@@ -7,3 +7,5 @@ subscriptions\.db
 *.db
 
 electron-packager/win32-x64/FreeTube-win32-x64/
+
+dist/

CONTRIBUTING.md

@@ -15,7 +15,6 @@ Please follow these guidlines before sending your pull request and making contri
 * Comment your code when necessary.  Follow the [JavaScript Documentation and Comments Standard](https://www.drupal.org/docs/develop/standards/javascript/javascript-api-documentation-and-comment-standards) for functions.
 * Please test your code.  Make sure new features work as well as core features such as watching videos or loading subscriptions.
 * Please limit the amount of Node Modules that you introduce into the project.  Only include them when absolutely necessary for your code to work (Ex: Using nedb for databases) or if a module provides similar functionality to what you are trying to achieve (Ex: Using autolinker to create links to outside URLs instead of writing the functionality myself).
-* If using a new Node Module, please include the `require` statement in `layout.js` to keep them together.
 * Please try to stay involved with the community and maintain your code.  I am only one person and I work on FreeTube only in my spare time.  I do not have time to work on everything and it would be nice if you can maintain your code when necessary.
 
 # Setting up Your Environment
@@ -32,6 +31,11 @@ Install Dependencies:
 npm install
 ```
 
+Install Dev Dependencies:
+```
+npm install --only=dev
+```
+
 Run the application:
 ```
 npm start
@@ -41,17 +45,19 @@ Make / Package application:
 
 Windows (Requires Wine on Linux):
 ```
-npm run make:win32
+npm run make:win
 ```
 
 Mac:
 ```
-npm run make:darwin
+npm run make:mac
 ```
 
 Linux (Requires deb and rpm to be installed):
 ```
 npm run make:linux
 ```
 
+Other commands are available in the `package.json` file for making specific packages.  Refer to `package.json` for instructions.
+
 I will update this document when necessary.  Anyone who has questions or suggestions on this document are welcome to create an issue or pull request.

LogoDesigns/freetube.zip

@@ -1,13 +1,6 @@
 - [ ] I have read and agree to the [Contribution Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/master/CONTRIBUTING.md)
 - [ ] I can maintain / support my code if issues arise.
 
-**Does your change relate to a current issue? Please list it here if applicable.**
+**Notes and Comments about your pull request**
 
 
-**Please list out the changes you've made**
-
-
-**Does your change include any new Node Modules?  If yes, what modules and what are they licensed under?**
-
-
-**Other Comments**

LogoDesigns/logo

@@ -1,9 +1,9 @@
 <p align="center">
- <img src="https://raw.githubusercontent.com/jbeguna04/FreeTube/master/LogoDesigns/logotype.png" width=500 align="center">
+ <img src="https://freetubeapp.github.io/images/logoColor.png" width=500 align="center">
 </p>
 
 FreeTube is an open source desktop YouTube player built with privacy in mind.
-Use YouTube without advertisments and Google tracking you using cookies and JavaScript.
+Use YouTube without advertisments and prevent Google tracking from you with their cookies and JavaScript.
 Available for Windows, Mac & Linux thanks to Electron.
 
 Please note that FreeTube is currently in Beta. While it should work well for
@@ -20,14 +20,16 @@ hard coded API keys.  Videos are resolved using
  and played using the stock HTML5 video
 player.  While YouTube can still see your API and video requests it can no
 longer track you using cookies or JavaScript. Your subscriptions, history, and
-saved videos are stored locally on your computer and never sent out.
+saved videos are stored locally on your computer and never sent out.  Using a VPN or Tor is recommended
+to hide your IP while using FreeTube.
 
 ## Screenshots
 <img src="https://freetubeapp.github.io/images/FreeTube1.png" width=200> <img src="https://freetubeapp.github.io/images/FreeTube2.png" width=200> <img src="https://freetubeapp.github.io/images/FreeTube3.png" width=200> <img src="https://freetubeapp.github.io/images/FreeTube5.png" width=200>
 
 ## Features
 * Watch videos without ads
 * Use YouTube without Google tracking you using cookies and JavaScript
+* Make API calls through the Tor network
 * Subscribe to channels without an account
 * Local subscriptions, history, and saved videos
 * Export & import subscriptions
@@ -45,6 +47,8 @@ follow the [Contribution
 Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/master/CONTRIBUTING.md)
 before sending your pull request.
 
+Thank you very much to the [People and Projects](https://github.com/FreeTubeApp/FreeTube/wiki/Credits) that make FreeTube possible!
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
 

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,95 @@
+{
+	"File": "File",
+	"Quit": "Quit",
+	"Edit": "Edit",
+	"Undo": "Undo",
+	"Redo": "Redo",
+	"Cut": "Cut",
+	"Copy": "Copy",
+	"Paste": "Paste",
+	"Delete": "Delete",
+	"Select all": "Select all",
+	"View": "View",
+	"Reload": "Reload",
+	"Force Reload": "Force Reload",
+	"Toggle Developer Tools": "Toggle Developer Tools",
+	"Actual size": "Actual size",
+	"Zoom in": "Zoom in",
+	"Zoom out": "Zoom out",
+	"Toggle fullscreen": "Toggle fullscreen",
+	"Window": "Window",
+	"Minimize": "Minimize",
+	"Close": "Close",
+	"FreeTube": "FreeTube",
+	"Subscriptions": "Subscriptions",
+	"Featured": "Featured",
+	"Most Popular": "Most Popular",
+	"Saved": "Saved",
+	"Playlists": "Playlists",
+	"History": "History",
+	"Settings": "Settings",
+	"About": "About",
+	"Search / Go to URL": "Search / Go to URL",
+	"Search Results": "Search Results",
+	"Subscriber": "Subscriber",
+	"Subscriber": "Subscribers",
+	"Video": "Video",
+	"Videos": "Videos",
+	"View Full Playlist": "View Full Playlist",
+	"Live Now": "Live Now",
+	"Fetch more results": "Fetch more results",
+	"Fetching results. Please wait": "Fetching results. Please wait",
+	"Latest Subscriptions": "Latest Subscriptions",
+	"Save Video": "Save Video",
+	"Remove Saved Video": "Remove Saved Video",
+	"Open in YouTube": "Open in YouTube",
+	"Copy YouTube Link": "Copy YouTube Link",
+	"Open in HookTube": "Open in HookTube",
+	"Copy HookTube Link": "Copy HookTube Link",
+	"URL has been copied to the clipboard": "URL has been copied to the clipboard",
+	"Found valid URL for 480p, but returned a 404. Video type might be available in the future.": "Found valid URL for 480p, but returned a 404. Video type might be available in the future.",
+	"Save": "Save",
+	"Mini Player": "Mini Player",
+	"View": "View",
+	"Views": "Views",
+	"Subscribe": "Subscribe",
+	"Unsubscribe": "Unsubscribe",
+	"Published on": "Published on",
+	"Jan": "Jan",
+	"Feb": "Feb",
+	"Mar": "Mar",
+	"Apr": "Apr",
+	"May": "May",
+	"Jun": "Jun",
+	"Jul": "Jul",
+	"Aug": "Aug",
+	"Sep": "Sep",
+	"Oct": "Oct",
+	"Nov": "Nov",
+	"Dec": "Dec",
+	"Show Comments": "Show Comments",
+	"Max of 100": "Max of 100",
+	"Recommendations": "Recommendations",
+	"Latest Subscriptions": "Latest Subscriptions",
+	"Getting Subscriptions.  Please wait...": "Getting Subscriptions.  Please wait...",
+	"Your Subscription list is currently empty. Start adding subscriptions to see them here.": "Your Subscription list is currently empty. Start adding subscriptions to see them here.",
+	"Saved Videos": "Saved Videos",
+	"Watch History": "Watch History",
+	"API Key": "API Key",
+	"Set API Key: Leave blank to use default": "Set API Key: Leave blank to use default",
+	"Use Dark Theme": "Use Dark Theme",
+	"Import Subscriptions": "Import Subscriptions",
+	"Export Subscriptions": "Export Subscriptions",
+	"Clear History": "Clear History",
+	"Are you sure you want to delete your history?": "Are you sure you want to delete your history?",
+	"Clear Saved Videos": "Clear Saved Videos",
+	"Are you sure you want to remove all saved videos?": "Are you sure you want to remove all saved videos?",
+	"Clear Subscriptions": "Clear Subscriptions",
+	"Are you sure you want to remove all subscriptions?": "Are you sure you want to remove all subscriptions?",
+	"Save Settings": "Save Settings",
+	"Yes": "Yes",
+	"No": "No",
+	"Beta": "Beta",
+	"This software is FOSS and released under the GNU Public License v3+.": "This software is FOSS and released under the GNU Public License v3+.",
+	"Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.": "Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome."
+}

README.md

@@ -0,0 +1,95 @@
+{
+	"File": "Bestand",
+	"Quit": "Afluiten",
+	"Edit": "Bewerken",
+	"Undo": "Ongedaan maken",
+	"Redo": "Opnieuw",
+	"Cut": "Knippen",
+	"Copy": "Kopiëren",
+	"Paste": "Plakken",
+	"Delete": "Verwijderen",
+	"Select all": "Alles selecteren",
+	"View": "Weergave",
+	"Reload": "Herladen",
+	"Force Reload": "Herladen forceren",
+	"Toggle Developer Tools": "Hulpprogramma's voor ontwikkelaars",
+	"Actual size": "Daadwerkelijke grootte",
+	"Zoom in": "Zoom in",
+	"Zoom out": "Zoom uit",
+	"Toggle fullscreen": "Volledig scherm",
+	"Window": "Venster",
+	"Minimize": "Minimaliseren",
+	"Close": "Sluiten",
+	"FreeTube": "FreeTube",
+	"Subscriptions": "Abonnementen",
+	"Featured": "Uitgelicht",
+	"Most Popular": "Populair",
+	"Saved": "Opgeslagen",
+	"Playlists": "Afspeellijsten",
+	"History": "Geschiedenis",
+	"Settings": "Instellingen",
+	"About": "Over",
+	"Search / Go to URL": "Zoeken / Ga naar URL",
+	"Search Results": "Zoekresultaten",
+	"Subscriber": "Abonnee",
+	"Subscriber": "Abonnees",
+	"Video": "Video",
+	"Videos": "Videos",
+	"View Full Playlist": "Volledige afspeellijst weergeven",
+	"Live Now": "Nu Live",
+	"Fetch more results": "Meer resultaten ophalen",
+	"Fetching results. Please wait": "Resultaten ophalen. Een ogenblik geduld",
+	"Latest Subscriptions": "Laatste abonnementen",
+	"Save Video": "Video opslaan",
+	"Remove Saved Video": "Opgeslagen video verwijderen",
+	"Open in YouTube": "Open in YouTube",
+	"Copy YouTube Link": "Kopieer YouTube Link",
+	"Open in HookTube": "Open in HookTube",
+	"Copy HookTube Link": "Kopieer HookTube Link",
+	"URL has been copied to the clipboard": "URL is naar het klembord gekopieerd",
+	"Found valid URL for 480p, but returned a 404. Video type might be available in the future.": "Geldige URL voor 480p gevonden, echter een 404 foutmelding ontvangen. Video is wellicht in de toekomst beschikbaar.",
+	"Save": "Opslaan",
+	"Mini Player": "Mini Speler",
+	"View": "Weergave",
+	"Views": "Weergaven",
+	"Subscribe": "Abboneren",
+	"Unsubscribe": "Afmelden",
+	"Published on": "Gepubliceerd op",
+	"Jan": "Jan",
+	"Feb": "Feb",
+	"Mar": "Maa",
+	"Apr": "Apr",
+	"May": "Mei",
+	"Jun": "Jun",
+	"Jul": "Jul",
+	"Aug": "Aug",
+	"Sep": "Sep",
+	"Oct": "Okt",
+	"Nov": "Nov",
+	"Dec": "Dec",
+	"Show Comments": "Commentaren weergeven",
+	"Max of 100": "Maximaal 100",
+	"Recommendations": "Aanbevelingen",
+	"Latest Subscriptions": "Laatste abonnementen",
+	"Getting Subscriptions.  Please wait...": "Abonnementen worden opgehaald.  Een ogenblik geduld...",
+	"Your Subscription list is currently empty.  Start adding subscriptions to see them here.": "Deze lijst is momenteel leeg. Voeg abonnementen toe om ze hier terug te zien.",
+	"Saved Videos": "Opgeslagen Videos",
+	"Watch History": "Geschiedenis",
+	"API Key": "API Sleutel",
+	"Set API Key: Leave blank to use default": "API sleutel instellen: Laat leeg om standaard te gebruiken",
+	"Use Dark Theme": "Donker thema gebruiken",
+	"Import Subscriptions": "Importeer Abonnementen",
+	"Export Subscriptions": "Exporteer Abonnementen",
+	"Clear History": "Geschiedenis wissen",
+	"Are you sure you want to delete your history?": "Weet u zeker dat u de geschiedenis wilt wissen?",
+	"Clear Saved Videos": "Opgeslagen videos verwijderen",
+	"Are you sure you want to remove all saved videos?": "Weet u zeker dat u alle opgeslagen videos wilt verwijderen?",
+	"Clear Subscriptions": "Abonnementen verwijderen",
+	"Are you sure you want to remove all subscriptions?": "Weet u zeker dat u alle abonnementen wilt verwijderen?",
+	"Save Settings": "Instellingen opslaan",
+	"Yes": "Ja",
+	"No": "Nee",
+	"Beta": "Beta",
+	"This software is FOSS and released under the GNU Public License v3+.": "Deze software is FOSS en gepubliceerd onder de GNU Public License v3+.",
+	"Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.": "Een bug gevonden? Graag iets toegevoegd zien? Wilt u helpen bij de ontwikkeling? Check de GitHub pagina. Pull requests zijn welkom."
+}