Merge branch 'master' into jeremypw/rework-word-completion/prep-add-remove-node

Author: danirabbit

data/io.elementary.code.gschema.xml

@@ -152,6 +152,11 @@
       <summary>Remember the last focused document.</summary>
       <description>Restore the focused document from a previous session when opening Code.</description>
     </key>
+    <key name="active-project-path" type="s">
+      <default>''</default>
+      <summary>The active project path.</summary>
+      <description>The path to the folder containing the active project.</description>
+    </key>
     <key name="default-build-directory" type="s">
       <default>''</default>
       <summary>The default build directory's relative path.</summary>

po/POTFILES

@@ -5,6 +5,8 @@ src/Dialogs/GlobalSearchDialog.vala
 src/Dialogs/NewBranchDialog.vala
 src/Dialogs/PreferencesDialog.vala
 src/Dialogs/RestoreConfirmationDialog.vala
+src/Dialogs/CloseProjectsConfirmationDialog.vala
+src/Dialogs/OverwriteUncommittedConfirmationDialog.vala
 src/FolderManager/File.vala
 src/FolderManager/FileItem.vala
 src/FolderManager/FileView.vala