minor translation fixes/typos from edogawa

git-svn-id: svn://localhost/ardour2/branches/3.0@13812 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 11 insertions, 11 deletions

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 433160fc20..161841222e 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -451,7 +451,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
 		}
 
 	} catch (...) {
-		error << string_compose (_("MIDI file %1 was not readable (no reason available"), source->file_path()) << endmsg;
+		error << string_compose (_("MIDI file %1 was not readable (no reason available)"), source->file_path()) << endmsg;
 	}
 
 	if (buf) {
diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 0246f55479..2fdcfb17a2 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -84,7 +84,7 @@ Session::memento_command_factory(XMLNode *n)
     }
 
     if (!child) {
-	error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
+	error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=%1") << id.to_s() << endmsg;
 	return 0;
     }
 
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index c38d4aa781..b6569ba00e 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -685,7 +685,7 @@ Session::remove_state (string snapshot_name)
 
 	// and delete it
 	if (g_remove (xml_path.c_str()) != 0) {
-		error << string_compose(_("Could not remove state file at path \"%1\" (%2)"),
+		error << string_compose(_("Could not remove session file at path \"%1\" (%2)"),
 				xml_path, g_strerror (errno)) << endmsg;
 	}
 }
@@ -807,7 +807,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
 	if (!tree.write (tmp_path)) {
 		error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg;
 		if (g_remove (tmp_path.c_str()) != 0) {
-			error << string_compose(_("Could not remove temporary state file at path \"%1\" (%2)"),
+			error << string_compose(_("Could not remove temporary session file at path \"%1\" (%2)"),
 					tmp_path, g_strerror (errno)) << endmsg;
 		}
 		return -1;
@@ -818,7 +818,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
 			error << string_compose (_("could not rename temporary session file %1 to %2"),
 					tmp_path, xml_path) << endmsg;
 			if (g_remove (tmp_path.c_str()) != 0) {
-				error << string_compose(_("Could not remove temporary state file at path \"%1\" (%2)"),
+				error << string_compose(_("Could not remove temporary session file at path \"%1\" (%2)"),
 						tmp_path, g_strerror (errno)) << endmsg;
 			}
 			return -1;
@@ -883,7 +883,7 @@ Session::load_state (string snapshot_name)
 	if (!Glib::file_test (xmlpath, Glib::FILE_TEST_EXISTS)) {
 		xmlpath = Glib::build_filename (_session_dir->root_path(), legalize_for_path (snapshot_name) + statefile_suffix);
 		if (!Glib::file_test (xmlpath, Glib::FILE_TEST_EXISTS)) {
-                        error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath) << endmsg;
+                        error << string_compose(_("%1: session file \"%2\" doesn't exist!"), _name, xmlpath) << endmsg;
                         return 1;
                 }
         }
@@ -895,7 +895,7 @@ Session::load_state (string snapshot_name)
 	_writable = exists_and_writable (xmlpath);
 
 	if (!state_tree->read (xmlpath)) {
-		error << string_compose(_("Could not understand ardour file %1"), xmlpath) << endmsg;
+		error << string_compose(_("Could not understand session file %1"), xmlpath) << endmsg;
 		delete state_tree;
 		state_tree = 0;
 		return -1;
@@ -1659,7 +1659,7 @@ Session::load_nested_sources (const XMLNode& node)
 
 			XMLProperty* prop = (*niter)->property (X_("id"));
 			if (!prop) {
-				error << _("Nested source has no ID info in session state file! (ignored)") << endmsg;
+				error << _("Nested source has no ID info in session file! (ignored)") << endmsg;
 				continue;
 			}
 
@@ -2258,7 +2258,7 @@ Session::load_bundles (XMLNode const & node)
 		} else if ((*niter)->name() == "OutputBundle") {
 			add_bundle (boost::shared_ptr<UserBundle> (new UserBundle (**niter, false)));
 		} else {
-			error << string_compose(_("Unknown node \"%1\" found in Bundles list from state file"), (*niter)->name()) << endmsg;
+			error << string_compose(_("Unknown node \"%1\" found in Bundles list from session file"), (*niter)->name()) << endmsg;
 			return -1;
 		}
 	}
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 3dfec0bab6..cf75cffba3 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -611,7 +611,7 @@ SndFileSource::write_float (Sample* data, framepos_t frame_pos, framecnt_t cnt)
 	if (sf == 0 || sf_seek (sf, frame_pos, SEEK_SET|SFM_WRITE) < 0) {
 		char errbuf[256];
 		sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-		error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3"), _path, frame_pos, errbuf) << endmsg;
+		error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3)"), _path, frame_pos, errbuf) << endmsg;
 		_descriptor->release ();
 		return 0;
 	}
diff --git a/libs/ardour/tempo_map_importer.cc b/libs/ardour/tempo_map_importer.cc
index f0447b2f82..5a6a2a4018 100644
--- a/libs/ardour/tempo_map_importer.cc
+++ b/libs/ardour/tempo_map_importer.cc
@@ -86,7 +86,7 @@ bool
 TempoMapImporter::_prepare_move ()
 {
 	// Prompt user for verification
-	boost::optional<bool> replace = Prompt (_("This will replace the current tempo map!\nAre you shure you want to do this?"));
+	boost::optional<bool> replace = Prompt (_("This will replace the current tempo map!\nAre you sure you want to do this?"));
 	return replace.get_value_or (false);
 }