Changed the UPDATE command to work with both cmake and meson

Fixed string at elementBashCompletion: it was being translated, but it shouldn't because it is for an installation script

CMakeLists.txt

@@ -72,7 +72,6 @@ endif()
 add_subdirectory(doc)
 add_subdirectory(data/debian)
 add_subdirectory(po)
-add_subdirectory(data/local)
 add_subdirectory(wiki)
 add_subdirectory(data)
 add_subdirectory(data/cmake)

po/autovala.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-13 23:08+0100\n"
+"POT-Creation-Date: 2017-01-15 00:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,38 +20,39 @@ msgstr ""
 #: src/autovala.vala:27
 msgid ""
 "Autovala. Usage:\n"
-"\tautovala help: shows this help\n"
-"\tautovala version: shows the current version\n"
+"\tautovala help: shows this help.\n"
+"\tautovala version: shows the current version.\n"
 "\tautovala init project_name: initializates a new Vala CMake project and "
-"creates an initial project file\n"
+"creates an initial project file.\n"
 "\tautovala ginit project_name: initializates a new Genie CMake project and "
-"creates an initial project file\n"
+"creates an initial project file.\n"
 "\tautovala refresh: tries to guess the type for each file in the folders and "
-"adds them to the project file\n"
-"\tautovala cmake: creates the CMake files from the project file\n"
-"\tautovala meson: creates the meson.build files from the project file\n"
-"\tautovala update: the same than 'refresh'+'cmake'\n"
-"\tautovala po: updates translatable strings\n"
+"adds them to the project file.\n"
+"\tautovala cmake: creates the CMake files from the project file.\n"
+"\tautovala meson: creates the meson.build files from the project file.\n"
+"\tautovala update: the same than 'refresh' + 'cmake' + 'meson'.\n"
+"\tautovala po: updates translatable strings.\n"
 "\tautovala clear: removes the automatic parts in the project file, leaving "
 "only the manual ones.\n"
 "\tautovala project_files: lists all the files belonging to the project (with "
 "paths relative to the project's root).\n"
+"\tautovala git: adds to git all the project files.\n"
 "\tautovala deb: creates the 'debian' folder for packaging the project as a ."
-"deb package\n"
+"deb package.\n"
 "\tautovala rpm: creates the 'rpmbuild' folder for packaging the project as "
-"a .rpm package\n"
-"\tautovala pacman: creates a package for PACMAN package manager\n"
-"\tautovala valama: exports the project to a VALAMA project file\n"
+"a .rpm package.\n"
+"\tautovala pacman: creates a package for PACMAN package manager.\n"
+"\tautovala valama: exports the project to a VALAMA project file.\n"
 "\tautovala external owner_id: shows the external data of the specified "
-"owner\n"
+"owner.\n"
 "\n"
 msgstr ""
 
-#: src/autovala.vala:82 src/autovala.vala:96 src/autovala.vala:110
-#: src/autovala.vala:124 src/autovala.vala:141 src/autovala.vala:148
-#: src/autovala.vala:164 src/autovala.vala:178 src/autovala.vala:192
-#: src/autovala.vala:206 src/autovala.vala:220 src/autovala.vala:234
-#: src/autovala.vala:248 src/autovala.vala:265
+#: src/autovala.vala:83 src/autovala.vala:97 src/autovala.vala:111
+#: src/autovala.vala:125 src/autovala.vala:141 src/autovala.vala:181
+#: src/autovala.vala:191 src/autovala.vala:206 src/autovala.vala:220
+#: src/autovala.vala:234 src/autovala.vala:248 src/autovala.vala:262
+#: src/autovala.vala:276 src/autovala.vala:290 src/autovala.vala:307
 #: src/autovalaPlugin/projectview.vala:579
 #: src/autovalaPlugin/projectview.vala:588
 #: src/autovalaPlugin/projectview.vala:701
@@ -60,141 +61,150 @@ msgstr ""
 msgid "Aborting\n"
 msgstr ""
 
