Merge branch 'j8r-patch-1'

This commit is contained in:
Nick Winter 2015-07-07 16:07:52 -07:00
commit 2f1fb921fe

View file

@ -1195,26 +1195,26 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
poll: "Sondage" poll: "Sondage"
user_polls_record: "Historique de sondage des utilisateurs" user_polls_record: "Historique de sondage des utilisateurs"
# concepts: concepts:
# advanced_strings: "Advanced Strings" advanced_strings: "Chaînes de caractères avancés"
# algorithms: "Algorithms" algorithms: "Algorithmes"
# arguments: "Arguments" # arguments: "Arguments"
# arithmetic: "Arithmetic" arithmetic: "Arithmétique"
# arrays: "Arrays" arrays: "Tableaux"
# basic_syntax: "Basic Syntax" basic_syntax: "Syntaxe basique"
# boolean_logic: "Boolean Logic" boolean_logic: "Logique Booléenne"
# break_statements: "Break Statements" break_statements: "Déclarations de sortie"
# classes: "Classes" classes: "Classes"
# for_loops: "For Loops" for_loops: "Bloucles Pour"
# functions: "Functions" functions: "Fonctions"
# if_statements: "If Statements" if_statements: "Déclarations conditionnelles Si"
# input_handling: "Input Handling" input_handling: "Manipulation des entrées"
# math_operations: "Math Operations" math_operations: "Opérations mathématiques"
# object_literals: "Object Literals" object_literals: "Objets littéraux"
# strings: "Strings" strings: "Chaînes de caractères"
# variables: "Variables" variables: "Variables"
# vectors: "Vectors" vectors: "Vecteurs"
# while_loops: "Loops" while_loops: "Boucles Tant que"
# recursion: "Recursion" # recursion: "Recursion"
delta: delta: