Commit 658d5e45 authored by Michael Terry's avatar Michael Terry

merge 20 branch

parents 41262d82 edee1ff2
Déjà Dup 20.0 (GNOME 3.2.0)
---------------------------
Polish:
• Backed out ubuntuone-installer support; it wasn't perfect and Ubuntu 11.10 won't use it after all
• In Unity, go back to using minimized automatic backup windows
Translations:
• Updated Croatian, Dutch, French, Italian, Japanese, Russian, and Ukrainian translations
Déjà Dup 19.92 (GNOME 3.1.92)
-----------------------------
Bug Fixes:
......
......@@ -80,16 +80,8 @@ class U1Checker : Checker
try {
var proxy = BackendU1.get_creds_proxy();
if (proxy.get_name_owner() == null) {
// No U1 installed... See if installer is available.
var cmd = Environment.find_program_in_path("ubuntuone-installer");
if (cmd == null) {
available = false;
complete = true;
}
else {
available = true;
complete = true;
}
available = false;
complete = true;
}
}
catch (Error e) {
......@@ -120,7 +112,6 @@ class U1Checker : Checker
public class BackendU1 : Backend
{
uint installer_watch = 0;
ulong button_handler = 0;
static Checker checker_instance = null;
......@@ -141,10 +132,6 @@ public class BackendU1 : Backend
mount_op.disconnect(button_handler);
button_handler = 0;
}
if (installer_watch > 0) {
Source.remove(installer_watch);
installer_watch = 0;
}
}
public override bool is_native() {
......@@ -254,54 +241,12 @@ public class BackendU1 : Backend
mount_op.ask_password("", "", "", 0);
}
void installer_finished(Pid pid, int status)
{
installer_watch = 0;
try {
var obj = get_creds_proxy();
if (obj.get_name_owner() == null)
envp_ready(false, null);
else
sign_in();
}
catch (Error e) {
warning("%s\n", e.message);
envp_ready(false, null);
}
}
bool install_u1()
{
if (installer_watch > 0)
return true;
var cmd = Environment.find_program_in_path("ubuntuone-installer");
if (cmd == null)
return false;
Pid pid = 0;
try {
Process.spawn_async(null, {cmd}, null,
SpawnFlags.DO_NOT_REAP_CHILD, null, out pid);
}
catch (Error e) {
warning("%s\n", e.message);
return false;
}
installer_watch = ChildWatch.add(pid, installer_finished);
return true;
}
async void sign_in()
{
try {
var obj = get_creds_proxy();
if (obj.get_name_owner() == null) {
// No U1 installed, so first install it
if (!install_u1())
envp_ready(false, null);
envp_ready(false, null);
return;
}
......
......@@ -95,11 +95,11 @@ public class DuplicityInfo : Object
(major == vmaj && minor > vmin) ||
(major == vmaj && minor == vmin && micro >= vmic);
}
/*
bool equals_version(int vmaj, int vmin, int vmic) {
return major == vmaj && minor == vmin && micro == vmic;
}
*/
// Doesn't yet handle a blacklist of versions. We'll cross that bridge when we come to it
bool meets_requirements() {
return meets_version(REQUIRED_MAJOR, REQUIRED_MINOR, REQUIRED_MICRO);
......
......@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-09-06 11:09-0400\n"
"PO-Revision-Date: 2011-09-09 08:51+0000\n"
"Last-Translator: Olivier FEBWIN <Unknown>\n"
"PO-Revision-Date: 2011-09-24 10:10+0000\n"
"Last-Translator: Nicolas Delvaux <Unknown>\n"
"Language-Team: French <fr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-10 05:02+0000\n"
"X-Generator: Launchpad (build 13900)\n"
"X-Launchpad-Export-Date: 2011-09-25 04:42+0000\n"
"X-Generator: Launchpad (build 14012)\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
......@@ -58,6 +58,9 @@ msgid ""
"If you only back up when you remember to do so, you’re not backing up often "
"enough. Fortunately, it’s easy to set up automatic backups."
msgstr ""
"Si vous n'effectuez vos sauvegardes que lorsque vous y pensez, vous ne "
"sauvegardez pas assez souvent. Heureusement, il est facile de mettre en "
"place un système de sauvegarde automatique."
#: C/backup-auto.page:12(item/p)
#: C/backup-first.page:11(item/p)
......@@ -79,6 +82,8 @@ msgid ""
"Turn on the <gui>Automatic backups</gui> option on the <gui>Overview</gui> "
"page."
msgstr ""
"Activer l'option de <gui>Sauvegardes automatiques</gui> dans la page de "
"<gui>Vue d'ensemble</gui>."
#: C/backup-auto.page:16(note/p)
msgid ""
......@@ -100,6 +105,8 @@ msgid ""
"Click on the <gui style=\"button\">Back Up Now</gui> button on the "
"<gui>Overview</gui> page."
msgstr ""
"Cliquez sur le bouton <gui style=\"button\">Sauvegarder maintenant</gui> de "
"la page <gui>Vue d'ensemble</gui>."
#: C/backup-first.page:14(item/p)
msgid ""
......@@ -435,7 +442,7 @@ msgstr ""
#: C/prefs.page:41(item/title)
msgid "<gui>Folders to back up</gui>"
msgstr ""
msgstr "<gui>Dossiers à sauvegarder</gui>"
#: C/prefs.page:42(item/p)
msgid ""
......@@ -537,8 +544,8 @@ msgid ""
"Click on the <gui style=\"button\">Restore…</gui> button on the "
"<gui>Overview</gui> page."
msgstr ""
"Cliquez sur le bouton <gui style=\"button\">Restaurer…</gui> ou sur la page "
"<gui>Aperçu</gui>."
"Cliquez sur le bouton <gui style=\"button\">Restaurer…</gui> de la page "
"<gui>Vue d'ensemble</gui>."
#: C/restore-full.page:22(item/p)
msgid ""
......
......@@ -8,15 +8,14 @@ msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-09-06 11:09-0400\n"
"PO-Revision-Date: 2011-06-28 13:42+0000\n"
"Last-Translator: Launchpad Translations Administrators "
"<rosetta@launchpad.net>\n"
"PO-Revision-Date: 2011-09-25 03:16+0000\n"
"Last-Translator: Nikita Putko <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-07 04:36+0000\n"
"X-Generator: Launchpad (build 13861)\n"
"X-Launchpad-Export-Date: 2011-09-26 04:46+0000\n"
"X-Generator: Launchpad (build 14012)\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
......@@ -26,6 +25,7 @@ msgstr ""
" Eugene Marshal https://launchpad.net/~lowrider\n"
" Michael Terry https://launchpad.net/~mterry\n"
" Mihail Kravsun https://launchpad.net/~ozzymk\n"
" Nikita Putko https://launchpad.net/~ktototam98\n"
" Sergey Basalaev https://launchpad.net/~sbasalaev\n"
" Sergey Sedov https://launchpad.net/~serg-sedov\n"
" diablo https://launchpad.net/~diablo"
......@@ -76,6 +76,10 @@ msgid ""
"<gui>Keep backups</gui> option on the <gui>Schedule</gui> page. Otherwise, "
"they may end up consuming a lot of space while you’re not paying attention."
msgstr ""
"Рассмотрите возможность хранить резерные копии лишь в течение определенного "
"промежутка времени, используя опцию <gui>Хранить резервные копии</gui> на "
"вкладке <gui>Расписание</gui>. Иначе, если вы упустите это из под контроля, "
"резервные копии змогут занять очень много места."
#: C/backup-first.page:6(info/desc)
msgid "Start now"
......@@ -135,6 +139,7 @@ msgstr ""
" Eugene Marshal https://launchpad.net/~lowrider\n"
" Michael Terry https://launchpad.net/~mterry\n"
" Mihail Kravsun https://launchpad.net/~ozzymk\n"
" Nikita Putko https://launchpad.net/~ktototam98\n"
" Sergey Basalaev https://launchpad.net/~sbasalaev\n"
" Sergey Sedov https://launchpad.net/~serg-sedov\n"
" diablo https://launchpad.net/~diablo"
......@@ -320,7 +325,7 @@ msgstr "Настройки"
#: C/prefs.page:13(item/title)
msgid "<gui>Automatic backups</gui>"
msgstr ""
msgstr "<gui>Автоматические резервные копии</gui>"
#: C/prefs.page:14(item/p)
msgid ""
......@@ -336,7 +341,7 @@ msgstr ""
#: C/prefs.page:17(item/title)
msgid "<gui>Backup location</gui>"
msgstr ""
msgstr "<gui>Расположение резервных копий</gui>"
#: C/prefs.page:18(item/p)
msgid ""
......@@ -369,6 +374,8 @@ msgstr ""
msgid ""
"These services costs money. Read their rates carefully before using them."
msgstr ""
"Эти услуги не бесплатные. Перед их использованием внимательно ознакомьтесь с "
"расценками."
#: C/prefs.page:26(item/title)
msgid "Remote Servers"
......@@ -418,7 +425,7 @@ msgstr ""
#: C/prefs.page:41(item/title)
msgid "<gui>Folders to back up</gui>"
msgstr ""
msgstr "<gui>Папки для резервного копирования</gui>"
#: C/prefs.page:42(item/p)
msgid ""
......@@ -427,16 +434,24 @@ msgid ""
"modify the list. If you are only interested in backing up your own data, the "
"default of <gui>Home</gui> is sufficient."
msgstr ""
"Выберите список папок, для которых будут созданы резервные копии. Нажмите на "
"кнопки <gui style=\"button\">Добавить</gui> или <gui "
"style=\"button\">Удалить</gui> для редактирования списка. Если вам нужно "
"создать резервные копии только ваших собственных данных, достаточно "
"использовать по умолчанию кнопку <gui>Домашняя папка</gui>"
#: C/prefs.page:45(item/title)
msgid "<gui>Folders to ignore</gui>"
msgstr ""
msgstr "<gui>Игнорируемые папки</gui>"
#: C/prefs.page:46(item/p)
msgid ""
"Choose a list of folders to not back up. Press the <gui style=\"button\">Add "
"</gui> or <gui style=\"button\">Remove</gui> buttons to modify the list."
msgstr ""
"Выберите список папок, для которых не нужно создавать резервные копии. Чтобы "
"изменить список, нажимайте кнопки <gui style=\"button\">Добавить </gui> и "
"<gui style=\"button\">Удалить</gui>."
#: C/prefs.page:47(item/p)
msgid ""
......@@ -449,11 +464,11 @@ msgstr ""
#: C/prefs.page:49(note/p)
msgid "Some locations are always ignored by default:"
msgstr ""
msgstr "Некоторые файлы и папки всегда по умолчанию игнорируются:"
#: C/prefs.page:66(item/title)
msgid "<gui>Keep backups</gui>"
msgstr ""
msgstr "<gui>Хранить резервные копии</gui>"
#: C/prefs.page:67(item/p)
msgid ""
......@@ -528,6 +543,8 @@ msgid ""
"A <gui>Restore</gui> dialog will appear asking where your backup files are "
"stored (your <gui>Backup location</gui>)."
msgstr ""
"Появится диалог<gui> Восстановить</gui> с запросом указать расположение "
"резервных копий (ваше <gui>расположение резервных копий</gui>)"
#: C/restore-full.page:23(item/p)
msgid ""
......@@ -614,6 +631,8 @@ msgid ""
"Click <guiseq><gui style=\"menuitem\">File</gui><gui "
"style=\"menuitem\">Restore Missing Files…</gui></guiseq>."
msgstr ""
"Щёлкните по кнопке <guiseq><gui style=\"menuitem\">File</gui><gui "
"style=\"menuitem\">Восстановление утерянных файлов…</gui></guiseq>."
#: C/restore-lost.page:15(item/p)
msgid ""
......@@ -643,7 +662,7 @@ msgstr ""
#: C/restore-revert.page:22(note/screen)
#, no-wrap
msgid "<_:span-1/>FILE1 FILE2"
msgstr ""
msgstr "<_:span-1/>ФАЙЛ1 ФАЙЛ2"
#: C/restore-revert.page:8(info/desc)
msgid "Restore a previous version of a file"
......@@ -661,7 +680,7 @@ msgstr ""
#: C/restore-revert.page:14(item/p)
msgid "Select the file you want to revert by clicking on it."
msgstr ""
msgstr "Выберите файл для восстановления, нажав на него."
#: C/restore-revert.page:15(item/p)
msgid ""
......@@ -837,7 +856,7 @@ msgstr ""
#: C/restore-worst-case.page:47(screen/var)
#, no-wrap
msgid "ID"
msgstr ""
msgstr "ИДЕНТИФИКАТОР"
#: C/restore-worst-case.page:48(screen/var)
#, no-wrap
......@@ -860,7 +879,7 @@ msgstr ""
#: C/restore-worst-case.page:93(screen/var)
#, no-wrap
msgid "FOLDER"
msgstr ""
msgstr "ПАПКА"
#: C/restore-worst-case.page:52(item/title)
msgid "Rackspace Cloud Files"
......@@ -894,12 +913,12 @@ msgstr ""
#: C/restore-worst-case.page:93(screen/var)
#, no-wrap
msgid "USERNAME"
msgstr ""
msgstr "ИМЯ ПОЛЬЗОВАТЕЛЯ"
#: C/restore-worst-case.page:57(screen/var)
#, no-wrap
msgid "KEY"
msgstr ""
msgstr "КЛАВИША"
#: C/restore-worst-case.page:58(screen/var)
#, no-wrap
......@@ -948,7 +967,7 @@ msgstr ""
#: C/restore-worst-case.page:84(screen/var)
#, no-wrap
msgid "PORT"
msgstr ""
msgstr "ПОРТ"
#: C/restore-worst-case.page:70(item/title)
msgid "SSH"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-08-30 23:48-0400\n"
"POT-Creation-Date: 2011-09-15 11:49-0400\n"
"PO-Revision-Date: 2011-08-15 14:43+0000\n"
"Last-Translator: Michael Terry <michael.terry@canonical.com>\n"
"Language-Team: Arabic <ar@li.org>\n"
......@@ -16,13 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
"X-Launchpad-Export-Date: 2011-09-01 04:52+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Launchpad-Export-Date: 2011-09-16 04:42+0000\n"
"X-Generator: Launchpad (build 13955)\n"
#: ../data/deja-dup.desktop.in.h:1 ../data/deja-dup-ccpanel.desktop.in.h:2
#: ../data/deja-dup-preferences.desktop.in.in.h:2 ../deja-dup/Prompt.vala:93
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:126
#: ../deja-dup/StatusIcon.vala:249 ../monitor/monitor.vala:115
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:125
#: ../deja-dup/StatusIcon.vala:247 ../monitor/monitor.vala:115
#: ../preferences/preferences-main.vala:51
#: ../preferences/preferences-main.vala:63
msgid "Backup"
......@@ -351,7 +351,7 @@ msgstr[1] ""
#. Translators: %2$s is the name of a removable drive, %1$s is a folder
#. on that removable drive.
#: ../common/BackendFile.vala:86 ../common/CommonUtils.vala:442
#: ../common/BackendFile.vala:86 ../common/CommonUtils.vala:447
#, c-format
msgid "%1$s on %2$s"
msgstr ""
......@@ -362,19 +362,19 @@ msgid "Backup will begin when %s becomes connected."
msgstr ""
#: ../common/BackendFile.vala:131 ../common/BackendRackspace.vala:49
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:140
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:163
msgid "Backup will begin when a network connection becomes available."
msgstr ""
#: ../common/BackendFile.vala:362 ../common/BackendFile.vala:426
#: ../common/BackendFile.vala:357 ../common/BackendFile.vala:421
msgid "Backup location not available"
msgstr ""
#: ../common/BackendFile.vala:363
#: ../common/BackendFile.vala:358
msgid "Waiting for a network connection…"
msgstr ""
#: ../common/BackendFile.vala:426
#: ../common/BackendFile.vala:421
#, c-format
msgid "Waiting for ‘%s’ to become connected…"
msgstr ""
......@@ -383,7 +383,7 @@ msgstr ""
msgid "You must specify a Rackspace container in your preferences."
msgstr ""
#: ../common/BackendRackspace.vala:67 ../widgets/ConfigLocation.vala:191
#: ../common/BackendRackspace.vala:67 ../widgets/ConfigLocation.vala:193
msgid "Rackspace Cloud Files"
msgstr ""
......@@ -455,35 +455,35 @@ msgstr ""
msgid "_Remember secret access key"
msgstr ""
#: ../common/BackendU1.vala:156 ../widgets/ConfigLocation.vala:183
#: ../common/BackendU1.vala:179 ../widgets/ConfigLocation.vala:185
msgid "Ubuntu One"
msgstr ""
#. Translators: %s is a folder.
#: ../common/BackendU1.vala:159
#: ../common/BackendU1.vala:182
#, c-format
msgid "%s on Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:214
#: ../common/BackendU1.vala:249
msgid "Connect to Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:215
#: ../common/BackendU1.vala:250
msgid "Sign into Ubuntu One…"
msgstr ""
#. Translators: %s is the user's username
#: ../common/CommonUtils.vala:493
#: ../common/CommonUtils.vala:498
#, c-format
msgid "Home (%s)"
msgstr ""
#: ../common/CommonUtils.vala:497
#: ../common/CommonUtils.vala:502
msgid "Home"
msgstr ""
#: ../common/CommonUtils.vala:501
#: ../common/CommonUtils.vala:506
msgid "Trash"
msgstr ""
......@@ -745,15 +745,15 @@ msgstr ""
msgid "Summary"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:729
#: ../deja-dup/AssistantOperation.vala:712
msgid "Require Password?"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:731
#: ../deja-dup/AssistantOperation.vala:714
msgid "Encryption Password Needed"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:774
#: ../deja-dup/AssistantOperation.vala:757
msgid "Backup encryption password"
msgstr ""
......@@ -906,7 +906,7 @@ msgstr ""
msgid "Co_ntinue"
msgstr ""
#: ../deja-dup/Assistant.vala:347 ../deja-dup/StatusIcon.vala:94
#: ../deja-dup/Assistant.vala:347 ../deja-dup/StatusIcon.vala:93
msgid "_Resume Later"
msgstr ""
......@@ -1025,27 +1025,27 @@ msgstr ""
msgid "Open Backup Settings"
msgstr ""
#: ../deja-dup/StatusIcon.vala:95
#: ../deja-dup/StatusIcon.vala:94
msgid "_Skip Backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:127
#: ../deja-dup/StatusIcon.vala:126
msgid "Backup completed"
msgstr ""
#: ../deja-dup/StatusIcon.vala:165
#: ../deja-dup/StatusIcon.vala:164
msgid "Déjà Du_p"
msgstr ""
#: ../deja-dup/StatusIcon.vala:250
#: ../deja-dup/StatusIcon.vala:248
msgid "Starting scheduled backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:252
#: ../deja-dup/StatusIcon.vala:250
msgid "Show Progress"
msgstr ""
#: ../deja-dup/StatusIcon.vala:289
#: ../deja-dup/StatusIcon.vala:287
#, c-format
msgid "%.1f%% complete"
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-08-30 23:48-0400\n"
"POT-Creation-Date: 2011-09-15 11:49-0400\n"
"PO-Revision-Date: 2011-08-13 04:27+0000\n"
"Last-Translator: Michael Terry <michael.terry@canonical.com>\n"
"Language-Team: Asturian <ast@li.org>\n"
......@@ -15,13 +15,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2011-09-01 04:52+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Launchpad-Export-Date: 2011-09-16 04:42+0000\n"
"X-Generator: Launchpad (build 13955)\n"
#: ../data/deja-dup.desktop.in.h:1 ../data/deja-dup-ccpanel.desktop.in.h:2
#: ../data/deja-dup-preferences.desktop.in.in.h:2 ../deja-dup/Prompt.vala:93
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:126
#: ../deja-dup/StatusIcon.vala:249 ../monitor/monitor.vala:115
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:125
#: ../deja-dup/StatusIcon.vala:247 ../monitor/monitor.vala:115
#: ../preferences/preferences-main.vala:51
#: ../preferences/preferences-main.vala:63
msgid "Backup"
......@@ -343,7 +343,7 @@ msgstr[1] ""
#. Translators: %2$s is the name of a removable drive, %1$s is a folder
#. on that removable drive.
#: ../common/BackendFile.vala:86 ../common/CommonUtils.vala:442
#: ../common/BackendFile.vala:86 ../common/CommonUtils.vala:447
#, c-format
msgid "%1$s on %2$s"
msgstr ""
......@@ -354,19 +354,19 @@ msgid "Backup will begin when %s becomes connected."
msgstr ""
#: ../common/BackendFile.vala:131 ../common/BackendRackspace.vala:49
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:140
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:163
msgid "Backup will begin when a network connection becomes available."
msgstr ""
#: ../common/BackendFile.vala:362 ../common/BackendFile.vala:426
#: ../common/BackendFile.vala:357 ../common/BackendFile.vala:421
msgid "Backup location not available"
msgstr ""
#: ../common/BackendFile.vala:363
#: ../common/BackendFile.vala:358
msgid "Waiting for a network connection…"
msgstr ""
#: ../common/BackendFile.vala:426
#: ../common/BackendFile.vala:421
#, c-format
msgid "Waiting for ‘%s’ to become connected…"
msgstr ""
......@@ -375,7 +375,7 @@ msgstr ""
msgid "You must specify a Rackspace container in your preferences."
msgstr ""
#: ../common/BackendRackspace.vala:67 ../widgets/ConfigLocation.vala:191
#: ../common/BackendRackspace.vala:67 ../widgets/ConfigLocation.vala:193
msgid "Rackspace Cloud Files"
msgstr ""
......@@ -447,35 +447,35 @@ msgstr ""
msgid "_Remember secret access key"
msgstr ""
#: ../common/BackendU1.vala:156 ../widgets/ConfigLocation.vala:183
#: ../common/BackendU1.vala:179 ../widgets/ConfigLocation.vala:185
msgid "Ubuntu One"
msgstr ""
#. Translators: %s is a folder.
#: ../common/BackendU1.vala:159
#: ../common/BackendU1.vala:182
#, c-format
msgid "%s on Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:214
#: ../common/BackendU1.vala:249
msgid "Connect to Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:215
#: ../common/BackendU1.vala:250
msgid "Sign into Ubuntu One…"
msgstr ""
#. Translators: %s is the user's username
#: ../common/CommonUtils.vala:493
#: ../common/CommonUtils.vala:498
#, c-format
msgid "Home (%s)"
msgstr ""
#: ../common/CommonUtils.vala:497
#: ../common/CommonUtils.vala:502
msgid "Home"
msgstr ""
#: ../common/CommonUtils.vala:501
#: ../common/CommonUtils.vala:506
msgid "Trash"
msgstr ""
......@@ -737,15 +737,15 @@ msgstr ""
msgid "Summary"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:729
#: ../deja-dup/AssistantOperation.vala:712
msgid "Require Password?"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:731
#: ../deja-dup/AssistantOperation.vala:714
msgid "Encryption Password Needed"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:774
#: ../deja-dup/AssistantOperation.vala:757
msgid "Backup encryption password"
msgstr ""
......@@ -898,7 +898,7 @@ msgstr ""
msgid "Co_ntinue"
msgstr ""
#: ../deja-dup/Assistant.vala:347 ../deja-dup/StatusIcon.vala:94
#: ../deja-dup/Assistant.vala:347 ../deja-dup/StatusIcon.vala:93
msgid "_Resume Later"
msgstr ""
......@@ -1017,27 +1017,27 @@ msgstr ""
msgid "Open Backup Settings"
msgstr ""
#: ../deja-dup/StatusIcon.vala:95
#: ../deja-dup/StatusIcon.vala:94
msgid "_Skip Backup"
msgstr "Omitir la copia de _seguridá"
#: ../deja-dup/StatusIcon.vala:127
#: ../deja-dup/StatusIcon.vala:126
msgid "Backup completed"
msgstr ""
#: ../deja-dup/StatusIcon.vala:165
#: ../deja-dup/StatusIcon.vala:164
msgid "Déjà Du_p"
msgstr "Déjà Du_p"
#: ../deja-dup/StatusIcon.vala:250
#: ../deja-dup/StatusIcon.vala:248
msgid "Starting scheduled backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:252
#: ../deja-dup/StatusIcon.vala:250
msgid "Show Progress"
msgstr ""
#: ../deja-dup/StatusIcon.vala:289
#: ../deja-dup/StatusIcon.vala:287
#, c-format
msgid "%.1f%% complete"
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-08-30 23:48-0400\n"
"POT-Creation-Date: 2011-09-15 11:49-0400\n"
"PO-Revision-Date: 2011-08-13 04:33+0000\n"
"Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
......@@ -15,13 +15,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2011-09-01 04:52+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Launchpad-Export-Date: 2011-09-16 04:42+0000\n"
"X-Generator: Launchpad (build 13955)\n"
#: ../data/deja-dup.desktop.in.h:1 ../data/deja-dup-ccpanel.desktop.in.h:2
#: ../data/deja-dup-preferences.desktop.in.in.h:2 ../deja-dup/Prompt.vala:93
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:126
#: ../deja-dup/StatusIcon.vala:249 ../monitor/monitor.vala:115
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:125
#: ../deja-dup/StatusIcon.vala:247 ../monitor/monitor.vala:115
#: ../preferences/preferences-main.vala:51
#: ../preferences/preferences-main.vala:63
msgid "Backup"
......@@ -377,7 +377,7 @@ msgstr[1] "Възстановяване на файлове от резервн
#. Translators: %2$s is the name of a removable drive, %1$s is a folder
#. on that removable drive.
#: ../common/BackendFile.vala:86 ../common/CommonUtils.vala:442
#: ../common/BackendFile.vala:86 ../common/CommonUtils.vala:447
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s на %2$s"
......@@ -388,20 +388,20 @@ msgid "Backup will begin when %s becomes connected."
msgstr "Създаването на резевни копия ще започне, когато %s се свърже."
#: ../common/BackendFile.vala:131 ../common/BackendRackspace.vala:49
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:140
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:163
msgid "Backup will begin when a network connection becomes available."
msgstr ""
"Създаването на резервни копия ще започне, когато има налична мрежова връзка."
#: ../common/BackendFile.vala:362 ../common/BackendFile.vala:426
#: ../common/BackendFile.vala:357 ../common/BackendFile.vala:421
msgid "Backup location not available"
msgstr "Местоположението за резервни копия не е налично"
#: ../common/BackendFile.vala:363
#: ../common/BackendFile.vala:358
msgid "Waiting for a network connection…"
msgstr ""
#: ../common/BackendFile.vala:426
#: ../common/BackendFile.vala:421
#, c-format
msgid "Waiting for ‘%s’ to become connected…"
msgstr "Изчакване за ‘%s’ да се свърже…"
......@@ -410,7 +410,7 @@ msgstr "Изчакване за ‘%s’ да се свърже…"
msgid "You must specify a Rackspace container in your preferences."
msgstr "В настройките си трябва да зададете контейнер на Rackspace."