diff --git a/blog/want-openlp-your-language.rst b/blog/want-openlp-your-language.rst
new file mode 100644
index 0000000..51cf29f
--- /dev/null
+++ b/blog/want-openlp-your-language.rst
@@ -0,0 +1,100 @@
+.. title: Want OpenLP in Your Language?
+.. slug: want-openlp-your-language
+.. date: 2015-10-03 01:17:00 UTC
+.. tags:
+.. category:
+.. link:
+.. description:
+.. type: text
+.. previewimage: /cover-images/want-openlp-your-language.jpg
+
+If you'd like to see OpenLP in your language, now's the time! We are about 2 weeks away from the release of 2.2, and
+now is your opportunity to translate OpenLP's interface into your own language.
+
+In order for your langauge to be included you need to have completed the `translation of OpenLP 2.2`_ (you'll need to be
+logged into `Transifex`_ to see this page) **by midnight UTC (GMT) on Saturday the 10th of October 2015**.
+
+Because we believe strongly in quality over quantity at OpenLP, we will not be including any translations that are
+incomplete into the final build. **This means that if you want your language to be part of the final release of version
+2.2, you need to make sure it is 100% done by the end of Saturday the 10th of October**. This deadline also gives you
+just over a week to complete any outstanding translations.
+
+Languages Needing Work
+^^^^^^^^^^^^^^^^^^^^^^
+
+Currently, the following translations are more than 80% complete, but still need some work (ordered from most complete
+to least complete). My estimate is that none of these should take longer than about 2 hours to complete.
+
+* Polish
+* French
+* Lithuanian
+* Russian
+* Portuguese (Brazil)
+* Bulgarian
+
+The following translations are between 40% and 80% complete. Unless these are worked on this week, they probably won't
+make it into the final release of OpenLP.
+
+* Thai (Thailand)
+* Tamil (Sri-Lanka)
+* Greek
+* Afrikaans
+* Chinese (China)
+* Korean
+
+Lastly, the following translations are less than 40% complete. If any of these translations makes it into the final
+release, I will be very surprised.
+
+* Slovenian
+* Italian
+* Macedonian
+* Ukrainian
+* Norweigian Nyorsk
+* Papiamento
+* Turkish
+* Malayalam
+* Latvian
+* Spanish (Colombia)
+* Arabic
+* Albanian
+* Korean (Korea)
+* Ukranian (Ukraine)
+* Khmer (Cambodia)
+* Russian (Russia)
+* Amharic
+* English (United States)
+* Klingon
+* Arabic (Egypt)
+* Spanish (Chile)
+* Vietnamese (Viet Nam)
+* Vietnamese
+
+Get started `translating OpenLP 2.2`_ (you'll need to be logged into `Transifex`_ to see this page).
+
+Testing Out Your Translation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To test your translation out, do the following:
+
+1. Make sure you are running version 2.1.6
+2. Install Qt Linguist
+3. Windows and OS X users need to `download Qt Linguist`_
+4. Ubuntu, Fedora, and other Linux and Unix users can install Qt Linguist from their package manager
+5. Download the language file from Transifex
+6. Open it in Qt Linguist
+7. Open the File menu, select "*Release*" and save the resulting release file with only your language code as the file name (see Transifex for your language code)
+8. Copy the release file to OpenLP's i18n directory
+9. Windows: ``C:\Program Files\OpenLP\i18n or C:\Program Files (x86)\OpenLP\i18n``
+10. Mac OS X: ``/Applications/OpenLP.app/Contents/MacOS/i18n/``
+11. Linux: ``/usr/share/openlp/i18n/``
+12. \*BSD: ``/usr/local/share/openlp/i18n/``
+13. (Re)start Openlp and select your language
+
+[ Image Credit: `Arddangosfa o gelf Zimbabwe yn newby Hall, Ripon`_ ]
+
+.. _translation of OpenLP 2.2: https://www.transifex.com/openlp/openlp/openlp-22x/
+.. _Transifex: https://www.transifex.com/
+.. _translating OpenLP 2.2: https://www.transifex.com/openlp/openlp/openlp-22x/
+.. _download Qt Linguist: http://code.google.com/p/qtlinguistdownload/downloads/list
+.. _Arddangosfa o gelf Zimbabwe yn newby Hall, Ripon: https://www.flickr.com/photos/benbore/2800370449/
+
diff --git a/conf.py b/conf.py
index 28c0ff2..5295f93 100644
--- a/conf.py
+++ b/conf.py
@@ -677,7 +677,8 @@ COPY_SOURCES = False
#
#"""
EXTRA_HEAD_DATA = """
-
+
+
"""
# Google Analytics or whatever else you use. Added to the bottom of
@@ -691,6 +692,9 @@ EXTRA_HEAD_DATA = """
#
#
#"""
+BODY_END = """
+
+"""
# The possibility to extract metadata from the filename by using a
# regular expression.
diff --git a/files/cover-images/want-openlp-in-your-language.jpg b/files/cover-images/want-openlp-your-language.jpg
similarity index 100%
rename from files/cover-images/want-openlp-in-your-language.jpg
rename to files/cover-images/want-openlp-your-language.jpg
diff --git a/files/files/ftw/do_not_delete.txt b/files/files/ftw/do_not_delete.txt
new file mode 100644
index 0000000..36a413a
--- /dev/null
+++ b/files/files/ftw/do_not_delete.txt
@@ -0,0 +1 @@
+Don't delete this directory! It's used to store the download.cfg file for the First Time Wizard.
\ No newline at end of file
diff --git a/files/screenshots/configuregeneral.png b/files/screenshots/configuregeneral.png
new file mode 100644
index 0000000..aa59d48
Binary files /dev/null and b/files/screenshots/configuregeneral.png differ
diff --git a/files/screenshots/mainwindow.png b/files/screenshots/mainwindow.png
new file mode 100644
index 0000000..1230670
Binary files /dev/null and b/files/screenshots/mainwindow.png differ
diff --git a/files/screenshots/song_edit_verse_in_use.png b/files/screenshots/song_edit_verse_in_use.png
new file mode 100644
index 0000000..25cd66f
Binary files /dev/null and b/files/screenshots/song_edit_verse_in_use.png differ
diff --git a/files/screenshots/songimporterchoices.png b/files/screenshots/songimporterchoices.png
new file mode 100644
index 0000000..527ad91
Binary files /dev/null and b/files/screenshots/songimporterchoices.png differ
diff --git a/files/screenshots/stage_view_song_w_note.png b/files/screenshots/stage_view_song_w_note.png
new file mode 100644
index 0000000..6b577c7
Binary files /dev/null and b/files/screenshots/stage_view_song_w_note.png differ
diff --git a/themes/openlp2v2/assets/css/custom.css b/themes/openlp2v2/assets/css/custom.css
index a0e08f8..3734f95 100644
--- a/themes/openlp2v2/assets/css/custom.css
+++ b/themes/openlp2v2/assets/css/custom.css
@@ -318,3 +318,9 @@ article blockquote p:first-child {
p.indent {
margin-left: 3em;
}
+
+a.screenshot-gallery {
+ display: block;
+ border-radius: 6px;
+ border: 4px solid #efefef;
+}
diff --git a/themes/openlp2v2/assets/css/ekko-lightbox.css b/themes/openlp2v2/assets/css/ekko-lightbox.css
new file mode 100644
index 0000000..ec3432f
--- /dev/null
+++ b/themes/openlp2v2/assets/css/ekko-lightbox.css
@@ -0,0 +1,62 @@
+/*!
+ * Lightbox for Bootstrap 3 by @ashleydw
+ * https://github.com/ashleydw/lightbox
+ *
+ * License: https://github.com/ashleydw/lightbox/blob/master/LICENSE
+ */
+
+.ekko-lightbox-container {
+ position: relative;
+}
+
+.ekko-lightbox-nav-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 100;
+ width: 100%;
+ height: 100%;
+}
+
+.ekko-lightbox-nav-overlay a {
+ z-index: 100;
+ display: block;
+ width: 49%;
+ height: 100%;
+ font-size: 30px;
+ color: #fff;
+ text-shadow: 2px 2px 4px #000;
+ opacity: 0;
+ filter: dropshadow(color=#000000, offx=2, offy=2);
+ -webkit-transition: opacity 0.5s;
+ -moz-transition: opacity 0.5s;
+ -o-transition: opacity 0.5s;
+ transition: opacity 0.5s;
+}
+
+.ekko-lightbox-nav-overlay a:empty {
+ width: 49%;
+}
+
+.ekko-lightbox a:hover {
+ text-decoration: none;
+ opacity: 1;
+}
+
+.ekko-lightbox .glyphicon-chevron-left {
+ left: 0;
+ float: left;
+ padding-left: 15px;
+ text-align: left;
+}
+
+.ekko-lightbox .glyphicon-chevron-right {
+ right: 0;
+ float: right;
+ padding-right: 15px;
+ text-align: right;
+}
+
+.ekko-lightbox .modal-footer {
+ text-align: left;
+}
\ No newline at end of file
diff --git a/themes/openlp2v2/assets/js/custom.js b/themes/openlp2v2/assets/js/custom.js
index 9b8ab8f..c54638f 100644
--- a/themes/openlp2v2/assets/js/custom.js
+++ b/themes/openlp2v2/assets/js/custom.js
@@ -33,4 +33,8 @@ $(function(){
$("#error-alert").removeClass("hidden");
}
}
+ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
+ event.preventDefault();
+ $(this).ekkoLightbox();
+ });
});
diff --git a/themes/openlp2v2/assets/js/ekko-lightbox.js b/themes/openlp2v2/assets/js/ekko-lightbox.js
new file mode 100644
index 0000000..96e55f9
--- /dev/null
+++ b/themes/openlp2v2/assets/js/ekko-lightbox.js
@@ -0,0 +1,400 @@
+/*
+Lightbox for Bootstrap 3 by @ashleydw
+https://github.com/ashleydw/lightbox
+
+License: https://github.com/ashleydw/lightbox/blob/master/LICENSE
+*/
+
+
+(function() {
+ "use strict";
+ var $, EkkoLightbox;
+
+ $ = jQuery;
+
+ EkkoLightbox = function(element, options) {
+ var content, footer, header,
+ _this = this;
+ this.options = $.extend({
+ title: null,
+ footer: null,
+ remote: null
+ }, $.fn.ekkoLightbox.defaults, options || {});
+ this.$element = $(element);
+ content = '';
+ this.modal_id = this.options.modal_id ? this.options.modal_id : 'ekkoLightbox-' + Math.floor((Math.random() * 1000) + 1);
+ header = '