From 667eed09e282b08747e65a0db9a94992321ef441 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Mon, 15 Jul 2019 02:15:57 +0200
Subject: Merge translation files from master branch.

---
 po/fr/amarok.po | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'po/fr')

diff --git a/po/fr/amarok.po b/po/fr/amarok.po
index d4937ca4..4b4c7c2b 100644
--- a/po/fr/amarok.po
+++ b/po/fr/amarok.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amarok\n"
-"POT-Creation-Date: 2019-02-11 02:41+0100\n"
+"POT-Creation-Date: 2019-07-14 02:50+0200\n"
 "PO-Revision-Date: 2007-01-29 13:29+0100\n"
 "Last-Translator: Yannick Torrès <yannick.torres@keliglia.com>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -9124,8 +9124,8 @@ msgid ""
 "You need the moodbar package installed from your distro repositories to "
 "enable the moodbar feature."
 msgstr ""
-"Vous avez besoin d'installer le <a href='http://community.kde.org/Amarok/Archives/"
-"Moodbar'>paquet moodbar</a> pour activer la fonctionnalité moodbar."
+"Vous avez besoin d'installer le <a href='http://community.kde.org/Amarok/"
+"Archives/Moodbar'>paquet moodbar</a> pour activer la fonctionnalité moodbar."
 
 #: Options1.ui:432
 #, no-c-format
@@ -11786,10 +11786,11 @@ msgid ""
 "<p><b>MySQL</b> or <b>Postgresql</b> are faster than <b>sqlite</b>, but "
 "require additional setup.</p>\n"
 "<ul>\n"
-"<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/User_Guides/MySQL_HowTo"
-"\">Instructions for configuring MySQL</a>.</li>\n"
-"<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/User_Guides/"
-"PostgreSQL_HowTo\">Instructions for configuring Postgresql</a>.</li>\n"
+"<li><a href=\"https://community.kde.org/Amarok/Archives/Amarok_1.4/"
+"User_Guide/MySQL_HowTo\">Instructions for configuring MySQL</a>.</li>\n"
+"<li><a href=\"https://community.kde.org/Amarok/Archives/Amarok_1.4/"
+"User_Guide/PostgreSQLHowTo\">Instructions for configuring Postgresql</a>.</"
+"li>\n"
 "</ul>"
 msgstr ""
 "Amarok utilise une base de données pour stocker les informations concernant "
@@ -12846,6 +12847,32 @@ msgstr "Nom de fichier"
 msgid "Select Best Possible Match"
 msgstr "Sélectionnez le meilleur résultat possible"
 
+#, fuzzy
+#~ msgid ""
+#~ "Amarok uses a database to store information about your music. If you are "
+#~ "not sure which to use, press Next.\n"
+#~ "<p><b>MySQL</b> or <b>Postgresql</b> are faster than <b>sqlite</b>, but "
+#~ "require additional setup.</p>\n"
+#~ "<ul>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/"
+#~ "User_Guides/MySQL_HowTo\">Instructions for configuring MySQL</a>.</li>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/"
+#~ "User_Guides/PostgreSQL_HowTo\">Instructions for configuring Postgresql</"
+#~ "a>.</li>\n"
+#~ "</ul>"
+#~ msgstr ""
+#~ "Amarok utilise une base de données pour stocker les informations "
+#~ "concernant votre collection musicale. Si vous n'êtes pas sûr, cliquez sur "
+#~ "suivant.\n"
+#~ "<p><b>MySQL</b> ou <b>Postgresql</b> sont plus rapides que <b>sqlite</b>, "
+#~ "mais nécessitent de la configuration supplémentaire.</p>\n"
+#~ "<ul>\n"
+#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/MySQL_HowTo"
+#~ "\">Instructions de configuration pour MySQL</a>.</li>\n"
+#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/Postgresql_HowTo"
+#~ "\">Instructions de configuration pour Postgresql</a>.</li>\n"
+#~ "</ul>"
+
 #, fuzzy
 #~ msgid "&Help"
 #~ msgstr "(Aide)"
-- 
cgit v1.2.1