Merge branch 'release/6.9.x'

b2evolution · Aug 25, 2017 · 46085e7 · 46085e7
2 parents 9deb2e7 + 872499f
commit 46085e7
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 166 deletions.
diff --git a/_transifex/messages.pot b/_transifex/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: b2evolution 6\n"
 "Report-Msgid-Bugs-To: http://fplanque.com/\n"
-"POT-Creation-Date: 2017-08-25 17:38+0200\n"
+"POT-Creation-Date: 2017-08-25 22:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7615,7 +7615,7 @@ msgid "Latest Meta Comments"
 msgstr ""
 
 #: ../../../inc/collections/coll_settings.ctrl.php:760
-#: ../../../inc/items/items.ctrl.php:514 ../inc/items/model/_item.class.php:8719
+#: ../../../inc/items/items.ctrl.php:514 ../inc/items/model/_item.class.php:8718
 msgid "New post"
 msgstr ""
 
@@ -11919,17 +11919,17 @@ msgid "%d prerendered content"
 msgstr ""
 
 #: ../../../inc/comments/model/_comment.class.php:759
-#: ../../../inc/items/model/_item.class.php:9603
+#: ../../../inc/items/model/_item.class.php:9602
 msgid "Negative"
 msgstr ""
 
 #: ../../../inc/comments/model/_comment.class.php:763
-#: ../../../inc/items/model/_item.class.php:9607
+#: ../../../inc/items/model/_item.class.php:9606
 msgid "UNDECIDED"
 msgstr ""
 
 #: ../../../inc/comments/model/_comment.class.php:771
-#: ../../../inc/items/model/_item.class.php:9615
+#: ../../../inc/items/model/_item.class.php:9614
 msgid "Positive"
 msgstr ""
 
@@ -12028,7 +12028,7 @@ msgid "You sent a \"no opinion\" vote."
 msgstr ""
 
 #: ../../../inc/comments/model/_comment.class.php:1924
-#: ../../../inc/items/model/_item.class.php:9346
+#: ../../../inc/items/model/_item.class.php:9345
 msgid "No user votes yet."
 msgstr ""
 
@@ -12311,18 +12311,18 @@ msgstr ""
 msgid "[%s] Spam comment may need moderation on \"%s\""
 msgstr ""
 
-#: ../../../inc/comments/model/_comment.class.php:4565
-#: ../../../inc/comments/model/_comment.class.php:4569
+#: ../../../inc/comments/model/_comment.class.php:4539
+#: ../../../inc/comments/model/_comment.class.php:4543
 #: ../../../inc/comments/model/_comment.funcs.php:898
 msgid "Reply to this comment"
 msgstr ""
 
-#: ../../../inc/comments/model/_comment.class.php:4565
+#: ../../../inc/comments/model/_comment.class.php:4539
 #: ../../../inc/comments/model/_comment.funcs.php:906
 msgid "You are currently replying to this comment"
 msgstr ""
 
-#: ../../../inc/comments/model/_comment.class.php:4873
+#: ../../../inc/comments/model/_comment.class.php:4847
 #, php-format
 msgid "Since the parent post of this comment have its visibility set to \"%s\", the visibility of this comment will be restricted to \"%s\"."
 msgstr ""
@@ -16526,94 +16526,94 @@ msgstr ""
 msgid "This is a tinyurl you can copy/paste into twitter, emails and other places where you need a short link to this post"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:8714
+#: ../../../inc/items/model/_item.class.php:8713
 #: ../../../skins/bootstrap_forums_skin/_legend.inc.php:64
 #: ../../../skins/bootstrap_forums_skin/_skin.class.php:442
 #: ../../../skins/pureforums_skin/_legend.inc.php:64
 msgid "New topic"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:8715
+#: ../../../inc/items/model/_item.class.php:8714
 #: ../../../skins/bootstrap_forums_skin/_legend.inc.php:68
 #: ../../../skins/pureforums_skin/_legend.inc.php:68
 msgid "Updated topic"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:8720
+#: ../../../inc/items/model/_item.class.php:8719
 msgid "Updated post"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:8827
+#: ../../../inc/items/model/_item.class.php:8826
 msgid "Do you want to save your changes before changing the Post Type?"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9090
+#: ../../../inc/items/model/_item.class.php:9089
 #, php-format
 msgid "Since this collection is \"Private\", the visibility of this post will be restricted to \"%s\"."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9094
+#: ../../../inc/items/model/_item.class.php:9093
 #, php-format
 msgid "Since this collection is \"Members only\", the visibility of this post will be restricted to \"%s\"."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9099
+#: ../../../inc/items/model/_item.class.php:9098
 #, php-format
 msgid "Since this collection is \"Community only\", the visibility of this post will be restricted to \"%s\"."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9200
+#: ../../../inc/items/model/_item.class.php:9199
 msgid "Click to flag this."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9201
