Commit 7ee95d40 authored by Piotr Drąg's avatar Piotr Drąg 😐 Committed by Jens Georg

Remove double spaces from translatable strings

https://bugzilla.gnome.org/show_bug.cgi?id=772339
parent 3d2acfe4
......@@ -57,7 +57,7 @@ namespace Publishing.Flickr {
internal const string SERVICE_NAME = "Flickr";
internal const string SERVICE_WELCOME_MESSAGE =
_("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to your Flickr account.");
_("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to your Flickr account.");
internal const string RESTART_ERROR_MESSAGE =
_("You have already logged in and out of Flickr during this Shotwell session.\nTo continue publishing to Flickr, quit and restart Shotwell, then try publishing again.");
internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
......
......@@ -653,7 +653,7 @@ public abstract class AppWindow : PageWindow {
}
public static void database_error(DatabaseError err) {
panic(_("A fatal error occurred when accessing Shotwell’s library. Shotwell cannot continue.\n\n%s").printf(
panic(_("A fatal error occurred when accessing Shotwell’s library. Shotwell cannot continue.\n\n%s").printf(
err.message));
}
......
......@@ -13,8 +13,8 @@ public bool confirm_delete_tag(Tag tag) {
if (count == 0)
return true;
string msg = ngettext(
"This will remove the tag “%s” from one photo. Continue?",
"This will remove the tag “%s” from %d photos. Continue?",
"This will remove the tag “%s” from one photo. Continue?",
"This will remove the tag “%s” from %d photos. Continue?",
count).printf(tag.get_user_visible_name(), count);
return AppWindow.negate_affirm_question(msg, _("_Cancel"), _("_Delete"),
......@@ -22,7 +22,7 @@ public bool confirm_delete_tag(Tag tag) {
}
public bool confirm_delete_saved_search(SavedSearch search) {
string msg = _("This will remove the saved search “%s”. Continue?")
string msg = _("This will remove the saved search “%s”. Continue?")
.printf(search.get_name());
return AppWindow.negate_affirm_question(msg, _("_Cancel"), _("_Delete"),
......@@ -1414,8 +1414,8 @@ public bool revert_editable_dialog(Gtk.Window owner, Gee.Collection<Photo> photo
string headline = (count == 1) ? _("Revert External Edit?") : _("Revert External Edits?");
string msg = ngettext(
"This will destroy all changes made to the external file. Continue?",
"This will destroy all changes made to %d external files. Continue?",
"This will destroy all changes made to the external file. Continue?",
"This will destroy all changes made to %d external files. Continue?",
count).printf(count);
string action = (count == 1) ? _("Re_vert External Edit") : _("Re_vert External Edits");
......@@ -1439,8 +1439,8 @@ public bool remove_offline_dialog(Gtk.Window owner, int count) {
return false;
string msg = ngettext(
"This will remove the photo from the library. Continue?",
"This will remove %d photos from the library. Continue?",
"This will remove the photo from the library. Continue?",
"This will remove %d photos from the library. Continue?",
count).printf(count);
Gtk.MessageDialog dialog = new Gtk.MessageDialog(owner, Gtk.DialogFlags.MODAL,
......@@ -2716,16 +2716,16 @@ public void remove_from_app(Gee.Collection<MediaSource> sources, string dialog_t
string? user_message = null;
if ((!photos.is_empty) && (!videos.is_empty)) {
user_message = ngettext("This will remove the photo/video from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
"This will remove %d photos/videos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
user_message = ngettext("This will remove the photo/video from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
"This will remove %d photos/videos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
sources.size).printf(sources.size);
} else if (!videos.is_empty) {
user_message = ngettext("This will remove the video from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
"This will remove %d videos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
user_message = ngettext("This will remove the video from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
"This will remove %d videos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
sources.size).printf(sources.size);
} else {
user_message = ngettext("This will remove the photo from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
"This will remove %d photos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
user_message = ngettext("This will remove the photo from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
"This will remove %d photos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
sources.size).printf(sources.size);
}
......
......@@ -314,7 +314,7 @@ public class ExporterUI {
private Exporter.Overwrite on_export_overwrite(Exporter exporter, File file) {
progress_dialog.set_modal(false);
string question = _("File %s already exists. Replace?").printf(file.get_basename());
string question = _("File %s already exists. Replace?").printf(file.get_basename());
Gtk.ResponseType response = AppWindow.negate_affirm_all_cancel_question(question,
_("_Skip"), _("_Replace"), _("Replace _All"), _("Export"));
......
......@@ -455,7 +455,7 @@ public class CameraAccumulator : Object, Core.TrackerAccumulator {
}
public class ImportPage : CheckerboardPage {
private const string UNMOUNT_FAILED_MSG = _("Unable to unmount camera. Try unmounting the camera from the file manager.");
private const string UNMOUNT_FAILED_MSG = _("Unable to unmount camera. Try unmounting the camera from the file manager.");
private class ImportViewManager : ViewManager {
private ImportPage owner;
......@@ -1010,7 +1010,7 @@ public class ImportPage : CheckerboardPage {
if (mount != null) {
// it's mounted, offer to unmount for the user
string mounted_message = _("Shotwell needs to unmount the camera from the filesystem in order to access it. Continue?");
string mounted_message = _("Shotwell needs to unmount the camera from the filesystem in order to access it. Continue?");
Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(),
Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION,
......@@ -1026,7 +1026,7 @@ public class ImportPage : CheckerboardPage {
unmount_camera(mount);
}
} else {
string locked_message = _("The camera is locked by another application. Shotwell can only access the camera when it’s unlocked. Please close any other application using the camera and try again.");
string locked_message = _("The camera is locked by another application. Shotwell can only access the camera when it’s unlocked. Please close any other application using the camera and try again.");
// it's not mounted, so another application must have it locked
Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(),
......
......@@ -51,18 +51,18 @@ void library_exec(string[] mounts) {
break;
case Db.VerifyResult.FUTURE_VERSION:
errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it was created by Shotwell %s (schema %d). This version is %s (schema %d). Please use the latest version of Shotwell.").printf(
errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it was created by Shotwell %s (schema %d). This version is %s (schema %d). Please use the latest version of Shotwell.").printf(
app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION);
break;
case Db.VerifyResult.UPGRADE_ERROR:
errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to %s (schema %d). For more information please check the Shotwell Wiki at %s").printf(
errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to %s (schema %d). For more information please check the Shotwell Wiki at %s").printf(
app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
Resources.HOME_URL);
break;
case Db.VerifyResult.NO_UPGRADE_AVAILABLE:
errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it was created by Shotwell %s (schema %d). This version is %s (schema %d). Please clear your library by deleting %s and re-import your photos.").printf(
errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it was created by Shotwell %s (schema %d). This version is %s (schema %d). Please clear your library by deleting %s and re-import your photos.").printf(
app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
AppDirs.get_data_dir().get_path());
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment