2016-04-18 Basile Starynkevitch <basile@starynkevitch.net>

	{{merging with even more of GCC 6, using subversion 1.9
	svn merge -r234051:234650  ^/trunk
	}}


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@235119 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 17 insertions, 13 deletions

diff --git a/libcpp/po/ChangeLog b/libcpp/po/ChangeLog
index 4a1e264b3df..d5996646b54 100644
--- a/libcpp/po/ChangeLog
+++ b/libcpp/po/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* da.po: Update.
+
+2016-03-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* fr.po: Update.
+
 2016-03-05  Joseph Myers  <joseph@codesourcery.com>
 
 	* sr.po: Update.
diff --git a/libcpp/po/da.po b/libcpp/po/da.po
index b3395bef372..3805d8fadeb 100644
--- a/libcpp/po/da.po
+++ b/libcpp/po/da.po
@@ -1,8 +1,8 @@
 # Danish version of cpplib.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcc package.
 # Ole Laursen <olau@hardworking.dk>, 2001, 02, 03.
-# Joe Hansen <joedalton2@yahoo.dk>, 2015.
+# Joe Hansen <joedalton2@yahoo.dk>, 2015, 2016.
 #
 # Konventioner:
 #
@@ -128,10 +128,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cpplib 5.1-b20150208\n"
+"Project-Id-Version: cpplib 6.1-b20160131\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2015-04-06 18:00+0200\n"
+"PO-Revision-Date: 2016-03-27 18:00+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -871,10 +871,8 @@ msgid "missing terminating %c character"
 msgstr "manglende afsluttende %c-tegn"
 
 #: lex.c:1932
-#, fuzzy
-#| msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgid "C++11 requires a space between string literal and macro"
-msgstr "ugyldig suffiks på ordret; C++11 kræver et mellemrum mellem ordret og strengmakro"
+msgstr "C++11 kræver et mellemrum mellem ordret og strengmakro"
 
 #: lex.c:2474 lex.c:2508
 msgid "C++ style comments are not allowed in ISO C90"
diff --git a/libcpp/po/fr.po b/libcpp/po/fr.po
index 2f4129e6be2..085a19f0dac 100644
--- a/libcpp/po/fr.po
+++ b/libcpp/po/fr.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the gcc package.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 # François-Xavier Coudert <fxcoudert@gcc.gnu.org>, 2008.
-# Stéphane Aulery <lkppo@free.fr>, 2015.
+# Stéphane Aulery <lkppo@free.fr>, 2015, 2016.
 #
 # Vocabulaire utilisé
 # 	lvalue	 	= membre gauche
@@ -119,10 +119,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU cpplib 5.1-b20150208\n"
+"Project-Id-Version: GNU cpplib 6.1-b20160131\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2015-04-11 00:44+0200\n"
+"PO-Revision-Date: 2016-03-16 23:56+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -877,10 +877,8 @@ msgid "missing terminating %c character"
 msgstr "caractère %c de terminaison manquant"
 
 #: lex.c:1932
-#, fuzzy
-#| msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgid "C++11 requires a space between string literal and macro"
-msgstr "suffixe de chaîne invalide ; C++11 requière un espace entre une chaîne et une macro de chaîne"
+msgstr "C++11 requière un espace entre une chaîne et une macro"
 
 #: lex.c:2474 lex.c:2508
 msgid "C++ style comments are not allowed in ISO C90"