diff --git a/components/editor/dialog.php b/components/editor/dialog.php
index a481385..8da02ca 100755
--- a/components/editor/dialog.php
+++ b/components/editor/dialog.php
@@ -191,15 +191,16 @@ switch($_GET['action']){
         <td>
         
         <select class="setting" data-setting="soft-tabs">
-            <option value="false">No</option>
-            <option value="true">Yes</option>
+            <option value="false"><?php i18n("No"); ?></option>
+            <option value="true"><?php i18n("Yes"); ?></option>
         </select>
         
         </td>
         
     </tr>
     </table>
-    <button class="btn-left" onclick="codiad.fileext_textmode.open();" >Extensions</button><button class="btn-right" onclick="codiad.modal.unload(); return false;"><?php i18n("Close"); ?></button>
+    <button class="btn-left" onclick="codiad.fileext_textmode.open();" ><?php i18n("Extensions"); ?></button>
+    <button class="btn-right" onclick="codiad.modal.unload(); return false;"><?php i18n("Close"); ?></button>
     
     <?php
     
diff --git a/components/fileext_textmode/dialog.php b/components/fileext_textmode/dialog.php
index 43d4714..aa320bc 100644
--- a/components/fileext_textmode/dialog.php
+++ b/components/fileext_textmode/dialog.php
@@ -41,12 +41,12 @@ switch($_GET['action']){
 			die(json_encode(array('status' => 'error', 'msg' => 'Internal PHP error.') ));
 		}
 		?>
-        <label>Edit file extensions</label>
+        <label><?php i18n("Edit file extensions"); ?></label>
         <table id="FileExtModeHeader">
             <thead>
 				<tr>
-					<th width="184">Extension</th>
-					<th>Mode</th>
+					<th width="184"><?php i18n("Extension"); ?></th>
+					<th><?php i18n("Mode"); ?></th>
                 </tr>
 			</thead>
         </table>
@@ -72,8 +72,10 @@ switch($_GET['action']){
 			</table>
 		</div>
 		<br>
-		<button class="btn-left" onClick="codiad.fileext_textmode.addFieldToForm()">New Extension</button><button class="btn-mid" onClick="codiad.fileext_textmode.sendForm();">Save Scheme</button><button class="btn-right" onClick="codiad.modal.load(400, 'components/editor/dialog.php?action=settings');"><?php echo Common::get_i18n('Close')?></button>
+		<button class="btn-left" onClick="codiad.fileext_textmode.addFieldToForm()"><?php i18n("New Extension"); ?></button>
+		<button class="btn-mid" onClick="codiad.fileext_textmode.sendForm();"><?php i18n("Save Scheme"); ?></button>
+		<button class="btn-right" onClick="codiad.modal.load(400, 'components/editor/dialog.php?action=settings');"><?php echo Common::get_i18n('Close')?></button>
 <?php
 		break;
 }
-?>
\ No newline at end of file
+?>
diff --git a/components/filemanager/dialog.php b/components/filemanager/dialog.php
index 0825119..90286f2 100755
--- a/components/filemanager/dialog.php
+++ b/components/filemanager/dialog.php
@@ -28,9 +28,10 @@ switch($_GET['action']){
     ?>
     <input type="hidden" name="path" value="<?php echo($_GET['path']); ?>">   
     <input type="hidden" name="type" value="<?php echo($_GET['type']); ?>">
-    <label><span class="icon-pencil"></span><?php echo(ucfirst($_GET['type'])); ?> Name</label>    
+    <label><span class="icon-pencil"></span><?php echo i18n((ucfirst($_GET['type']))); ?></label>    
     <input type="text" name="object_name" autofocus="autofocus" autocomplete="off">  
-    <button class="btn-left">Create</button><button class="btn-right" onclick="codiad.modal.unload(); return false;">Cancel</button>
+    <button class="btn-left"><?php i18n("Create"); ?></button>
+    <button class="btn-right" onclick="codiad.modal.unload(); return false;"><?php i18n("Cancel"); ?></button>
     <?php
     break;
     
@@ -41,9 +42,10 @@ switch($_GET['action']){
     ?>
     <input type="hidden" name="path" value="<?php echo($_GET['path']); ?>">
     <input type="hidden" name="type" value="<?php echo($_GET['type']); ?>"> 
-    <label><span class="icon-pencil"></span>Rename <?php echo(ucfirst($_GET['type'])); ?></label>    
+    <label><span class="icon-pencil"></span> <?php i18n("Rename"); ?> <?php echo i18n((ucfirst($_GET['type']))); ?></label>    
     <input type="text" name="object_name" autofocus="autofocus" autocomplete="off" value="<?php echo($_GET['short_name']); ?>">  
-    <button class="btn-left">Rename</button><button class="btn-right" onclick="codiad.modal.unload(); return false;">Cancel</button>
+    <button class="btn-left"><?php i18n("Rename"); ?></button>
+	<button class="btn-right" onclick="codiad.modal.unload(); return false;"><?php i18n("Cancel"); ?></button>
     <?php
     break;
     
@@ -53,9 +55,10 @@ switch($_GET['action']){
     case 'delete':
     ?>
     <input type="hidden" name="path" value="<?php echo($_GET['path']); ?>"> 
-    <label>Are you sure you wish to delete the following:</label>
+    <label><?php i18n("Are you sure you wish to delete the following:"); ?></label>
     <pre><?php if(!FileManager::isAbsPath($_GET['path'])) { echo '/'; }; echo($_GET['path']); ?></pre>
-    <button class="btn-left">Delete</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Cancel</button>
+    <button class="btn-left"><?php i18n("Delete"); ?></button>
+	<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Cancel"); ?></button>
     <?php
     break;
     
@@ -64,9 +67,9 @@ switch($_GET['action']){
     //////////////////////////////////////////////////////////////////
     case 'preview':
     ?> 
-    <label>Inline Preview</label>
+    <label><?php i18n("Inline Preview"); ?></label>
     <div><br><br><img src="<?php echo($_GET['path']); ?>"><br><br></div>
-    <button class="btn-right" onclick="codiad.modal.unload();return false;">Close</button>
+    <button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
     <?php
     break;
     
@@ -76,13 +79,14 @@ switch($_GET['action']){
     case 'overwrite':
     ?>
     <input type="hidden" name="path" value="<?php echo($_GET['path']); ?>">    
-    <label>Would you like to overwrite or duplicate the following:</label>
+    <label><?php i18n("Would you like to overwrite or duplicate the following:"); ?></label>
     <pre><?php if(!FileManager::isAbsPath($_GET['path'])) { echo '/'; }; echo($_GET['path']); ?></pre>
     <select name="or_action">
-        <option value="0">Overwrite Original</option>
-        <option value="1">Create Duplicate</option>
+        <option value="0"><?php i18n("Overwrite Original"); ?></option>
+        <option value="1"><?php i18n("Create Duplicate"); ?></option>
     </select>
-    <button class="btn-left">Continue</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Cancel</button>
+    <button class="btn-left"><?php i18n("Continue"); ?></button>
+	<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Cancel"); ?></button>
     <?php
     break;
     
@@ -95,16 +99,16 @@ switch($_GET['action']){
     <table class="file-search-table">
         <tr>
             <td width="65%">
-               <label>Search Files:</label>
+               <label><?php i18n("Search Files:"); ?></label>
                <input type="text" name="search_string" autofocus="autofocus">
             </td>
             <td width="5%">&nbsp;&nbsp;</td>
             <td>
-                <label>In:</label>
+                <label><?php i18n("In:"); ?></label>
                 <select name="search_type">
-                    <option value="0">Current Project</option>
+                    <option value="0"><?php i18n("Current Project"); ?></option>
                     <?php if(checkAccess()) { ?>
-                    <option value="1">Workspace Projects</option>
+                    <option value="1"><?php i18n("Workspace Projects"); ?></option>
                     <?php } ?>
                 </select>
             </td>
@@ -112,11 +116,12 @@ switch($_GET['action']){
     </table>
     <pre id="filemanager-search-results"></pre>
     <div id="filemanager-search-processing"></div>
-    <button class="btn-left">Search</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Cancel</button>
+    <button class="btn-left"><?php i18n("Search"); ?></button>
+	<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Cancel"); ?></button>
     <?php
     break;
     
 }
 
 ?>
-</form>
\ No newline at end of file
+</form>
diff --git a/components/filemanager/dialog_upload.php b/components/filemanager/dialog_upload.php
index ac7986b..bad57f3 100755
--- a/components/filemanager/dialog_upload.php
+++ b/components/filemanager/dialog_upload.php
@@ -16,24 +16,24 @@ require_once('class.filemanager.php');
 checkSession();
 
 ?>
-<label>Upload Files</label>
+<label><?php i18n("Upload Files"); ?></label>
 
 <div id="upload-drop-zone">
     
     <span id="upload-wrapper">
     
         <input id="fileupload" type="file" name="upload[]" data-url="components/filemanager/controller.php?action=upload&path=<?php echo($_GET['path']); ?>" multiple>
-        <span id="upload-clicker">Drag Files or Click Here to Upload</span>
+        <span id="upload-clicker"><?php i18n("Drag Files or Click Here to Upload"); ?></span>
     
     </span>
 
     <div id="upload-progress"><div class="bar"></div></div>
     
-    <div id="upload-complete">Complete!</div>
+    <div id="upload-complete"><?php i18n("Complete!"); ?></div>
 
 </div>
 
-<button onclick="codiad.modal.unload();">Close Uploader</button>
+<button onclick="codiad.modal.unload();"><?php i18n("Close Uploader"); ?></button>
 
 <script>
 
@@ -61,4 +61,4 @@ $(function () {
     });
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/components/plugin_manager/dialog.php b/components/plugin_manager/dialog.php
index 11c7f2c..8b5f561 100644
--- a/components/plugin_manager/dialog.php
+++ b/components/plugin_manager/dialog.php
@@ -23,14 +23,14 @@
         
         case 'list':
             ?>
-            <label>Plugin List</label>
+            <label><?php i18n("Plugin List"); ?></label>
             <div id="plugin-list">
             <table width="100%">
                 <tr>
-                    <th>Plugin Name</th>
-                    <th>Version</th>
-                    <th>Author</th>
-                    <th width="5">Active</th>
+                    <th><?php i18n("Plugin Name"); ?></th>
+                    <th><?php i18n("Version"); ?></th>
+                    <th><?php i18n("Author"); ?></th>
+                    <th width="5"><?php i18n("Active"); ?></th>
                 </tr>
             <?php
             
@@ -87,7 +87,9 @@
             ?>
             </table>
             </div>
-            <button class="btn-left" onclick="window.location.reload();return false;">Reload Codiad</button><button class="btn-mid" onclick="codiad.plugin_manager.update();return false;">Update Check</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Close</button>
+            <button class="btn-left" onclick="window.location.reload();return false;"><?php i18n("Reload Codiad"); ?></button>
+    		<button class="btn-mid" onclick="codiad.plugin_manager.update();return false;"><?php i18n("Update Check"); ?></button>
+			<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
             
             break;
@@ -98,14 +100,14 @@
         
         case 'update':
             ?>
-            <label>Plugin Update Check</label>
+            <label><?php i18n("Plugin Update Check"); ?></label>
             <div id="plugin-list">
             <table width="100%">
                 <tr>
-                    <th>Plugin Name</th>
-                    <th>Your Version</th>
-                    <th>Latest Version</th>
-                    <th>Open</th>
+                    <th><?php i18n("Plugin Name"); ?></th>
+                    <th><?php i18n("Your Version"); ?></th>
+                    <th><?php i18n("Latest Version"); ?></th>
+                    <th><?php i18n("Open"); ?></th>
                 </tr>
             <?php
             
@@ -163,7 +165,7 @@
             ?>
             </table>
             </div>
-            <button class="btn" onclick="codiad.modal.unload();return false;">Close</button>
+            <button class="btn" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
             
             break;
diff --git a/components/project/dialog.php b/components/project/dialog.php
index ba4bc36..4104aa3 100755
--- a/components/project/dialog.php
+++ b/components/project/dialog.php
@@ -68,14 +68,14 @@
             }
             
             ?>
-            <label>Project List</label>
+            <label><?php i18n("Project List"); ?></label>
             <div id="project-list">
             <table width="100%">
                 <tr>
-                    <th width="5">Open</th>
-                    <th>Project Name</th>
-                    <th>Path</th>
-                    <?php if(checkAccess()){ ?><th width="5">Delete</th><?php } ?>
+                    <th width="5"><?php i18n("Open"); ?></th>
+                    <th><?php i18n("Project Name"); ?></th>
+                    <th><?php i18n("Path"); ?></th>
+                    <?php if(checkAccess()){ ?><th width="5"><?php i18n("Delete"); ?></th><?php } ?>
                 </tr>
             <?php
             
@@ -111,7 +111,8 @@
             ?>
             </table>
             </div>
-            <?php if(checkAccess()){ ?><button class="btn-left" onclick="codiad.project.create();">New Project</button><?php } ?><button class="<?php if(checkAccess()){ echo('btn-right'); } ?>" onclick="codiad.modal.unload();return false;">Close</button>
+            <?php if(checkAccess()){ ?><button class="btn-left" onclick="codiad.project.create();"><?php i18n("New Project"); ?></button><?php } ?>
+    		<button class="<?php if(checkAccess()){ echo('btn-right'); } ?>" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
             
             break;
@@ -124,10 +125,10 @@
         
             ?>
             <form>
-            <label>Project Name</label>
+            <label><?php i18n("Project Name"); ?></label>
             <input name="project_name" autofocus="autofocus" autocomplete="off">
             <?php if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { ?>
-            <label>Folder Name or Absolute Path</label>
+            <label><?php i18n("Folder Name or Absolute Path"); ?></label>
             <input name="project_path" autofocus="off" autocomplete="off">
             <?php } else { ?>
             <input type="hidden" name="project_path">
@@ -138,17 +139,17 @@
             <table class="hide" id="git-clone">
                 <tr>
                     <td>
-                        <label>Git Repository</label>
+                        <label><?php i18n("Git Repository"); ?></label>
                         <input name="git_repo">
                     </td>
                     <td width="5%">&nbsp;</td>
                     <td width="25%">
-                        <label>Branch</label>
+                        <label><?php i18n("Branch"); ?></label>
                         <input name="git_branch" value="master">
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="3" class="note">Note: This will only work if your Git repo DOES NOT require interactive authentication and your server has git installed.</td>
+                    <td colspan="3" class="note"><?php i18n("Note: This will only work if your Git repo DOES NOT require interactive authentication and your server has git installed."); ?></td>
                 </tr>
             </table>
             </div>
@@ -158,7 +159,9 @@
                     $action = 'codiad.modal.unload();';
                 } 
             ?>           
-            <button class="btn-left">Create Project</button><button onclick="$('#git-clone').slideDown(300); $(this).hide(); return false;" class="btn-mid">...From Git Repo</button><button class="btn-right" onclick="<?php echo $action;?>return false;">Cancel</button>
+            <button class="btn-left"><?php i18n("Create Project"); ?></button>
+			<button onclick="$('#git-clone').slideDown(300); $(this).hide(); return false;" class="btn-mid"><?php i18n("...From Git Repo"); ?></button>
+			<button class="btn-right" onclick="<?php echo $action;?>return false;"><?php i18n("Cancel"); ?></button>
             <form>
             <?php
             break;
@@ -170,9 +173,9 @@
         ?>
         <form>
         <input type="hidden" name="project_path" value="<?php echo($_GET['path']); ?>">
-        <label><span class="icon-pencil"></span>Rename Project</label>    
+        <label><span class="icon-pencil"></span><?php i18n("Rename Project"); ?></label>    
         <input type="text" name="project_name" autofocus="autofocus" autocomplete="off" value="<?php echo($_GET['project_name']); ?>">  
-        <button class="btn-left">Rename</button>&nbsp;<button class="btn-right" onclick="codiad.modal.unload(); return false;">Cancel</button>
+        <button class="btn-left"><?php i18n("Rename"); ?></button>&nbsp;<button class="btn-right" onclick="codiad.modal.unload(); return false;"><?php i18n("Cancel"); ?></button>
         <form>
         <?php
         break;       
@@ -186,13 +189,13 @@
         ?>
             <form>
             <input type="hidden" name="project_path" value="<?php echo($_GET['path']); ?>">
-            <label>Confirm Project Deletion</label>
-            <pre>Name: <?php echo($_GET['name']); ?>, Path: <?php echo($_GET['path']); ?></pre>
+            <label><?php i18n("Confirm Project Deletion"); ?></label>
+            <pre><?php i18n("Name:"); ?> <?php echo($_GET['name']); ?>, Path: <?php echo($_GET['path']); ?></pre>
             <table>
-            <tr><td width="5"><input type="checkbox" name="delete" id="delete" value="true"></td><td>Delete Project Files</td></tr>
-            <tr><td width="5"><input type="checkbox" name="follow" id="follow" value="true"></td><td>Follow Symbolic Links </td></tr>
+            <tr><td width="5"><input type="checkbox" name="delete" id="delete" value="true"></td><td><?php i18n("Delete Project Files"); ?></td></tr>
+            <tr><td width="5"><input type="checkbox" name="follow" id="follow" value="true"></td><td><?php i18n("Follow Symbolic Links "); ?></td></tr>
             </table>
-            <button class="btn-left">Confirm</button><button class="btn-right" onclick="codiad.project.list();return false;">Cancel</button>
+            <button class="btn-left"><?php i18n("Confirm"); ?></button><button class="btn-right" onclick="codiad.project.list();return false;"><?php i18n("Cancel"); ?></button>
             <?php
             break;
         
diff --git a/components/update/dialog.php b/components/update/dialog.php
index 75d7c95..bb42792 100644
--- a/components/update/dialog.php
+++ b/components/update/dialog.php
@@ -24,9 +24,9 @@
         
             if(!checkAccess()){ 
             ?>
-            <label>Restricted</label>
-            <pre>You can not check for updates</pre>
-            <button onclick="codiad.modal.unload();return false;">Close</button>
+            <label><?php i18n("Restricted"); ?></label>
+            <pre><?php i18n("You can not check for updates"); ?></pre>
+            <button onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php } else {
                 require_once('class.update.php');
                 $update = new Update();
@@ -35,24 +35,24 @@
             <form>
             <input type="hidden" name="archive" value="<?php echo $vars[0]['data']['archive']; ?>">
             <input type="hidden" name="remoteversion" value="<?php echo $vars[0]['data']['remoteversion']; ?>">
-            <label>Update Check</label>
+            <label><?php i18n("Update Check"); ?></label>
             <br><table>
-                <tr><td>Your Version</td><td><?php echo $vars[0]['data']['currentversion']; ?></td></tr>
-                <tr><td>Latest Version</td><td><?php echo $vars[0]['data']['remoteversion']; ?></td></tr>
+                <tr><td><?php i18n("Your Version"); ?></td><td><?php echo $vars[0]['data']['currentversion']; ?></td></tr>
+                <tr><td><?php i18n("Latest Version"); ?></td><td><?php echo $vars[0]['data']['remoteversion']; ?></td></tr>
             </table>
             <?php if($vars[0]['data']['currentversion'] != $vars[0]['data']['remoteversion']) { ?>
-            <br><label>Changes on Codiad</label>
+            <br><label><?php i18n("Changes on Codiad"); ?></label>
             <pre style="overflow: auto; max-height: 200px; max-width: 450px;"><?php echo $vars[0]['data']['message']; ?></pre>
             <?php } else { ?>
-            <br><br><b><label>Congratulation, your system is up to date.</label></b>
+            <br><br><b><label><?php i18n("Congratulation, your system is up to date."); ?></label></b>
             <?php if($vars[0]['data']['name'] != '') { ?>
-            <em>Last update was done by <?php echo $vars[0]['data']['name']; ?>.</em>
+            <em><?php i18n("Last update was done by "); ?><?php echo $vars[0]['data']['name']; ?>.</em>
             <?php } } ?>
             <br><?php
                 if($vars[0]['data']['currentversion'] != $vars[0]['data']['remoteversion']) {
                     echo '<button class="btn-left" onclick="codiad.update.download();return false;">Download Codiad</button>&nbsp;';
                 }
-            ?><button class="btn-right" onclick="codiad.modal.unload();return false;">Cancel</button>
+            ?><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Cancel"); ?></button>
             <form>
             <?php }
             break;
diff --git a/components/user/dialog.php b/components/user/dialog.php
index fd054d5..99c09b3 100755
--- a/components/user/dialog.php
+++ b/components/user/dialog.php
@@ -25,18 +25,18 @@
             $projects_assigned = false;
             if(!checkAccess()){ 
             ?>
-            <label>Restricted</label>
-            <pre>You can not edit the user list</pre>
-            <button onclick="codiad.modal.unload();return false;">Close</button>
+            <label><?php i18n("Restricted"); ?></label>
+            <pre><?php i18n("You can not edit the user list"); ?></pre>
+            <button onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php } else { ?>
-            <label>User List</label>
+            <label><?php i18n("User List"); ?></label>
             <div id="user-list">
             <table width="100%">
                 <tr>
-                    <th>Login</th>
-                    <th width="5">Password</th>
-                    <th width="5">Projects</th>
-                    <th width="5">Delete</th>
+                    <th><?php i18n("Login"); ?></th>
+                    <th width="5"><?php i18n("Password"); ?></th>
+                    <th width="5"><?php i18n("Projects"); ?></th>
+                    <th width="5"><?php i18n("Delete"); ?></th>
                 </tr>
             <?php
         
@@ -65,7 +65,8 @@
             ?>
             </table>
             </div>
-            <button class="btn-left" onclick="codiad.user.createNew();">New Account</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Close</button>
+            <button class="btn-left" onclick="codiad.user.createNew();"><?php i18n("New Account"); ?></button>
+    		<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
             }
             
@@ -79,13 +80,14 @@
         
             ?>
             <form>
-            <label>Username</label>
+            <label><?php i18n("Username"); ?></label>
             <input type="text" name="username" autofocus="autofocus" autocomplete="off">
-            <label>Password</label>
+            <label><?php i18n("Password"); ?></label>
             <input type="password" name="password1">
-            <label>Confirm Password</label>
+            <label><?php i18n("Confirm Password"); ?></label>
             <input type="password" name="password2">
-            <button class="btn-left">Create Account</button><button class="btn-right" onclick="codiad.user.list();return false;">Cancel</button>
+            <button class="btn-left"><?php i18n("Create Account"); ?></button>
+			<button class="btn-right" onclick="codiad.user.list();return false;"><?php i18n("Cancel"); ?></button>
             <form>
             <?php
             break;
@@ -107,10 +109,10 @@
         ?>
             <form>
             <input type="hidden" name="username" value="<?php echo($_GET['username']); ?>">
-            <label>Project Access for <?php echo(ucfirst($_GET['username'])); ?></label>
+            <label><?php i18n("Project Access for "); ?><?php echo(ucfirst($_GET['username'])); ?></label>
             <select name="access_level" onchange="if($(this).val()=='0'){ $('#project-selector').slideUp(300); }else{ $('#project-selector').slideDown(300).css({'overflow-y':'scroll'}); }">
-                <option value="0" <?php if(!$projects_assigned){ echo('selected="selected"'); } ?>>Access ALL Projects</option>
-                <option value="1" <?php if($projects_assigned){ echo('selected="selected"'); } ?>>Only Selected Projects</option>
+                <option value="0" <?php if(!$projects_assigned){ echo('selected="selected"'); } ?>><?php i18n("Access ALL Projects"); ?></option>
+                <option value="1" <?php if($projects_assigned){ echo('selected="selected"'); } ?>><?php i18n("Only Selected Projects"); ?></option>
             </select>
             <div id="project-selector" <?php if(!$projects_assigned){ echo('style="display: none;"'); }  ?>>
                 <table>
@@ -124,7 +126,8 @@
                 ?>
                 </table>
             </div>
-            <button class="btn-left">Confirm</button><button class="btn-right" onclick="codiad.user.list();return false;">Close</button>
+            <button class="btn-left"><?php i18n("Confirm"); ?></button>
+			<button class="btn-right" onclick="codiad.user.list();return false;"><?php i18n("Close"); ?></button>
             <?php
             break;
         
@@ -137,9 +140,10 @@
         ?>
             <form>
             <input type="hidden" name="username" value="<?php echo($_GET['username']); ?>">
-            <label>Confirm User Deletion</label>
-            <pre>Account: <?php echo($_GET['username']); ?></pre>
-            <button class="btn-left">Confirm</button><button class="btn-right" onclick="codiad.user.list();return false;">Cancel</button>
+            <label><?php i18n("Confirm User Deletion"); ?></label>
+            <pre><?php i18n("Account:"); ?> <?php echo($_GET['username']); ?></pre>
+            <button class="btn-left"><?php i18n("Confirm"); ?></button>
+			<button class="btn-right" onclick="codiad.user.list();return false;"><?php i18n("Cancel"); ?></button>
             <?php
             break;
             
@@ -158,11 +162,12 @@
         ?>
             <form>
             <input type="hidden" name="username" value="<?php echo($username); ?>">
-            <label>New Password</label>
+            <label><?php i18n("New Password"); ?></label>
             <input type="password" name="password1" autofocus="autofocus">
-            <label>Confirm Password</label>
+            <label><?php i18n("Confirm Password"); ?></label>
             <input type="password" name="password2">
-            <button class="btn-left">Change <?php echo(ucfirst($username)); ?>&apos;s Password</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Cancel</button>
+            <button class="btn-left"><?php i18n("Change"); ?> <?php echo(ucfirst($username)); ?><?php i18n("&apos;s Password"); ?></button>
+			<button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Cancel"); ?></button>
             <?php
             break;
         
diff --git a/languages/fr.php b/languages/fr.php
index 23c6347..bbc23db 100644
--- a/languages/fr.php
+++ b/languages/fr.php
@@ -1,6 +1,95 @@
 <?php
+
 $lang = array(
-   "Save"                                                => "Sauvegarder",
+   "Note: This will only work if your Git repo DOES NOT require interactive authentication and your server has git installed." => "Nota: Cela ne marchera seulement si votre dépôt Git NE REQUIERT PAS d'authentification interactive et que votre serveur a git d'installé.",
+   "Would you like to overwrite or duplicate the following:" => "Voulez-vous écraser ou dupliquer : ",
+   "Prefix"                                              => "Préfixe",
+   "Substring"                                           => "Chaîne",
+   "Collapse"                                            => "Rassembler",
+   "Regular Expression"                                  => "Expression régulière",
+   "Search File Contents"                                => "Rechercher dans le contenu des fichiers",
+   "Inline Preview"                                      => "Aperçu",
+   "Upload Files"                                        => "Envoyer des fichiers",
+   "Search Files:"                                       => "Rechercher des fichiers",
+   "In:"                                                 => "Dans :",
+   "Username"                                            => "Nom d'utilisateur",
+   "Create Account"                                      => "Créer le compte",
+   "Workspace Projects"                                  => "Les projets de l'espace de travail",
+   "Search"                                              => "Rechercher",
+   "Workspace Projects"                                  => "Les projets de l'espace de travail",
+   "Name:"                                               => "Nom : ",
+   "Confirm Project Deletion"                            => "Confirmer la suppression de projet",
+   "Last update was done by "                            => "La dernière mise à jour a été faite par ",
+   "Project Access For "                                 => "Accès au(x) projet(s) pour ",
+   "Account:"                                            => "Compte : ",
+   "Drag Files Or Click Here To Upload"                  => "Glissez-déposez des fichiers ou cliquez ici pour Envoyer",
+   "Complete!"                                           => "Téléchargement fini !",
+   "File"                                                => "le fichier",
+   "Directory"                                           => "le dossier",
+   "Close Uploader"                                      => "Fermer la fenêtre d'envoi",
+   "Plugin List"                                         => "Liste des Plugins",
+   "Plugin Name"                                         => "Nom du Plugin",
+   "Version"                                             => "Version",
+   "Author"                                              => "Auteur",
+   "Active"                                              => "Activé",
+   "Reload Codiad"                                       => "Recharger Codiad",
+   "Plugin Update Check"                                 => "Vérifications màj Plugins",
+   "Your Version"                                        => "Votre version",
+   "Latest Version"                                      => "Dernière version",
+   "Open"                                                => "Ouvrir",
+   "Project Name"                                        => "Nom du projet",
+   "Path"                                                => "Répertoire",
+   "New Project"                                         => "Nouveau projet",
+   "Folder Name or Absolute Path"                        => "Nom du dossier ou répertoire absolu",
+   "Git Repository"                                      => "Dépôt Git",
+   "Branch"                                              => "Branche",
+   "...from Git Repo"                                    => "... Depuis un dépôt Git",
+   "Create Project"                                      => "Créer un projet",
+   "Delete Project Files"                                => "Supprimer les fichiers du projet",
+   "Follow Symbolic Links "                              => "Suivre les liens symboliques",
+   "You can not check for updates"                       => "Vous ne pouvez pas vérifier les màj",
+   "Congratulation, Your System Is Up To Date."          => "Félicitations, votre système est à jour.",
+   "Download Codiad"                                     => "Télécharger Codiad",
+   "Changes On Codiad"                                   => "Changements sur Codiad",
+   "User List"                                           => "Liste des utilisateurs",
+   "New Account"                                         => "Nouvel utilisateur",
+   "Access All Projects"                                 => "Accéder à tous les projets",
+   "Only Selected Projects"                              => "Accéder seulement aux projets sélectionnés",
+   "Confirm"                                             => "Confirmer",
+   "Confirm User Deletion"                               => "Confirmer la suppression de l'utilisateur",
+   "Account: "                                           => "Compte : ",
+   "New Password"                                        => "Nouveau mot de passe",
+   "Confirm Password"                                    => "Confirmer le mot de passe",
+   "Change"                                              => "Changer le mot de passe de : ",
+   "&apos;s Password"                                    => "",
+   "Overwrite Original"                                  => "Ecraser l'original",
+   "Create Duplicate"                                    => "Faire une copie",
+   "Create"                                              => "Créer",
+   "Continue"                                            => "Continuer",
+   "Current Project"                                     => "Projet courant",
+   "Search Files"                                        => "Rechercher des fichiers",
+   "Are You Sure You Wish To Delete The Following:"      => "Etes vous sûr(e) de vouloir effacer : ",
+   "Name"                                                => "",
+   "Edit File Extensions"                                => "Editer les extensions de fichiers",
+   "Extension"                                           => "Extension",
+   "New Extension"                                       => "Nouvelle Extension",
+   "Save Scheme"                                         => "Enregistrer l'extension",
+   "Mode"                                                => "Mode",
+   "New File"                                            => "Nouveau Fichier",
+   "New Folder"                                          => "Nouveau Dossier",
+   "Upload Files"                                        => "Envoyer des fichiers",
+   "Paste"                                               => "Coller",
+   "Rename"                                              => "Renommer",
+   "Rename Project"                                      => "Renommer le projet",
+   "Delete"                                              => "Effacer",
+   "Download"                                            => "Télécharger",
+   "Rescan"                                              => "Mettre à jour le dossier",
+   "No Results Returned"                                 => "Aucun résultat retourné",
+   "Directory not found."                                => "Le dossier n'a pu être trouvé",
+   "Wrong data send"                                     => "Les données envoyées sont mauvaises",
+   "Could not pack the folder, zip-extension missing"    => "N'a pas pu empaqueter le dossier, l'extension zip est manquante",
+   "Project List"                                        => "Liste des projets",
+   "Save"                                                => "Enregistrer",
    "Save All"                                            => "Tout Enregistrer",
    "Tab Size"                                            => "Largeur des tabulation",
    "Soft Tabs"                                           => "Tabulations souples",
@@ -23,25 +112,28 @@ $lang = array(
    "Print Margin"                                        => "Marge d'impression",
    "Show"                                                => "Afficher", 
    "Hide"                                                => "Cacher",
-   "No wrap"                                             => "Retour à la ligne manuel",  
+   "No Wrap"                                             => "Retour à la ligne manuel",  
    "Wrap Lines"                                          => "Retour à la ligne automatique",
    "Right Sidebar Trigger"                               => "Right Sidebar Trigger",
    "Hover"                                               => "Hover",
    "Click"                                               => "Click",
    "Close"                                               => "Fermer",
+   "On"                                                  => "Activé",
+   "Off"                                                 => "Désactivé",
    "Yes"                                                 => "Oui",
    "No"                                                  => "Non",
    "Split Horizontally"                                  => "Fractionner horizontalement",
    "Split Vertically"                                    => "Fractionner verticalement",
-   "Merge all"                                           => "Fusionner tout",
+   "Merge All"                                           => "Fusionner tout",
    "Explore"                                             => "Explorer",
+   "File extensions are saved successfully."             => "Les extensions de fichier ont bien été enregistrées",
    "You Must Choose A Value"                             => "Vous devez choisir une valeur",
-   "Warning: File Currently Opened By: "                 => "Attention: Le fichier est actuellement ouvert par: ",
-   "Close Unsaved File?"                                 => "Fermer le fichier non sauvegardé?",
+   "Warning: File Currently Opened By: "                 => "Attention: Le fichier est actuellement ouvert par : ",
+   "Close Unsaved File?"                                 => "Fermer le fichier non sauvegardé ?",
    "Save&Close"                                          => "Sauvegarder et fermer",
    "Discard Changes"                                     => "Annuler les modifications",
    "Cancel"                                              => "Annuler",
-   "Recovered unsaved content for: "                     => "Un contenu non sauvegardé a été récupéré pour: ",
+   "Recovered unsaved content for: "                     => "Un contenu non sauvegardé a été récupéré pour : ",
    "You have unsaved files."                             => "Vous avez des fichiers non sauvegardés.",
    "No Open Files to save"                               => "Pas de fichiers ouverts à sauvegarder.",
    "No Open Files or Selected Text"                      => "Pas de fichiers ouverts ni de texte sélectionné",