Commit 6c58cda7 authored by Michael Terry's avatar Michael Terry

Follow nautilus's lead and don't separate out each server type in its own list...

Follow nautilus's lead and don't separate out each server type in its own list item -- just provide guidance on what the format of a server address looks like
parent 8518542d
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2017-08-07 14:14-0400\n"
"POT-Creation-Date: 2017-08-08 01:20-0400\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"
......
......@@ -40,7 +40,6 @@ public class ConfigLocation : ConfigWidget
CLOUD,
CLOUD_SEP,
REMOTE,
REMOTE_CUSTOM,
REMOTE_SEP,
VOLUMES,
VOLUMES_SEP,
......@@ -117,18 +116,8 @@ public class ConfigLocation : ConfigWidget
insert_rackspace();
insert_openstack();
// Now insert remote servers
add_entry(new ThemedIcon.with_default_fallbacks("folder-remote"),
_("SSH"), Group.REMOTE, new ConfigLocationSSH(label_sizes), "sftp");
add_entry(new ThemedIcon.with_default_fallbacks("folder-remote"),
_("Windows Share"), Group.REMOTE, new ConfigLocationSMB(label_sizes), "smb");
add_entry(new ThemedIcon.with_default_fallbacks("folder-remote"),
_("FTP"), Group.REMOTE, new ConfigLocationFTP(label_sizes), "ftp");
add_entry(new ThemedIcon.with_default_fallbacks("folder-remote"),
_("WebDAV"), Group.REMOTE, new ConfigLocationDAV(label_sizes), "dav");
add_entry(new ThemedIcon.with_default_fallbacks("folder-remote"),
_("Custom Location"), Group.REMOTE_CUSTOM,
_("Network Server"), Group.REMOTE,
new ConfigLocationCustom(label_sizes));
add_separator(Group.REMOTE_SEP);
......@@ -602,21 +591,15 @@ public class ConfigLocation : ConfigWidget
int cur_group;
store.get(iter, Col.GROUP, out cur_group);
if (cur_group == Group.REMOTE_CUSTOM)
if (cur_group == Group.REMOTE)
return;
// OK, we can continue
var scheme = ConfigURLPart.read_uri_part(fsettings, FILE_PATH_KEY,
ConfigURLPart.Part.SCHEME);
switch (scheme) {
case "dav":
case "davs": group = Group.REMOTE; id = "dav"; break;
case "sftp":
case "ssh": group = Group.REMOTE; id = "sftp"; break;
case "ftp": group = Group.REMOTE; id = scheme; break;
case "smb": group = Group.REMOTE; id = scheme; break;
case "file": group = Group.LOCAL; id = scheme; break;
default: group = Group.REMOTE_CUSTOM; break;
case "file": group = Group.LOCAL; break;
default: group = Group.REMOTE; break;
}
}
}
......@@ -671,15 +654,7 @@ public class ConfigLocation : ConfigWidget
settings.set_string(BACKEND_KEY, id);
else if (group == Group.VOLUMES)
yield set_volume_info(iter);
else if (group == Group.REMOTE || group == Group.REMOTE_CUSTOM || group == Group.LOCAL) {
if (id == "dav") {
// Support not overriding davs with dav by checking current value
var fsettings = DejaDup.get_settings(FILE_ROOT);
id = ConfigURLPart.read_uri_part(fsettings, FILE_PATH_KEY,
ConfigURLPart.Part.SCHEME);
if (id != "dav" && id != "davs")
id = "dav"; // default to non-https, since we do default to encrypted backups
}
else if (group == Group.REMOTE || group == Group.LOCAL) {
yield set_remote_info(id);
}
else {
......
......@@ -31,7 +31,54 @@ public class ConfigLocationCustom : ConfigLocationTable
var entry = new ConfigEntry(DejaDup.FILE_PATH_KEY, DejaDup.FILE_ROOT,
true);
entry.set_accessible_name("CustomFolder");
add_widget(_("_URI"), entry);
add_widget(_("Server _Address"), entry);
int row = 0;
var hint = new Gtk.Grid();
hint.row_spacing = 6;
add_label(hint, 0, row++, 2, 1, _("Server addresses are made up of a protocol prefix and an address. Examples:"));
add_label(hint, 0, row++, 2, 1, "smb://gnome.org, ssh://192.168.0.1, ftp://[2001:db8::1]");
add_label(hint, 0, row, 1, 1, "<b>%s</b>".printf(_("Available Protocols")), 6);
add_label(hint, 1, row++, 1, 1, "<b>%s</b>".printf(_("Prefix")), 6);
add_label(hint, 0, row, 1, 1, _("AppleTalk"));
add_label(hint, 1, row++, 1, 1, "afp://");
add_label(hint, 0, row, 1, 1, _("File Transfer Protocol"));
// Translators: do not translate ftp:// and ftps://
add_label(hint, 1, row++, 1, 1, _("ftp:// or ftps://"));
add_label(hint, 0, row, 1, 1, _("Network File System"));
add_label(hint, 1, row++, 1, 1, "nfs://");
add_label(hint, 0, row, 1, 1, _("Samba"));
add_label(hint, 1, row++, 1, 1, "smb://");
add_label(hint, 0, row, 1, 1, _("SSH File Transfer Protocol"));
// Translators: do not translate sftp:// and ssh://
add_label(hint, 1, row++, 1, 1, _("sftp:// or ssh://"));
add_label(hint, 0, row, 1, 1, _("WebDav"));
// Translators: do not translate dav:// and davs://
add_label(hint, 1, row++, 1, 1, _("dav:// or davs://"));
hint.show_all();
add_widget("", hint);
}
void add_label(Gtk.Grid grid, int left, int top, int width, int height, string text, int margin_top = 0)
{
var label = new Gtk.Label(text);
label.wrap = true;
label.max_width_chars = 50;
label.use_markup = true;
label.xalign = 0.0f;
label.margin_top = margin_top;
grid.attach(label, left, top, width, height);
}
}
......
/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
/*
This file is part of Déjà Dup.
For copyright information, see AUTHORS.
Déjà Dup is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Déjà Dup is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
*/
using GLib;
namespace DejaDup {
public class ConfigLocationDAV : ConfigLocationTable
{
public ConfigLocationDAV(Gtk.SizeGroup sg) {
Object(label_sizes: sg);
}
construct {
add_widget(_("_Server"), new ConfigURLPart(ConfigURLPart.Part.SERVER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
var w = new ConfigURLPartBool(ConfigURLPart.Part.SCHEME,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT,
_("Use secure connection (_HTTPS)"));
w.test_active = is_https_active;
w.toggled.connect(https_toggled);
add_widget("", w);
add_widget(_("_Port"), new ConfigURLPart(ConfigURLPart.Part.PORT,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Folder"), new ConfigURLPart(ConfigURLPart.Part.FOLDER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Username"), new ConfigURLPart(ConfigURLPart.Part.USER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
}
static bool is_https_active(string val)
{
return val == "davs";
}
void https_toggled(ConfigBool check, bool user)
{
if (!user)
return;
string scheme;
if (check.get_active())
scheme = "davs";
else
scheme = "dav";
ConfigURLPart.write_uri_part(DejaDup.get_settings(DejaDup.FILE_ROOT),
DejaDup.FILE_PATH_KEY,
ConfigURLPart.Part.SCHEME, scheme);
}
}
}
/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
/*
This file is part of Déjà Dup.
For copyright information, see AUTHORS.
Déjà Dup is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Déjà Dup is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
*/
using GLib;
namespace DejaDup {
public class ConfigLocationFTP : ConfigLocationTable
{
public ConfigLocationFTP(Gtk.SizeGroup sg) {
Object(label_sizes: sg);
}
ConfigURLPart user;
construct {
add_widget(_("_Server"), new ConfigURLPart(ConfigURLPart.Part.SERVER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Port"), new ConfigURLPart(ConfigURLPart.Part.PORT,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Folder"), new ConfigURLPart(ConfigURLPart.Part.FOLDER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
var w = new ConfigURLPartBool(ConfigURLPart.Part.USER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT,
_("_Username"));
w.halign = Gtk.Align.END;
w.test_active = is_not_anon;
w.toggled.connect(username_toggled);
user = new ConfigURLPart(ConfigURLPart.Part.USER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT);
add_widget_with_label(w, user, w);
}
static bool is_not_anon(string val)
{
return (val != "anonymous");
}
void username_toggled(ConfigBool check, bool user)
{
if (!check.get_active())
ConfigURLPart.write_uri_part(DejaDup.get_settings(DejaDup.FILE_ROOT),
DejaDup.FILE_PATH_KEY,
ConfigURLPart.Part.USER, "anonymous");
}
}
}
/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
/*
This file is part of Déjà Dup.
For copyright information, see AUTHORS.
Déjà Dup is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Déjà Dup is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
*/
using GLib;
namespace DejaDup {
public class ConfigLocationSMB : ConfigLocationTable
{
public ConfigLocationSMB(Gtk.SizeGroup sg) {
Object(label_sizes: sg);
}
construct {
add_widget(_("_Server"), new ConfigURLPart(ConfigURLPart.Part.SERVER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Folder"), new ConfigURLPart(ConfigURLPart.Part.FOLDER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Username"), new ConfigURLPart(ConfigURLPart.Part.USER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Domain Name"), new ConfigURLPart(ConfigURLPart.Part.DOMAIN,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
}
}
}
/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
/*
This file is part of Déjà Dup.
For copyright information, see AUTHORS.
Déjà Dup is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Déjà Dup is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
*/
using GLib;
namespace DejaDup {
public class ConfigLocationSSH : ConfigLocationTable
{
public ConfigLocationSSH(Gtk.SizeGroup sg) {
Object(label_sizes: sg);
}
construct {
add_widget(_("_Server"), new ConfigURLPart(ConfigURLPart.Part.SERVER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Port"), new ConfigURLPart(ConfigURLPart.Part.PORT,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Folder"), new ConfigURLPart(ConfigURLPart.Part.FOLDER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
add_widget(_("_Username"), new ConfigURLPart(ConfigURLPart.Part.USER,
DejaDup.FILE_PATH_KEY,
DejaDup.FILE_ROOT));
}
}
}
......@@ -29,16 +29,12 @@ libwidgets = shared_library('widgets',
'ConfigList.vala',
'ConfigLocation.vala',
'ConfigLocationCustom.vala',
'ConfigLocationDAV.vala',
'ConfigLocationFile.vala',
'ConfigLocationFTP.vala',
'ConfigLocationGCS.vala',
'ConfigLocationGoa.vala',
'ConfigLocationOpenstack.vala',
'ConfigLocationRackspace.vala',
'ConfigLocationS3.vala',
'ConfigLocationSSH.vala',
'ConfigLocationSMB.vala',
'ConfigLocationTable.vala',
'ConfigLocationU1.vala',
'ConfigLocationVolume.vala',
......
......@@ -31,14 +31,10 @@ deja-dup/widgets/ConfigLabel.vala
deja-dup/widgets/ConfigList.vala
deja-dup/widgets/ConfigLocation.vala
deja-dup/widgets/ConfigLocationCustom.vala
deja-dup/widgets/ConfigLocationDAV.vala
deja-dup/widgets/ConfigLocationFTP.vala
deja-dup/widgets/ConfigLocationFile.vala
deja-dup/widgets/ConfigLocationGoa.vala
deja-dup/widgets/ConfigLocationRackspace.vala
deja-dup/widgets/ConfigLocationS3.vala
deja-dup/widgets/ConfigLocationSMB.vala
deja-dup/widgets/ConfigLocationSSH.vala
deja-dup/widgets/ConfigLocationTable.vala
deja-dup/widgets/ConfigLocationU1.vala
deja-dup/widgets/ConfigLocationVolume.vala
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-07 14:14-0400\n"
"POT-Creation-Date: 2017-08-08 01:20-0400\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"
......@@ -616,8 +616,8 @@ msgstr ""
#. frequently fix odd metadata errors with duplicity. If we hit an error
#. a second time, we'll show the unknown error message.
#: deja-dup/AssistantOperation.vala:575
#: libdeja/tools/duplicity/DuplicityJob.vala:702
#: libdeja/tools/duplicity/DuplicityJob.vala:1081
#: libdeja/tools/duplicity/DuplicityJob.vala:704
#: libdeja/tools/duplicity/DuplicityJob.vala:1083
msgid "Failed with an unknown error."
msgstr ""
......@@ -868,11 +868,7 @@ msgid "Connect to Server"
msgstr ""
#: deja-dup/MountOperationAssistant.vala:37
#: deja-dup/widgets/ConfigLocationDAV.vala:49
#: deja-dup/widgets/ConfigLocationFTP.vala:45
#: deja-dup/widgets/ConfigLocationRackspace.vala:31
#: deja-dup/widgets/ConfigLocationSMB.vala:37
#: deja-dup/widgets/ConfigLocationSSH.vala:40
msgid "_Username"
msgstr ""
......@@ -1167,88 +1163,102 @@ msgstr ""
msgid "Choose folders"
msgstr ""
#. Now insert remote servers
#: deja-dup/widgets/ConfigLocation.vala:122
msgid "SSH"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:124
msgid "Windows Share"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:126
msgid "FTP"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:128
msgid "WebDAV"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:131
msgid "Custom Location"
#: deja-dup/widgets/ConfigLocation.vala:120
msgid "Network Server"
msgstr ""
#. And a local folder option
#: deja-dup/widgets/ConfigLocation.vala:137
#: deja-dup/widgets/ConfigLocation.vala:126
msgid "Local Folder"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:297 libdeja/BackendS3.vala:122
#: deja-dup/widgets/ConfigLocation.vala:287 libdeja/BackendS3.vala:122
msgid "Amazon S3"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:305
#: deja-dup/widgets/ConfigLocation.vala:295
msgid "Google Cloud Storage"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:317 libdeja/BackendU1.vala:45
#: deja-dup/widgets/ConfigLocation.vala:307 libdeja/BackendU1.vala:45
msgid "Ubuntu One"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:325 libdeja/BackendRackspace.vala:69
#: deja-dup/widgets/ConfigLocation.vala:315 libdeja/BackendRackspace.vala:69
msgid "Rackspace Cloud Files"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:333
#: deja-dup/widgets/ConfigLocation.vala:323
msgid "OpenStack Swift"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:34
msgid "_URI"
msgid "Server _Address"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:41
msgid ""
"Server addresses are made up of a protocol prefix and an address. Examples:"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:45
msgid "Available Protocols"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:46
msgid "Prefix"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:48
msgid "AppleTalk"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:51
msgid "File Transfer Protocol"
msgstr ""
#: deja-dup/widgets/ConfigLocationDAV.vala:31
#: deja-dup/widgets/ConfigLocationFTP.vala:32
#: deja-dup/widgets/ConfigLocationSMB.vala:31
#: deja-dup/widgets/ConfigLocationSSH.vala:31
msgid "_Server"
#. Translators: do not translate ftp:// and ftps://
#: deja-dup/widgets/ConfigLocationCustom.vala:53
msgid "ftp:// or ftps://"
msgstr ""
#: deja-dup/widgets/ConfigLocationDAV.vala:38
msgid "Use secure connection (_HTTPS)"
#: deja-dup/widgets/ConfigLocationCustom.vala:55
msgid "Network File System"
msgstr ""
#: deja-dup/widgets/ConfigLocationDAV.vala:43
#: deja-dup/widgets/ConfigLocationFTP.vala:35
#: deja-dup/widgets/ConfigLocationSSH.vala:34
msgid "_Port"
#: deja-dup/widgets/ConfigLocationCustom.vala:58
msgid "Samba"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:61
msgid "SSH File Transfer Protocol"
msgstr ""
#. Translators: do not translate sftp:// and ssh://
#: deja-dup/widgets/ConfigLocationCustom.vala:63
msgid "sftp:// or ssh://"
msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:65
msgid "WebDav"
msgstr ""
#. Translators: do not translate dav:// and davs://
#: deja-dup/widgets/ConfigLocationCustom.vala:67
msgid "dav:// or davs://"
msgstr ""
#: deja-dup/widgets/ConfigLocationFile.vala:39
msgid "_Choose Folder…"
msgstr ""
#: deja-dup/widgets/ConfigLocationDAV.vala:46
#: deja-dup/widgets/ConfigLocationFTP.vala:38
#: deja-dup/widgets/ConfigLocationFile.vala:45
#: deja-dup/widgets/ConfigLocationGoa.vala:36
#: deja-dup/widgets/ConfigLocationS3.vala:33
#: deja-dup/widgets/ConfigLocationSMB.vala:34
#: deja-dup/widgets/ConfigLocationSSH.vala:37
#: deja-dup/widgets/ConfigLocationVolume.vala:33
msgid "_Folder"
msgstr ""
#: deja-dup/widgets/ConfigLocationFile.vala:39
msgid "_Choose Folder…"
msgstr ""
#: deja-dup/widgets/ConfigLocationFile.vala:50
msgid "Choose Folder"
msgstr ""
......@@ -1278,10 +1288,6 @@ msgstr ""
msgid "S3 Access Key I_D"
msgstr ""
#: deja-dup/widgets/ConfigLocationSMB.vala:40
msgid "_Domain Name"
msgstr ""
#: deja-dup/widgets/ConfigLocationU1.vala:32 libdeja/BackendU1.vala:50
msgid "Ubuntu One has shut down. Please choose another storage location."
msgstr ""
......@@ -1319,7 +1325,7 @@ msgid "Backup will begin when %s is connected."
msgstr ""
#: libdeja/BackendFile.vala:428 libdeja/BackendFile.vala:494
#: libdeja/BackendGoa.vala:145
#: libdeja/BackendGoa.vala:169
msgid "Storage location not available"
msgstr ""
......@@ -1332,7 +1338,8 @@ msgstr ""
msgid "Waiting for ‘%s’ to become connected…"
msgstr ""
#: libdeja/BackendGoa.vala:96
#. likely account credentials are old?
#: libdeja/BackendGoa.vala:100 libdeja/BackendGoa.vala:115
msgid "Backup will begin when a storage location is configured"
msgstr ""
......@@ -1340,16 +1347,16 @@ msgstr ""
#. Translators: "Files" here is the string used in GNOME Online Account
#. settings checkbox for a given account to enable/disable an account's
#. Files feature.
#: libdeja/BackendGoa.vala:106
#: libdeja/BackendGoa.vala:110
#, c-format
msgid "Backup will begin when ‘%s’ has Files support enabled"
msgstr ""
#: libdeja/BackendGoa.vala:139
#: libdeja/BackendGoa.vala:163
msgid "Waiting for Online Accounts to be configured in backup settings…"
msgstr ""
#: libdeja/BackendGoa.vala:143
#: libdeja/BackendGoa.vala:167
#, c-format
msgid "Waiting for %s to be configured in your backup settings…"
msgstr ""
......@@ -1478,10 +1485,10 @@ msgid "Listing files…"
msgstr ""
#: libdeja/Operation.vala:69 libdeja/Operation.vala:103
#: libdeja/tools/duplicity/DuplicityJob.vala:385
#: libdeja/tools/duplicity/DuplicityJob.vala:392
#: libdeja/tools/duplicity/DuplicityJob.vala:417
#: libdeja/tools/duplicity/DuplicityJob.vala:422
#: libdeja/tools/duplicity/DuplicityJob.vala:387
#: libdeja/tools/duplicity/DuplicityJob.vala:394
#: libdeja/tools/duplicity/DuplicityJob.vala:419
#: libdeja/tools/duplicity/DuplicityJob.vala:424
msgid "Preparing…"
msgstr ""
......@@ -1491,29 +1498,29 @@ msgid "Paused (no network)"
msgstr ""
#. Was not even a file path (maybe something goofy like computer://)
#: libdeja/tools/duplicity/DuplicityJob.vala:449
#: libdeja/tools/duplicity/DuplicityJob.vala:451
#, c-format
msgid "Could not restore ‘%s’: Not a valid file location"
msgstr ""
#. Tiny backup location. Suggest they get a larger one.
#: libdeja/tools/duplicity/DuplicityJob.vala:516
#: libdeja/tools/duplicity/DuplicityJob.vala:518
msgid "Backup location is too small. Try using one with more space."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:539
#: libdeja/tools/duplicity/DuplicityJob.vala:541
msgid "Backup location does not have enough free space."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:559
#: libdeja/tools/duplicity/DuplicityJob.vala:573
#: libdeja/tools/duplicity/DuplicityJob.vala:561
#: libdeja/tools/duplicity/DuplicityJob.vala:575
msgid "Cleaning up…"
msgstr ""
#. OK, we succeeded yay! But some files didn't make it into the backup
#. because we couldn't read them. So tell the user so they don't think
#. everything is hunky dory.
#: libdeja/tools/duplicity/DuplicityJob.vala:669
#: libdeja/tools/duplicity/DuplicityJob.vala:671
msgid ""
"Could not back up the following files. Please make sure you are able to "
"open them."
......@@ -1522,7 +1529,7 @@ msgstr ""
#. OK, we succeeded yay! But some files didn't actually restore
#. because we couldn't write to them. So tell the user so they
#. don't think everything is hunky dory.
#: libdeja/tools/duplicity/DuplicityJob.vala:685
#: libdeja/tools/duplicity/DuplicityJob.vala:687
msgid ""
"Could not restore the following files. Please make sure you are able to "
"write to them."
......@@ -1531,7 +1538,7 @@ msgstr ""
#. make text a little nicer than duplicity gives
#. duplicity gives something like "home/blah/blah not found in archive,
#. no files restored".
#: libdeja/tools/duplicity/DuplicityJob.vala:929
#: libdeja/tools/duplicity/DuplicityJob.vala:931
#, c-format
msgid "Could not restore ‘%s’: File not found in backup"
msgstr ""
......@@ -1539,17 +1546,17 @@ msgstr ""
#. notify upper layers, if they want to do anything
#. Duplicity tried to ask the user what the encryption password is.
#. notify upper layers, if they want to do anything
#: libdeja/tools/duplicity/DuplicityJob.vala:935
#: libdeja/tools/duplicity/DuplicityJob.vala:1033
#: libdeja/tools/duplicity/DuplicityJob.vala:1037
#: libdeja/tools/duplicity/DuplicityJob.vala:937
#: libdeja/tools/duplicity/DuplicityJob.vala:1035
#: libdeja/tools/duplicity/DuplicityJob.vala:1039
msgid "Bad encryption password."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:940
#: libdeja/tools/duplicity/DuplicityJob.vala:942
msgid "Computer name changed"
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:940
#: libdeja/tools/duplicity/DuplicityJob.vala:942
#, c-format
msgid ""
"The existing backup is of a computer named %s, but the current computer’s "
......@@ -1557,69 +1564,69 @@ msgid ""
"location."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:975
#: libdeja/tools/duplicity/DuplicityJob.vala:977
#, c-format
msgid "Permission denied when trying to create ‘%s’."
msgstr ""
#. assume error is on backend side
#: libdeja/tools/duplicity/DuplicityJob.vala:979
#: libdeja/tools/duplicity/DuplicityJob.vala:983
#: libdeja/tools/duplicity/DuplicityJob.vala:981
#: libdeja/tools/duplicity/DuplicityJob.vala:985
#, c-format
msgid "Permission denied when trying to read ‘%s’."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:987
#: libdeja/tools/duplicity/DuplicityJob.vala:989
#, c-format