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

MediaBrowser.Common.Implementations/BaseApplicationHost.cs

@@ -207,6 +207,9 @@ namespace MediaBrowser.Common.Implementations
             FileSystemManager = fileSystem;
 
             ConfigurationManager = GetConfigurationManager();
+
+            // Initialize this early in case the -v command line option is used
+            Logger = LogManager.GetLogger("App");
         }
 
         /// <summary>
@@ -228,7 +231,6 @@ namespace MediaBrowser.Common.Implementations
 
             JsonSerializer = CreateJsonSerializer();
 
-            Logger = LogManager.GetLogger("App");
             OnLoggerLoaded(true);
             LogManager.LoggerLoaded += (s, e) => OnLoggerLoaded(false);
 

MediaBrowser.Providers/MediaBrowser.Providers.csproj

@@ -55,7 +55,7 @@
     </Reference>
     <Reference Include="MediaBrowser.Naming, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.8\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.9\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
     </Reference>
     <Reference Include="MoreLinq, Version=1.1.17511.0, Culture=neutral, PublicKeyToken=384d532d7e88985d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

MediaBrowser.Providers/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MediaBrowser.BdInfo" version="1.0.0.10" targetFramework="net45" />
-  <package id="MediaBrowser.Naming" version="1.0.0.8" targetFramework="net45" />
+  <package id="MediaBrowser.Naming" version="1.0.0.9" targetFramework="net45" />
   <package id="morelinq" version="1.1.0" targetFramework="net45" />
   <package id="taglib" version="2.1.0.0" targetFramework="net45" />
 </packages>

MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json

@@ -285,7 +285,7 @@
     "LabelPremiereProgram": "PREMIERE",
     "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Modifier le type de r\u00e9pertoire",
-    "HeaderChangeFolderTypeHelp": "Pour modifier le type de dossier, merci de supprimer et reconstruire la collection avec le nouveau type.",
+    "HeaderChangeFolderTypeHelp": "Pour modifier le type de r\u00e9pertoire, veuillez supprimer et reconstruire le r\u00e9pertoire avec le nouveau type.",
     "HeaderAlert": "Alerte",
     "MessagePleaseRestart": "Veuillez red\u00e9marrer pour finaliser les mises \u00e0 jour.",
     "ButtonRestart": "Red\u00e9marrer",

MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json

@@ -75,7 +75,7 @@
     "ButtonClose": "Lukk",
     "LabelAllPlaysSentToPlayer": "All avspill vil bli sendt til den valgte spilleren.",
     "MessageInvalidUser": "Ugyldig brukernavn eller passord. Vennligst pr\u00f8v igjen.",
-    "HeaderLoginFailure": "Login Failure",
+    "HeaderLoginFailure": "P\u00e5loggingsfeil",
     "HeaderAllRecordings": "Alle Opptak",
     "RecommendationBecauseYouLike": "Fordi du liker {0}",
     "RecommendationBecauseYouWatched": "Fordi du s\u00e5 {0}",
@@ -600,23 +600,23 @@
     "DeviceLastUsedByUserName": "Sist brukt av {0}",
     "HeaderDeleteDevice": "Slett Enhet",
     "DeleteDeviceConfirmation": "Er du sikker p\u00e5 at du vil slette denne enheten? Den vil gjenoppst\u00e5 neste gang en bruker logger inn med den.",
-    "LabelEnableCameraUploadFor": "Aktiver kamera opplasting for:",
+    "LabelEnableCameraUploadFor": "Aktiver kameraopplasting for:",
     "HeaderSelectUploadPath": "Velg Opplastings sti",
     "LabelEnableCameraUploadForHelp": "Opplasting vil foreg\u00e5 automatisk i bakgrunnen n\u00e5r man er logget inn i Media Browser.",
