merge from dev

This commit is contained in:
Luke Pulverenti
2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
+2 -2
View File
@@ -1513,8 +1513,8 @@
"OptionEnableVideoFrameAnalysis": "Activer l'analyse vid\u00e9o image par image",
"OptionEnableVideoFrameAnalysisHelp": "Extraire des informations d\u00e9taill\u00e9es sur les vid\u00e9os pour rendre le transcodage le plus efficace possible. Cette option ralentira le scan de la biblioth\u00e8que.",
"LabelVideoFrameAnalysisLimit": "Limiter l'analyse image par image aux vid\u00e9os inf\u00e9rieures \u00e0 :",
"LabelHardwareAccelerationType": "Hardware acceleration:",
"LabelHardwareAccelerationTypeHelp": "Available on supported systems only.",
"LabelHardwareAccelerationType": "Acc\u00e9l\u00e9ration mat\u00e9rielle:",
"LabelHardwareAccelerationTypeHelp": "Disponible uniquement sur les syst\u00e8mes support\u00e9s.",
"ButtonServerDashboard": "Tableau de bord du serveur",
"HeaderAdmin": "Admin",
"ButtonSignOut": "D\u00e9connexion",