Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

1 files changed, 65 insertions, 63 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 0a44fd601..162c07047 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -2,9 +2,11 @@
     "LabelExit": "Quitter",
     "HeaderPassword": "Mot de passe",
     "LabelVisitCommunity": "Visiter la Communaut\u00e9",
-    "HeaderLocalAccess": "Local Access",
+    "HeaderLocalAccess": "Acc\u00e8s local",
     "LabelGithubWiki": "GitHub Wiki",
+    "HeaderViewOrder": "View Order",
     "LabelSwagger": "Swagger",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelStandard": "Standard",
     "LabelViewApiDocumentation": "Consulter la documentation API",
     "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
@@ -259,7 +261,7 @@
     "ButtonSelectDirectory": "S\u00e9lectionner le r\u00e9pertoire",
     "LabelCustomPaths": "Sp\u00e9cifier des chemins d'acc\u00e8s personnalis\u00e9s si d\u00e9sir\u00e9. Laisser vide pour garder les chemin d'acc\u00e8s par d\u00e9faut.",
     "LabelCachePath": "Chemin d'acc\u00e8s du cache temporaire:",
-    "LabelCachePathHelp": "Ce r\u00e9pertoire contient les fichier temporaires du serveur, comme, par example, les images.",
+    "LabelCachePathHelp": "Ce r\u00e9pertoire contient les fichier temporaires du serveur, comme, par exemple, les images.",
     "LabelImagesByNamePath": "Chemin d'acc\u00e8s de \"Images by Name\":",
     "LabelImagesByNamePathHelp": "Ce r\u00e9pertoire contient les images des acteurs, genres et studios.",
     "LabelMetadataPath": "Chemin d'acc\u00e8s des m\u00e9tadonn\u00e9es:",
@@ -287,7 +289,7 @@
     "ButtonAutoScroll": "D\u00e9fillement automatique",
     "LabelImageSavingConvention": "Convention de sauvegarde des images:",
     "LabelImageSavingConventionHelp": "Media Browser reconnait les images des autres applications de m\u00e9dia importants. Choisir la convention de t\u00e9l\u00e9chargement peut \u00eatre pratique si vous utilisez aussi d'autres produits.",
-    "OptionImageSavingCompatible": "Compatible - Media Browser\/Plex\/XBMC",
+    "OptionImageSavingCompatible": "Compatible - Media Browser\/Xbmc\/Plex",
     "OptionImageSavingStandard": "Standard - MB2",
     "ButtonSignIn": "Se connecter",
     "TitleSignIn": "Se connecter",
@@ -441,7 +443,7 @@
     "CustomDlnaProfilesHelp": "Cr\u00e9er un profil personnalis\u00e9 pour cibler un appareil ou remplacer un profile syst\u00e8me.",
     "SystemDlnaProfilesHelp": "Les profils syst\u00e8mes sont en lecture seule. Pour remplacer un profil syst\u00e8me, cr\u00e9ez un profil personnalis\u00e9 ciblant le m\u00eame appareil.",
     "TitleDashboard": "Tableau de bord",
-    "TabHome": "Principal",
+    "TabHome": "Portail",
     "TabInfo": "Info",
     "HeaderLinks": "Liens",
     "HeaderSystemPaths": "Chemins d'acc\u00e8s syst\u00e8mes",
@@ -525,7 +527,7 @@
     "HeaderHelpImproveMediaBrowser": "Aidez-nous \u00e0 am\u00e9liorer Media Browser",
     "HeaderRunningTasks": "T\u00e2ches en ex\u00e9cution",
     "HeaderActiveDevices": "Appareils actifs",
-    "HeaderPendingInstallations": "Installations en suspend",
+    "HeaderPendingInstallations": "Installations en suspens",
     "HeaerServerInformation": "Information du serveur",
     "ButtonRestartNow": "Red\u00e9marrer maintenant",
     "ButtonRestart": "Red\u00e9marrer",
@@ -619,7 +621,7 @@
     "ButtonPageUp": "Page suivante",
     "ButtonPageDown": "Page pr\u00e9c\u00e9dante",
     "PageAbbreviation": "PG",
-    "ButtonHome": "Principal",
+    "ButtonHome": "Portail",
     "ButtonSettings": "Param\u00e8tres",
     "ButtonTakeScreenshot": "Capture d'\u00e9cran",
     "ButtonLetterUp": "Lettre haut",
@@ -693,14 +695,14 @@
     "HeaderProfileServerSettingsHelp": "Ces valeurs contr\u00f4lent comment Media Browser sera pr\u00e9sent\u00e9 \u00e0 l'appareil.",
     "LabelMaxBitrate": "D\u00e9bit maximum:",
     "LabelMaxBitrateHelp": "Sp\u00e9cifiez un d\u00e9bit maximum dans les environnements avec bande passante limit\u00e9e ou si l'appareil impose sa propre limite.",
-    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
-    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
-    "LabelMaxStaticBitrate": "Max sync bitrate:",
-    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMaxStreamingBitrate": "D\u00e9bit max de streaming :",
+    "LabelMaxStreamingBitrateHelp": "Sp\u00e9cifiez le d\u00e9bit max lors du streaming.",
+    "LabelMaxStaticBitrate": "D\u00e9bit max de synchronisation :",
+    "LabelMaxStaticBitrateHelp": "Sp\u00e9cifiez un d\u00e9bit max pour la synchronisation de contenu en haute qualit\u00e9.",
     "LabelMusicStaticBitrate": "Music sync bitrate:",
     "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
-    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
-    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
+    "LabelMusicStreamingTranscodingBitrate": "D\u00e9bit du transcodage musique :",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Sp\u00e9cifiez le d\u00e9bit max pendant la diffusion de musique",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore le transcodage des demandes de plage d'octets",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si activ\u00e9, ces requ\u00eates\/demandes seront honor\u00e9es mais l'ent\u00eate de plage d'octets sera ignor\u00e9. ",
     "LabelFriendlyName": "Surnom d'affichage",
@@ -772,15 +774,15 @@
     "LabelEnableBackdrops": "Activer les images d'arri\u00e8re-plans",
     "LabelEnableThemeSongsHelp": "Si activ\u00e9, les chansons themes seront lues en arri\u00e8re-plan pendant la navigation dans les biblioth\u00e8ques.",
     "LabelEnableBackdropsHelp": "Si activ\u00e9, les images d'arri\u00e8re-plan seront affich\u00e9es sur certaines pages pendant la navigation dans les biblioth\u00e8ques.",
-    "HeaderHomePage": "Page de d\u00e9marrage",
+    "HeaderHomePage": "Portail",
     "HeaderSettingsForThisDevice": "Param\u00e8tres pour cet appareil",
     "OptionAuto": "Auto",
     "OptionYes": "Oui",
     "OptionNo": "Non",
-    "LabelHomePageSection1": "Section 1 de la page de d\u00e9marrage:",
-    "LabelHomePageSection2": "Section 2 de la page de d\u00e9marrage:",
-    "LabelHomePageSection3": "Section 3 de la page de d\u00e9marrage:",
-    "LabelHomePageSection4": "Section 4 de la page de d\u00e9marrage:",
+    "LabelHomePageSection1": "Premi\u00e8re section du portail:",
+    "LabelHomePageSection2": "Seconde section du portail:",
+    "LabelHomePageSection3": "Troisi\u00e8me section du portail:",
+    "LabelHomePageSection4": "Quatri\u00e8me section du portail:",
     "OptionMyViewsButtons": "Mes vues (bouttons)",
     "OptionMyViews": "Mes vues",
     "OptionMyViewsSmall": "Mes vues (petit)",
@@ -789,12 +791,12 @@
     "OptionLatestChannelMedia": "Items de cha\u00eene les plus r\u00e9cents",
     "HeaderLatestChannelItems": "Items de cha\u00eene les plus r\u00e9cents",
     "OptionNone": "Aucun",