-    "ErrorMessageStartHourGreaterThanEnd": "End time must be greater than the start time.",
+    "ErrorMessageStartHourGreaterThanEnd": "Sluttid m\u00e5 v\u00e6re senere enn starttid.",
     "ButtonLibraryAccess": "Library access",
-    "ButtonParentalControl": "Parental control",
-    "HeaderInvitationSent": "Invitation Sent",
-    "MessageInvitationSentToUser": "An email has been sent to {0}, inviting them to accept your sharing invitation.",
-    "MessageInvitationSentToNewUser": "An email has been sent to {0} inviting them to sign up with Media Browser.",
+    "ButtonParentalControl": "Foreldrekontroll",
+    "HeaderInvitationSent": "Invitasjon Sendt",
+    "MessageInvitationSentToUser": "En epost har blitt sent til {0} med oppfordring til \u00e5 godta invitasjonen din.",
+    "MessageInvitationSentToNewUser": "En epost har blitt sendt til {0} med en invitasjon til \u00e5 registrere seg med Media Browser.",
     "HeaderConnectionFailure": "Tilkobling feiler",
     "MessageUnableToConnectToServer": "Vi klarte ikke \u00e5 koble til ditt valg n\u00e5. Vennligst pr\u00f8v igjen senere.",
     "ButtonSelectServer": "Velg server",
     "MessagePluginConfigurationRequiresLocalAccess": "Logg inn p\u00e5 din lokale server direkte for \u00e5 konfigurere dette programtillegget.",
     "MessageLoggedOutParentalControl": "Tilgangen er forel\u00f8pig begrenset. Vennligst pr\u00f8v igjen senere.",
-    "DefaultErrorMessage": "There was an error processing the request. Please try again later.",
-    "ButtonAccept": "Accept",
-    "ButtonReject": "Reject",
+    "DefaultErrorMessage": "Det skjedde en feil under behandling av foresp\u00f8rselen. Vennligst pr\u00f8v igjen senere.",
+    "ButtonAccept": "Godta",
+    "ButtonReject": "Avvis",
     "HeaderForgotPassword": "Forgot Password",
     "MessageContactAdminToResetPassword": "Please contact your system administrator to reset your password.",
     "MessageForgotPasswordInNetworkRequired": "Please try again within your home network to initiate the password reset process.",

MediaBrowser.Server.Implementations/Localization/Server/fr.json

@@ -458,7 +458,7 @@
     "LinkApiDocumentation": "Documentation du API",
     "LabelFriendlyServerName": "Surnom du serveur:",
     "LabelFriendlyServerNameHelp": "Ce nom sera utilis\u00e9 pour identifier ce serveur. Si laiss\u00e9 vide, le nom d'ordinateur sera utilis\u00e9.",
-    "LabelPreferredDisplayLanguage": "Langue d'affichage pr\u00e9f\u00e9r\u00e9e",
+    "LabelPreferredDisplayLanguage": "Langue d'affichage pr\u00e9f\u00e9r\u00e9e :",
     "LabelPreferredDisplayLanguageHelp": "La traduction de Media Browser est un projet en cours et n'est pas compl\u00e9t\u00e9e encore.",
     "LabelReadHowYouCanContribute": "Lire comment vous pouvez contribuer.",
     "HeaderNewCollection": "Nouvelle collection",

MediaBrowser.Server.Implementations/Localization/Server/nb.json

@@ -75,7 +75,7 @@
     "TabSecurity": "Sikkerhet",
     "ButtonAddUser": "Ny bruker",
     "ButtonAddLocalUser": "Legg til lokal bruker",
-    "ButtonInviteUser": "Invite User",
+    "ButtonInviteUser": "Invit\u00e9r Bruker",
     "ButtonSave": "lagre",
     "ButtonResetPassword": "Resett passord",
     "LabelNewPassword": "Nytt passord",
@@ -184,7 +184,7 @@
     "TabStudios": "Studio",
     "TabTrailers": "Trailere",
     "LabelArtists": "Artister:",