-#: src/autovala.vala:85 src/autovala.vala:99 src/autovala.vala:113
-#: src/autovala.vala:152 src/autovala.vala:167 src/autovala.vala:181
-#: src/autovala.vala:195 src/autovala.vala:209 src/autovala.vala:223
-#: src/autovala.vala:237 src/autovala.vala:254 src/autovala.vala:269
-#: src/autovalaPlugin/projectview.vala:581
+#: src/autovala.vala:86 src/autovala.vala:100 src/autovala.vala:114
+#: src/autovala.vala:169 src/autovala.vala:194 src/autovala.vala:209
+#: src/autovala.vala:223 src/autovala.vala:237 src/autovala.vala:251
+#: src/autovala.vala:265 src/autovala.vala:279 src/autovala.vala:296
+#: src/autovala.vala:311 src/autovalaPlugin/projectview.vala:581
 #: src/autovalaPlugin/projectview.vala:590
 #: src/autovalaPlugin/projectview.vala:801
 msgid "Done\n"
 msgstr ""
 
-#: src/autovala.vala:137 src/autovala.vala:160
+#: src/autovala.vala:157
+#, c-format
+msgid "Failed to launch GIT: %s"
+msgstr ""
+
+#: src/autovala.vala:177 src/autovala.vala:202
 msgid "Updating project file\n"
 msgstr ""
 
-#: src/autovala.vala:144 src/autovalaPlugin/projectview.vala:662
+#: src/autovala.vala:184 src/autovalaPlugin/projectview.vala:662
 msgid "Updating CMake files\n"
 msgstr ""
 
-#: src/autovala.vala:302
+#: src/autovala.vala:187
+msgid "Updating Meson files\n"
+msgstr ""
+
+#: src/autovala.vala:344
 #, c-format
 msgid "Failed to create the folder %s"
 msgstr ""
 
-#: src/autovala.vala:311
+#: src/autovala.vala:353
 #, c-format
 msgid "Failed to delete the old valama Config.vala file at %s"
 msgstr ""
 
-#: src/autovala.vala:325
+#: src/autovala.vala:367
 #, c-format
 msgid "Failed to write to valama Config.vala file at %s"
 msgstr ""
 
-#: src/autovala.vala:348
+#: src/autovala.vala:390
 #, c-format
 msgid "Failed to delete the old valama project file %s"
 msgstr ""
 
-#: src/autovala.vala:384
+#: src/autovala.vala:426
 #, c-format
 msgid "Failed to write to valama project file %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:55
+#: src/autovalaLib/autovalaLib.vala:59
 #, c-format
 msgid "Can't copy folder %s to %s; it doesn't exist."
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:65
+#: src/autovalaLib/autovalaLib.vala:69
 #, c-format
 msgid "Failed when creating folder %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:79
+#: src/autovalaLib/autovalaLib.vala:83
 #, c-format
 msgid "Failed when copying recursively the folder %s to %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:86
+#: src/autovalaLib/autovalaLib.vala:90
 #, c-format
 msgid "Failed when copying the file %s to %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:108 src/autovalaPlugin/projectview.vala:741
+#: src/autovalaLib/autovalaLib.vala:112 src/autovalaPlugin/projectview.vala:741
 #, c-format
 msgid "Failed when deleting recursively the folder %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:116 src/autovalaPlugin/projectview.vala:750
+#: src/autovalaLib/autovalaLib.vala:120 src/autovalaPlugin/projectview.vala:750
 #, c-format
 msgid "Failed when deleting the file %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:128
+#: src/autovalaLib/autovalaLib.vala:132
 #, c-format
 msgid "The folder '%s' already exists"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:133
+#: src/autovalaLib/autovalaLib.vala:137
 #, c-format
 msgid "Can't create the folder '%s'"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:156
+#: src/autovalaLib/autovalaLib.vala:160
 #, c-format
 msgid "Can't create the file '%s'"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:175
+#: src/autovalaLib/autovalaLib.vala:179
 #, c-format
 msgid "Copying CMAKE scripts from %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:188
+#: src/autovalaLib/autovalaLib.vala:192
 #, c-format
 msgid "Folder %s doesn't exist. Autovala is incorrectly installed"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:226