-    "HeaderLiveTv": "TV en directe",
+    "HeaderLiveTv": "TV en direct",
     "HeaderReports": "Rapports",
     "HeaderMetadataManager": "Gestionnaire de m\u00e9tadonn\u00e9es",
     "HeaderPreferences": "Pr\u00e9f\u00e9rences",
     "MessageLoadingChannels": "Chargement du contenu de la cha\u00eene...",
-    "MessageLoadingContent": "Loading content...",
+    "MessageLoadingContent": "Chargement du contenu...",
     "ButtonMarkRead": "Marquer lu",
     "OptionDefaultSort": "Par d\u00e9faut",
     "OptionCommunityMostWatchedSort": "Les plus \u00e9cout\u00e9s",
@@ -858,7 +860,7 @@
     "HeaderBrandingHelp": "Personnaliser l'apparence de Media Browser pour r\u00e9pondre aux besoins de votre groupe ou organisation.",
     "LabelLoginDisclaimer": "Avertissement sur la page d'accueil :",
     "LabelLoginDisclaimerHelp": "Ce sera affich\u00e9 en bas de la page de connexion.",
-    "LabelAutomaticallyDonate": "Donner ce montant automatiquement tout les 6 mois.",
+    "LabelAutomaticallyDonate": "Donner automatiquement ce montant chaque mois.",
     "LabelAutomaticallyDonateHelp": "Vous pouvez annuler via votre compte Paypal n'importe quand.",
     "OptionList": "Liste",
     "TabDashboard": "Tableau de bord",
@@ -944,61 +946,61 @@
     "OptionReportSeries": "S\u00e9ries",
     "OptionReportSeasons": "Saisons",
     "OptionReportTrailers": "Bandes-annonces",
-    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMusicVideos": "Vid\u00e9oclips",
     "OptionReportMovies": "Films",
-    "OptionReportHomeVideos": "Home videos",
+    "OptionReportHomeVideos": "Vid\u00e9os personnelles",
     "OptionReportGames": "Jeux",
     "OptionReportEpisodes": "\u00c9pisodes",
     "OptionReportCollections": "Collections",
     "OptionReportBooks": "Livres",
     "OptionReportArtists": "Artistes",
     "OptionReportAlbums": "Albums",
-    "OptionReportAdultVideos": "Adult videos",
-    "ButtonMore": "Plus...",
+    "OptionReportAdultVideos": "Vid\u00e9os adultes",
+    "ButtonMore": "Voir la suite",
     "HeaderActivity": "Activit\u00e9",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ScheduledTaskCancelledWithName": "{0} was cancelled",
-    "ScheduledTaskCompletedWithName": "{0} completed",
-    "ScheduledTaskFailed": "Scheduled task completed",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
+    "ScheduledTaskStartedWithName": "{0} a commenc\u00e9",
+    "ScheduledTaskCancelledWithName": "{0} a \u00e9t\u00e9 annul\u00e9",
+    "ScheduledTaskCompletedWithName": "{0} termin\u00e9",
+    "ScheduledTaskFailed": "T\u00e2che planifi\u00e9e termin\u00e9e",
+    "PluginInstalledWithName": "{0} a \u00e9t\u00e9 install\u00e9",
+    "PluginUpdatedWithName": "{0} a \u00e9t\u00e9 mise \u00e0 jour",
+    "PluginUninstalledWithName": "{0} a \u00e9t\u00e9 d\u00e9sinstall\u00e9",
+    "ScheduledTaskFailedWithName": "{0} a \u00e9chou\u00e9",
+    "ItemAddedWithName": "{0} a \u00e9t\u00e9 ajout\u00e9 \u00e0 la biblioth\u00e8que",
+    "ItemRemovedWithName": "{0} a \u00e9t\u00e9 supprim\u00e9 de la biblioth\u00e8que",
     "DeviceOnlineWithName": "{0} est connect\u00e9",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserOnlineFromDevice": "{0} s'est connect\u00e9(e) depuis {1}",