+#: ../../../inc/items/model/_item.class.php:9200
 msgid "You have flagged this. Click to remove flag."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9339
+#: ../../../inc/items/model/_item.class.php:9338
 #: ../../../inc/users/model/_user.funcs.php:3967
 #: ../../../inc/widgets/widgets/_item_vote.widget.php:90
 msgid "My vote:"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9340
+#: ../../../inc/items/model/_item.class.php:9339
 msgid "Cast a positive vote!"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9341
+#: ../../../inc/items/model/_item.class.php:9340
 msgid "You sent a positive vote."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9342
+#: ../../../inc/items/model/_item.class.php:9341
 msgid "Cast a neutral vote!"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9343
+#: ../../../inc/items/model/_item.class.php:9342
 msgid "You sent a neutral vote."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9344
+#: ../../../inc/items/model/_item.class.php:9343
 msgid "Cast a negative vote!"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9345
+#: ../../../inc/items/model/_item.class.php:9344
 msgid "You sent a negative vote."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9368
+#: ../../../inc/items/model/_item.class.php:9367
 msgid "Voting:"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9595
+#: ../../../inc/items/model/_item.class.php:9594
 #, php-format
 msgid "%s Likes"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9595
+#: ../../../inc/items/model/_item.class.php:9594
 msgid "No likes"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9767
+#: ../../../inc/items/model/_item.class.php:9766
 msgid "Refresh \"contents last updated\" timestamp!"
 msgstr ""
 

diff --git a/conf/_application.php b/conf/_application.php
@@ -15,7 +15,7 @@
  * Note: This has to be compatible with {@link http://us2.php.net/en/version-compare}.
  * @global string
  */
-$app_version = '6.9.3';
+$app_version = '6.9.3-stable';
 
 /**
  * Release date (ISO)

diff --git a/locales/de_DE/LC_MESSAGES/messages.po b/locales/de_DE/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: b2evolution 6\n"
 "Report-Msgid-Bugs-To: http://fplanque.com/\n"
-"POT-Creation-Date: 2017-08-25 17:38+0200\n"
+"POT-Creation-Date: 2017-08-25 22:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Manuel García <solipa@gmail.com>, 2017\n"
 "Language-Team: German (Germany) (https://www.transifex.com/fplanque/teams/23/de_DE/)\n"
@@ -8354,7 +8354,7 @@ msgstr "Neueste Meta-Kommentare"
 
 #: ../../../inc/collections/coll_settings.ctrl.php:760
 #: ../../../inc/items/items.ctrl.php:514
-#: ../inc/items/model/_item.class.php:8719
+#: ../inc/items/model/_item.class.php:8718
 msgid "New post"
 msgstr "Neuer Eintrag"
 
@@ -13135,17 +13135,17 @@ msgid "%d prerendered content"
 msgstr "%d vorgerenderter Inhalt"
 
 #: ../../../inc/comments/model/_comment.class.php:759
-#: ../../../inc/items/model/_item.class.php:9603
+#: ../../../inc/items/model/_item.class.php:9602
 msgid "Negative"
 msgstr ""
 
 #: ../../../inc/comments/model/_comment.class.php:763
-#: ../../../inc/items/model/_item.class.php:9607
+#: ../../../inc/items/model/_item.class.php:9606
 msgid "UNDECIDED"
 msgstr "UNENTSCHIEDEN"
 
 #: ../../../inc/comments/model/_comment.class.php:771
-#: ../../../inc/items/model/_item.class.php:9615
+#: ../../../inc/items/model/_item.class.php:9614
 msgid "Positive"
 msgstr ""
 
@@ -13246,7 +13246,7 @@ msgid "You sent a \"no opinion\" vote."
 msgstr ""
 
 #: ../../../inc/comments/model/_comment.class.php:1924
-#: ../../../inc/items/model/_item.class.php:9346
+#: ../../../inc/items/model/_item.class.php:9345
 msgid "No user votes yet."
 msgstr ""
 
@@ -13554,18 +13554,18 @@ msgstr "[%s] Neuer Kommentar zu \"%s\""
 msgid "[%s] Spam comment may need moderation on \"%s\""
 msgstr ""
 
-#: ../../../inc/comments/model/_comment.class.php:4565
-#: ../../../inc/comments/model/_comment.class.php:4569
+#: ../../../inc/comments/model/_comment.class.php:4539
+#: ../../../inc/comments/model/_comment.class.php:4543
 #: ../../../inc/comments/model/_comment.funcs.php:898
 msgid "Reply to this comment"
 msgstr "Auf diesen Kommentar antworten"
 
-#: ../../../inc/comments/model/_comment.class.php:4565
+#: ../../../inc/comments/model/_comment.class.php:4539
 #: ../../../inc/comments/model/_comment.funcs.php:906
 msgid "You are currently replying to this comment"
 msgstr "Sie antworten gerade auf diesen Kommentar"
 
-#: ../../../inc/comments/model/_comment.class.php:4873
+#: ../../../inc/comments/model/_comment.class.php:4847
 #, php-format
 msgid ""
 "Since the parent post of this comment have its visibility set to \"%s\", the"
@@ -18055,29 +18055,29 @@ msgstr ""
 "Dies ist eine Tinyurl, die Sie kopieren und in Twitter, E-Mails und anderen "
 "Orten einfügen können, wo sie einen kurzen Link zu diesem Post benötigen."
 
-#: ../../../inc/items/model/_item.class.php:8714
+#: ../../../inc/items/model/_item.class.php:8713
 #: ../../../skins/bootstrap_forums_skin/_legend.inc.php:64
 #: ../../../skins/bootstrap_forums_skin/_skin.class.php:442
 #: ../../../skins/pureforums_skin/_legend.inc.php:64
 msgid "New topic"
 msgstr "Neues Thema"
 
-#: ../../../inc/items/model/_item.class.php:8715
+#: ../../../inc/items/model/_item.class.php:8714
 #: ../../../skins/bootstrap_forums_skin/_legend.inc.php:68
 #: ../../../skins/pureforums_skin/_legend.inc.php:68
 msgid "Updated topic"
 msgstr "Aktualisiertes Thema"
 
-#: ../../../inc/items/model/_item.class.php:8720
+#: ../../../inc/items/model/_item.class.php:8719
 msgid "Updated post"
 msgstr "Aktualisierter Eintrag"
 
-#: ../../../inc/items/model/_item.class.php:8827
+#: ../../../inc/items/model/_item.class.php:8826
 msgid "Do you want to save your changes before changing the Post Type?"
 msgstr ""
 "Möchten Sie Ihre Änderungen speichern, bevor sie den Eintragstyp ändern?"
 
-#: ../../../inc/items/model/_item.class.php:9090
+#: ../../../inc/items/model/_item.class.php:9089
 #, php-format
 msgid ""
 "Since this collection is \"Private\", the visibility of this post will be "
@@ -18086,7 +18086,7 @@ msgstr ""
 "Da diese Sammlung auf \"Privat\" eingestellt ist, wird die Sichtbarkeit "
 "dieses Eintrags auf \"%s\" eingeschränkt."
 
-#: ../../../inc/items/model/_item.class.php:9094
+#: ../../../inc/items/model/_item.class.php:9093
 #, php-format
 msgid ""
 "Since this collection is \"Members only\", the visibility of this post will "
@@ -18095,7 +18095,7 @@ msgstr ""
 "Da diese Sammlung auf \"Nur für Mitglieder\" eingestellt ist, wird die "
 "Sichtbarkeit dieses Eintrags auf \"%s\" eingeschränkt."
 
-#: ../../../inc/items/model/_item.class.php:9099
+#: ../../../inc/items/model/_item.class.php:9098
 #, php-format
 msgid ""
 "Since this collection is \"Community only\", the visibility of this post "
@@ -18104,58 +18104,58 @@ msgstr ""
 "Da diese Sammlung auf \"Nur Community\" eingestellt ist, wird die "
 "Sichtbarkeit dieses Eintrags auf \"%s\" eingeschränkt."
 
-#: ../../../inc/items/model/_item.class.php:9200
+#: ../../../inc/items/model/_item.class.php:9199
 msgid "Click to flag this."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9201
+#: ../../../inc/items/model/_item.class.php:9200
 msgid "You have flagged this. Click to remove flag."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9339
+#: ../../../inc/items/model/_item.class.php:9338
 #: ../../../inc/users/model/_user.funcs.php:3967
 #: ../../../inc/widgets/widgets/_item_vote.widget.php:90
 msgid "My vote:"
 msgstr "Meine Stimme:"
 
-#: ../../../inc/items/model/_item.class.php:9340
+#: ../../../inc/items/model/_item.class.php:9339
 msgid "Cast a positive vote!"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9341
+#: ../../../inc/items/model/_item.class.php:9340
 msgid "You sent a positive vote."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9342
+#: ../../../inc/items/model/_item.class.php:9341
 msgid "Cast a neutral vote!"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9343
+#: ../../../inc/items/model/_item.class.php:9342
 msgid "You sent a neutral vote."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9344
+#: ../../../inc/items/model/_item.class.php:9343
 msgid "Cast a negative vote!"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9345
+#: ../../../inc/items/model/_item.class.php:9344
 msgid "You sent a negative vote."
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9368
+#: ../../../inc/items/model/_item.class.php:9367
 msgid "Voting:"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9595
+#: ../../../inc/items/model/_item.class.php:9594
 #, php-format
 msgid "%s Likes"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9595
+#: ../../../inc/items/model/_item.class.php:9594
 msgid "No likes"
 msgstr ""
 
-#: ../../../inc/items/model/_item.class.php:9767
+#: ../../../inc/items/model/_item.class.php:9766
 msgid "Refresh \"contents last updated\" timestamp!"
 msgstr ""