-    "LabelArtistsHelp": "Separate multiple using ;",
+    "LabelArtistsHelp": "Skill flere med semikolon ;",
     "HeaderLatestMovies": "Siste Filmer",
     "HeaderLatestTrailers": "Siste Trailers",
     "OptionHasSpecialFeatures": "Spesial Funksjoner",
@@ -1158,7 +1158,7 @@
     "OptionSaveMetadataAsHidden": "Lagre metadata og bilder som skjulte filer",
     "LabelExtractChaptersDuringLibraryScan": "Hent ut kapittel bilder under bibliotek skann",
     "LabelExtractChaptersDuringLibraryScanHelp": "Hvis aktivert, vil kapittel bilder bli hentet ut mens videoer importeres under bibliotek skanning.\nHvis deaktivert, vil de bli hentet ut under planlagte oppgaver for kapittel bilder, som medf\u00f8rer at vanlig bibliotek skanning blir fortere ferdig.",
-    "LabelConnectGuestUserName": "Their Media Browser username or email address:",
+    "LabelConnectGuestUserName": "Deres Media Browser brukernavn eller epostadresse:",
     "LabelConnectUserName": "Media Browser brukernavn\/e-post",
     "LabelConnectUserNameHelp": "Tilknytt denne brukeren til en Media Browser konto for \u00e5 muliggj\u00f8re enkel log-inn  fra enhver Media Browser app uten \u00e5 vite server ip adressen.",
     "ButtonLearnMoreAboutMediaBrowserConnect": "L\u00e6r mer om Media Browser Connect",
@@ -1210,44 +1210,44 @@
     "LabelDateAddedBehaviorHelp": "Hvis metadata verdier er tilgjengelig vil de alltid bli brukt fremfor noen av disse valgene.",
     "LabelNumberTrailerToPlay": "Antall trailere \u00e5 avspille:",
     "TitleDevices": "Enheter",
-    "TabCameraUpload": "Camera Upload",
+    "TabCameraUpload": "Kameraopplasting",
     "TabDevices": "Enheter",
     "HeaderCameraUploadHelp": "Automatically upload photos and videos taken from your mobile devices into Media Browser.",
-    "MessageNoDevicesSupportCameraUpload": "You currently don't have any devices that support camera upload.",
-    "LabelCameraUploadPath": "Camera upload path:",
-    "LabelCameraUploadPathHelp": "Select a custom upload path, if desired. If unspecified a default folder will be used.",
-    "LabelCreateCameraUploadSubfolder": "Create a subfolder for each device",
+    "MessageNoDevicesSupportCameraUpload": "Du har for \u00f8yeblikket ingen enheter som st\u00f8tter kameraopplasting.",
+    "LabelCameraUploadPath": "Sti til kameraopplasting:",
+    "LabelCameraUploadPathHelp": "Velg en egendefinert sti for opplasting hvis du vil. Hvis ikke brukes en standard sti.",
+    "LabelCreateCameraUploadSubfolder": "Lag en underkatalog for hver enhet",
     "LabelCreateCameraUploadSubfolderHelp": "Specific folders can be assigned to a device by clicking on it from the Devices page.",
-    "LabelCustomDeviceDisplayName": "Display name:",
-    "LabelCustomDeviceDisplayNameHelp": "Supply a custom display name or leave empty to use the name reported by the device.",
-    "HeaderInviteUser": "Invite User",
-    "LabelConnectGuestUserNameHelp": "This is the username that your friend uses to sign in to the Media Browser website, or their email address.",
-    "HeaderInviteUserHelp": "Sharing your media with friends is easier than ever before with Media Browser Connect.",
-    "ButtonSendInvitation": "Send Invitation",
+    "LabelCustomDeviceDisplayName": "Visningsnavn:",
+    "LabelCustomDeviceDisplayNameHelp": "Oppgi et egendefinert visningsnavn eller la det v\u00e6re tomt for \u00e5 bruke navnet som enheten rapporterer.",
+    "HeaderInviteUser": "Invit\u00e9r Bruker",
+    "LabelConnectGuestUserNameHelp": "Dette er brukernavnet som vennen din bruker for \u00e5 logge inn p\u00e5 Media Browser nettstedet, eller epostadressen deres.",
+    "HeaderInviteUserHelp": "\u00c5 dele mediefiler med venner er enklere enn noen gang f\u00f8r med Media Browser Connect.",
+    "ButtonSendInvitation": "Send Invitasjon",
     "HeaderSignInWithConnect": "Sign in with Media Browser Connect",
-    "HeaderGuests": "Guests",
-    "HeaderLocalUsers": "Local Users",
+    "HeaderGuests": "Gjester",
+    "HeaderLocalUsers": "Lokale Brukere",
     "HeaderPendingInvitations": "Pending Invitations",
-    "TabParentalControl": "Parental Control",
+    "TabParentalControl": "Foreldrekontroll",
     "HeaderAccessSchedule": "Access Schedule",
     "HeaderAccessScheduleHelp": "Create an access schedule to limit access to certain hours.",
     "ButtonAddSchedule": "Add Schedule",
-    "LabelAccessDay": "Day of week:",
-    "LabelAccessStart": "Start time:",
-    "LabelAccessEnd": "End time:",
-    "HeaderSchedule": "Schedule",
-    "OptionEveryday": "Every day",
-    "OptionWeekdays": "Weekdays",
-    "OptionWeekends": "Weekends",
-    "MessageProfileInfoSynced": "User profile information synced with Media Browser Connect.",
+    "LabelAccessDay": "Ukedag:",
+    "LabelAccessStart": "Starttid:",
+    "LabelAccessEnd": "Sluttid:",
+    "HeaderSchedule": "Timeplan",
+    "OptionEveryday": "Hver dag",
+    "OptionWeekdays": "Ukedager",
+    "OptionWeekends": "Helger",
+    "MessageProfileInfoSynced": "Brukerprofilinformasjon er synkronisert med Media Browser Connect.",
     "HeaderOptionalLinkMediaBrowserAccount": "Optional: Link your Media Browser account",
     "ButtonTrailerReel": "Trailer reel",
     "HeaderTrailerReel": "Trailer Reel",
     "OptionPlayUnwatchedTrailersOnly": "Play only unwatched trailers",
     "HeaderTrailerReelHelp": "Start a trailer reel to play a long running playlist of trailers.",
     "MessageNoTrailersFound": "No trailers found. Install the Trailer channel plugin to import a library of internet trailers.",
-    "HeaderNewUsers": "New Users",
-    "ButtonSignUp": "Sign up",
+    "HeaderNewUsers": "Nye Brukere",
+    "ButtonSignUp": "Registrering",
     "ButtonForgotPassword": "Glemt passord?",
     "OptionDisableUserPreferences": "Deaktiver tillgang til bruker preferanser",
     "OptionDisableUserPreferencesHelp": "Hvis ativert, vil kun administratorer kunne konfigurere bruker profil bilder, passord og spr\u00e5k preferanser.",

MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

@@ -51,7 +51,7 @@
     </Reference>
     <Reference Include="MediaBrowser.Naming, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.8\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.9\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Nat, Version=1.2.21.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

MediaBrowser.Server.Implementations/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Naming" version="1.0.0.8" targetFramework="net45" />
+  <package id="MediaBrowser.Naming" version="1.0.0.9" targetFramework="net45" />
   <package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
   <package id="morelinq" version="1.1.0" targetFramework="net45" />
 </packages>

MediaBrowser.ServerApplication/MainStartup.cs

@@ -223,7 +223,7 @@ namespace MediaBrowser.ServerApplication
                 "MBServer",
                 true,
                 nativeApp);
-
+            
             var initProgress = new Progress<double>();
 
             if (!runService)