+    "DeviceOfflineWithName": "{0} s'est d\u00e9connect\u00e9(e)",
+    "UserOfflineFromDevice": "{0} s'est d\u00e9connect\u00e9(e) depuis {1}",
+    "SubtitlesDownloadedForItem": "Les sous-titres de {0} sont t\u00e9l\u00e9charg\u00e9s",
     "SubtitleDownloadFailureForItem": "Le t\u00e9l\u00e9chargement des sous-titres pour {0} a \u00e9chou\u00e9.",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "LabelRunningTimeValue": "Dur\u00e9e: {0}",
+    "LabelIpAddressValue": "Adresse IP: {0}",
+    "UserConfigurationUpdatedWithName": "La configuration utilisateur de {0} a \u00e9t\u00e9 mise \u00e0 jour",
     "UserCreatedWithName": "L'utilisateur {0} a \u00e9t\u00e9 cr\u00e9\u00e9.",
     "UserPasswordChangedWithName": "Le mot de passe pour l'utilisateur {0} a \u00e9t\u00e9 modifi\u00e9.",
     "UserDeletedWithName": "L'utilisateur {0} a \u00e9t\u00e9 supprim\u00e9.",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "La configuration du serveur a \u00e9t\u00e9 mise \u00e0 jour.",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La configuration de la section {0} du serveur a \u00e9t\u00e9 mise \u00e0 jour.",
     "MessageApplicationUpdated": "Media Browser Server a \u00e9t\u00e9 mise \u00e0 jour.",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}",
-    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
-    "HeaderRecentActivity": "Recent Activity",
-    "HeaderPeople": "People",
-    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
-    "OptionComposers": "Composers",
-    "OptionOthers": "Others",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
-    "ViewTypeFolders": "Folders",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
+    "AuthenticationSucceededWithUserName": "{0} s'est authentifi\u00e9 avec succ\u00e8s",
+    "FailedLoginAttemptWithUserName": "Echec d'une tentative de connexion de {0}",
+    "UserStartedPlayingItemWithValues": "{0} vient de commencer \u00e0 lire {1}",
+    "UserStoppedPlayingItemWithValues": "{0} vient d'arr\u00eater de lire {1}",
+    "AppDeviceValues": "Application : {0}, P\u00e9riph\u00e9rique : {1}",
+    "ProviderValue": "Fournisseur : {0}",
+    "LabelChannelDownloadSizeLimit": "Taille limite de t\u00e9l\u00e9chargement (Go) :",
+    "LabelChannelDownloadSizeLimitHelp": "Limiter la taille du dossier de t\u00e9l\u00e9chargement de la cha\u00eene",
+    "HeaderRecentActivity": "Activit\u00e9 R\u00e9cente",
+    "HeaderPeople": "Personnes",
+    "HeaderDownloadPeopleMetadataFor": "T\u00e9l\u00e9charger la biographie et les images pour:",
+    "OptionComposers": "Compositeurs",
+    "OptionOthers": "Autres",
+    "HeaderDownloadPeopleMetadataForHelp": "Activer les options compl\u00e9mentaires fournira plus d'information \u00e0 l'\u00e9cran mais causera une lenteur des scans de librairie.",
+    "ViewTypeFolders": "R\u00e9pertoires",
+    "LabelDisplayFoldersView": "Afficher une vue mosa\u00efque pour montrer les dossiers media en int\u00e9gralit\u00e9.",
+    "ViewTypeLiveTvRecordingGroups": "Enregistrements",
+    "ViewTypeLiveTvChannels": "Cha\u00eenes",
+    "LabelAllowLocalAccessWithoutPassword": "Autoriser l'acc\u00e8s local sans un mot de passe",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Si activ\u00e9, le mot de passe ne sera pas requis pour s'authentifier depuis le r\u00e9seau local."
 }
\ No newline at end of file