Merge branch 'dev' into f-int64

src/caosdb/status_code_description.cpp

@@ -53,7 +53,7 @@ namespace caosdb {
 auto get_status_description(int code) -> const std::string & {
   static const std::string MISSING_DESCRIPTION = "MISSING DESCRIPTION";
   static const std::map<int, std::string> descriptions = {
-    {StatusCode::INITIAL, "The transaction has just been intialized. It has not been executed yet "
+    {StatusCode::INITIAL, "The transaction has just been initialized. It has not been executed yet "
                           "and clients can still change it and add sub-transactions."},
     {StatusCode::GO_ON, "The transaction has a transaction_type yet and clients may add matching "
                         "sub-transaction or execute it right-away."},
@@ -61,7 +61,7 @@ auto get_status_description(int code) -> const std::string & {
     {StatusCode::EXECUTING, "The transaction is currently being executed."},
     {StatusCode::SUCCESS, "The action was successful"},
 
-    {StatusCode::CANCELLED, "The operation was cancelled (typically by the caller)."},
+    {StatusCode::CANCELLED, "The operation was canceled (typically by the caller)."},
     {StatusCode::UNKNOWN, "Unknown error. This is typically a bug (server or client)."},
     {StatusCode::INVALID_ARGUMENT,
      "Client specified an invalid argument. Note that this differs from FAILED_PRECONDITION. "
@@ -142,7 +142,7 @@ auto get_status_description(int code) -> const std::string & {
      "The attempt to update this entity failed because this entity does not "
      "have "
      "an id. This is the case when you did not retrieve it before applying any "
-     "changes and instantiated the Entity class explicitely."},
+     "changes and instantiated the Entity class explicitly."},
     {StatusCode::NOT_A_FILE_ENTITY, "You can only add files to file entities."},
     {StatusCode::PATH_IS_A_DIRECTORY, "The given path is a directory."},
     {StatusCode::FILE_DOES_NOT_EXIST_LOCALLY,
@@ -168,3 +168,5 @@ auto get_status_description(int code) -> const std::string & {
 }
 
 } // namespace caosdb
+
+//  LocalWords:  ConnectionManager Extern