Merge branch 'hotfix/1.1.1'

grunt/config/aliases.yaml

@@ -5,6 +5,7 @@ build:
   - 'build:css'
   - 'build:jst'
   - 'build:js'
+  - 'build:translations'
 # Precompile JavaScript templates
 'build:jst':
   - 'lodash:templates'
@@ -17,6 +18,8 @@ build:
   - 'copy'
   - 'sass:build'
   - 'postcss:build'
+'build:translations':
+  - 'shell:makepot'
 # Check health of the project
 check:
   - 'jshint'

languages/yoast-seo.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yoastseo 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-01 15:38+0100\n"
+"POT-Creation-Date: 2016-03-02 09:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,22 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/scoreFormatter.js:143
+#: js/scoreFormatter.js:168
 msgid "No keyword"
 msgstr ""
 
-#: js/scoreFormatter.js:147
+#: js/scoreFormatter.js:172
 msgid "Bad SEO score"
 msgstr ""
 
-#: js/scoreFormatter.js:151
+#: js/scoreFormatter.js:176
 msgid "Ok SEO score"
 msgstr ""
 
-#: js/scoreFormatter.js:155
+#: js/scoreFormatter.js:180
 msgid "Good SEO score"
 msgstr ""
 
+#: js/snippetPreview.js:388
+msgid "Edit snippet"
+msgstr ""
+
+#: js/snippetPreview.js:389
+msgid "SEO title"
+msgstr ""
+
+#: js/snippetPreview.js:390
+msgid "Slug"
+msgstr ""
+
+#: js/snippetPreview.js:391
+msgid "Meta description"
+msgstr ""
+
+#: js/snippetPreview.js:392
+msgid "Close snippet editor"
+msgstr ""
+
+#: js/snippetPreview.js:393
+msgid "Snippet preview"
+msgstr ""
+
+#: js/snippetPreview.js:394
+msgid "Snippet editor"
+msgstr ""
+
+#: js/snippetPreview.js:581
+msgid "Please provide an SEO title by editing the snippet below."
+msgstr ""
+
+#: js/snippetPreview.js:657
+msgid "Please provide a meta description by editing the snippet below."
+msgstr ""
+
 #. translators: %1$d expands to the number of words in the text, %2$s to the recommended minimum of words
 #: js/config/scoring.js:19
 msgid ""
@@ -202,140 +238,134 @@ msgstr ""
 msgid "The focus keyword appears in the first paragraph of the copy."
 msgstr ""
 
-#. translators: %1$s expands to a link to the wikipedia article about stop words, %2$s expands to the actual stop words found in the text
-#: js/config/scoring.js:281
-msgid ""
-"The focus keyword for this page contains one or more %1$s, consider removing "
-"them. Found '%2$s'."
-msgstr ""
-
-#: js/config/scoring.js:289
+#. translators: %1$s opens a link to a Yoast article about stop words, %2$s closes the link
+#: js/config/scoring.js:279
 msgid ""
-"<a href='https://en.wikipedia.org/wiki/Stop_words' target='new'>stop words</"
-"a>"
+"Your focus keyword contains one or more stop words. This may or may not be "
+"wise depending on the circumstances. Read %1$sthis article%2$s for more info."
 msgstr ""
 
-#: js/config/scoring.js:296
+#: js/config/scoring.js:298
 msgid "No subheading tags (like an H2) appear in the copy."
 msgstr ""
 
-#: js/config/scoring.js:301
+#: js/config/scoring.js:303
 msgid ""
 "You have not used your focus keyword in any subheading (such as an H2) in "
 "your copy."
 msgstr ""
 
 #. translators: %1$d expands to the number of subheadings, %2$d to the number of subheadings containing the focus keyword
-#: js/config/scoring.js:309
+#: js/config/scoring.js:311
 msgid ""
 "The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. "
 "While not a major ranking factor, this is beneficial."
 msgstr ""
 
-#: js/config/scoring.js:319
+#: js/config/scoring.js:321
 msgid "Please create a page title."
 msgstr ""
 
 #. translators: %3$d expands to the number of characters in the page title, %1$d to the minimum number of characters for the title
-#: js/config/scoring.js:325
+#: js/config/scoring.js:327
 msgid ""
 "The page title contains %3$d characters, which is less than the recommended "
 "minimum of %1$d characters. Use the space to add keyword variations or "
 "create compelling call-to-action copy."
 msgstr ""
 
 #. translators: %3$d expands to the number of characters in the page title, %2$d to the maximum number of characters for the title
-#: js/config/scoring.js:332
+#: js/config/scoring.js:334
 msgid ""
 "The page title contains %3$d characters, which is more than the viewable "
 "limit of %2$d characters; some words will not be visible to users in your "
 "listing."
 msgstr ""
 
 #. translators: %1$d expands to the minimum number of characters in the page title, %2$d to the maximum number of characters
-#: js/config/scoring.js:340
+#: js/config/scoring.js:342
 msgid ""
 "The page title is between the %1$d character minimum and the recommended "
 "%2$d character maximum."
 msgstr ""
 
 #. translators: %1$s expands to the focus keyword
-#: js/config/scoring.js:358
+#: js/config/scoring.js:360
 msgid "The focus keyword '%1$s' does not appear in the page title."
 msgstr ""
 
-#: js/config/scoring.js:364
+#: js/config/scoring.js:366
 msgid ""
 "The page title contains the focus keyword, at the beginning which is "
 "considered to improve rankings."
 msgstr ""
 
-#: js/config/scoring.js:370
+#: js/config/scoring.js:372
 msgid ""
 "The page title contains the focus keyword, but it does not appear at the "
 "beginning; try and move it to the beginning."
 msgstr ""
 
-#: js/config/scoring.js:379
+#: js/config/scoring.js:381
 msgid "The focus keyword appears in the URL for this page."
 msgstr ""
 
-#: js/config/scoring.js:383
+#: js/config/scoring.js:385
 msgid ""
 "The focus keyword does not appear in the URL for this page. If you decide to "
 "rename the URL be sure to check the old URL 301 redirects to the new one!"
 msgstr ""
 
-#: js/config/scoring.js:389
+#: js/config/scoring.js:391
 msgid "The slug for this page is a bit long, consider shortening it."
 msgstr ""
 
 #. translators: %1$s opens a link to a wikipedia article about stop words, %2$s closes the link
-#: js/config/scoring.js:398
+#: js/config/scoring.js:400
 msgid ""
 "The slug for this page contains one or more %1$sstop words%2$s, consider "
 "removing them."
 msgstr ""
 
 #. translators: this link is referred to in the content analysis when a slug contains one or more stop words
-#: js/config/scoring.js:406
+#: js/config/scoring.js:408
 msgid "http://en.wikipedia.org/wiki/Stop_words"
 msgstr ""
 
-#: js/config/scoring.js:421
+#: js/config/scoring.js:423
 msgid "No images appear in this page, consider adding some as appropriate."
 msgstr ""
 
-#: js/config/scoring.js:427
+#: js/config/scoring.js:429
 msgid "The images on this page are missing alt tags."
 msgstr ""
 
-#: js/config/scoring.js:433
+#: js/config/scoring.js:435
 msgid "The images on this page contain alt tags"
 msgstr ""
 
-#: js/config/scoring.js:439
+#: js/config/scoring.js:441
 msgid "The images on this page contain alt tags with the focus keyword."
 msgstr ""
 
-#: js/config/scoring.js:445
+#: js/config/scoring.js:447
 msgid ""
 "The images on this page do not have alt tags containing your focus keyword."
 msgstr ""
 
-#: js/config/scoring.js:451
+#: js/config/scoring.js:453
 msgid "You've never used this focus keyword before, very good."
 msgstr ""
 
 #. translators: %1$s and %2$s expand to an admin link where the focus keyword is already used
-#: js/config/scoring.js:458
+#: js/config/scoring.js:460
 msgid ""
 "You've used this focus keyword %1$sonce before%2$s, be sure to make very "
 "clear which URL on your site is the most important for this keyword."
 msgstr ""
 
 #. translators: %3$s and $2$s expand to the admin search page for the focus keyword, %4$d expands to the number of times this focus keyword has been used before, %5$s and %6$s expand to a link to an article on yoast.com about cornerstone content
-#: js/config/scoring.js:466
+#: js/config/scoring.js:468
 msgid ""
 "You've used this focus keyword %3$s%4$d times before%2$s, it's probably a "
 "good idea to read %6$sthis post on cornerstone content%5$s and improve your "