+#: src/autovalaLib/autovalaLib.vala:230
 #, c-format
 msgid "There's already a project in folder %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:231
+#: src/autovalaLib/autovalaLib.vala:235
 #, c-format
 msgid "Failed to list path %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:238
+#: src/autovalaLib/autovalaLib.vala:242
 msgid "The 'cmake' folder already exists"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:266
+#: src/autovalaLib/autovalaLib.vala:270
 msgid "Can't create the initial source file"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:376 src/autovalaLib/elementGlobal.vala:297
+#: src/autovalaLib/autovalaLib.vala:380 src/autovalaLib/elementGlobal.vala:297
 msgid "The following local dependencies cannot be satisfied:"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:382 src/autovalaLib/elementGlobal.vala:304
+#: src/autovalaLib/autovalaLib.vala:386 src/autovalaLib/elementGlobal.vala:304
 #, c-format
 msgid ""
 "\n"
 "\tLibrary %s, packages:"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:384 src/autovalaLib/elementGlobal.vala:306
+#: src/autovalaLib/autovalaLib.vala:388 src/autovalaLib/elementGlobal.vala:306
 #, c-format
 msgid ""
 "\n"
 "\tBinary %s, packages:"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:399 src/autovalaLib/elementAppData.vala:94
+#: src/autovalaLib/autovalaLib.vala:403 src/autovalaLib/elementAppData.vala:94
 #: src/autovalaLib/elementBashCompletion.vala:81
 #: src/autovalaLib/elementBinary.vala:62 src/autovalaLib/elementCustom.vala:112
 #: src/autovalaLib/elementDBus.vala:109 src/autovalaLib/elementDesktop.vala:128
@@ -209,73 +219,73 @@ msgstr ""
 msgid "Failed to write to meson.build at '%s' element, at '%s' path: %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:410
+#: src/autovalaLib/autovalaLib.vala:414
 #, c-format
 msgid "Failed to close meson.build file: %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:457
+#: src/autovalaLib/autovalaLib.vala:461
 msgid "Failed while generating the main CMakeLists.txt file"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:508 src/autovalaLib/autovalaLib.vala:514
+#: src/autovalaLib/autovalaLib.vala:512 src/autovalaLib/autovalaLib.vala:518
 #, c-format
 msgid "Failed while generating the CMakeLists.txt files: %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:676 src/autovalaLib/autovalaLib.vala:705
+#: src/autovalaLib/autovalaLib.vala:680 src/autovalaLib/autovalaLib.vala:709
 #, c-format
 msgid "Launching command %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:683
+#: src/autovalaLib/autovalaLib.vala:687
 msgid "Failed to run 'xgettext' to generate the base POT file"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:687
+#: src/autovalaLib/autovalaLib.vala:691
 #, c-format
 msgid "Command output: %s\n"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:691
+#: src/autovalaLib/autovalaLib.vala:695
 #, c-format
 msgid "Error output: %s\n"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:712
+#: src/autovalaLib/autovalaLib.vala:716
 msgid "Failed to run msgmerge"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:714
+#: src/autovalaLib/autovalaLib.vala:718
 #, c-format
 msgid ""
 "\n"
 "Command output: %s\n"
 "Error output: %s\n"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:718
+#: src/autovalaLib/autovalaLib.vala:722
 #, c-format
 msgid "Failed to get the files inside %s"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:836
+#: src/autovalaLib/autovalaLib.vala:840
 msgid "The path can't be the project's root path"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:838
+#: src/autovalaLib/autovalaLib.vala:842
 msgid "The selected path is outside the project folder"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:870
+#: src/autovalaLib/autovalaLib.vala:874
 msgid "Path already in use in other element"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:877
+#: src/autovalaLib/autovalaLib.vala:881
 msgid "Name already in use in other executable or library"
 msgstr ""
 
-#: src/autovalaLib/autovalaLib.vala:884
+#: src/autovalaLib/autovalaLib.vala:888
 msgid "The element doesn't exist"
 msgstr ""