diff options
Diffstat (limited to 'translations/mirall_ru.ts')
| -rw-r--r-- | translations/mirall_ru.ts | 636 |
1 files changed, 212 insertions, 424 deletions
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 77baa0fc8..c3aecd696 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -7,22 +7,17 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Синхронизация каталогов</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Выберите локальную папку на вашем компьютере для синхронизации:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Выбрать...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Псевдоним каталога :</translation> </message> @@ -35,32 +30,27 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Назначение синхронизации</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Выберите папку назначения</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Добавить папку</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation>Изменить проигнорированные файлы</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Удалить учётную запись</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Изменить учётную запись</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Синхронизация статуса</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Подключен к <server> как <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Добавить...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Пауза</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Сброс</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Инфо...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Использование хранилища</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Продолжить</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Подтвердите удаление папки</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source> <translation><p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие не удалит файлы с клиента.</p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Подтвердить сброс папки</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Проверка %1 соединения...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>Не удалось подключиться к %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Синхронизация начата</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Выход</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Управляемые папки:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Папка %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Нет папок для синхронизации.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Расчет файла</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Протокол синхронизации</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Неопределнённый статус папки</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Папка ожидает начала синхронизации.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Определение файлов для синхронизации.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Локальный каталог %1 не существует.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Сервер не доступен.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 должен быть каталогом, но не является таковым.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Идет синхронизация.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 не читается.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Последняя синхронизация была удачна.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Ошибка синхронизации.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Ошибка установки.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Неизвестный статус ошибки.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (завершено %n сек. назад)</numerusform><numerusform>%1 (завершено %n сек. назад)</numerusform><numerusform>%1 (завершено %n сек. назад)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (завершено %n мин. назад)</numerusform><numerusform>%1 (завершено %n мин. назад)</numerusform><numerusform>%1 (завершено %n мин. назад)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Скопировано в буфер обмена</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Протокол синхронизации был скопирован в буфер обмена.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Синхронизированные файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Новые файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Удаленные файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Переименованные файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Проигнорированные файлы</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Ошибки</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Конфликты</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Загружено</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Скачано</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Локальный каталог %1 не существует.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 должен быть каталогом, но не является таковым.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 не читается.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync поток закрыт.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Ожидает, чтобы начать синхронизацию.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Мастер папка</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Размер</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Неопределенное состоянии папки</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Папка ожидает начала синхронизации.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Идет синхронизация.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Последняя синхронизация прошла успешно.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Ошибка синхронизации.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Ошибка установки.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Неопределенное состояние ошибки.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Поиск:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Найти</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Очистить журнал.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Сохранить</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Сохранить файл журнала на диск для отладки.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Файл '%1'<br/>не может быть открыт на запись.<br/><br/>Журнал <b>не может</b> быть сохранён!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Сохранить файл журнала</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Файл журнала не может быть записан</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Ошибка переименования папки</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Невозможно стереть папку и создать её резервную копию так как папка или файл в ней открыты в другой программе. Пожалуйста закройте папку или файл и повторите попытку, либо прервите мастер настройки.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальная папка для синхронизации %1 успешно создана!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Не удалось подключиться к %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Локальная синхронизация папки %1 уже существует, ее настройки для синхронизации.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Создание локальной папки синхронизации %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ок</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>не удалось.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Не удалось создать локальную папку синхронизации %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Не удалось получить доступ к удаленной папке!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>создание папки на ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Удалённая папка %1 успешно создана.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удалённая папка %1 уже существует. Подключение к ней для синхронизации.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Создание папки завершилось с HTTP-ошибкой %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Не удалось создать удаленную папку — представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте параметры доступа.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Удаленное создание папки не удалось, вероятно, потому, что предоставленные учетные данные неверны.</font><br/>Пожалуйста, вернитесь назад и проверьте данные.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Удаленная папка %1 не создана из-за ошибки <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Установлено соединение синхронизации с %1 к удалённой директории %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Соединение с %1 установлено успешно!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Подключение к %1 не воможно. Пожалуйста, проверьте еще раз.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Доступен новый файл</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' было синхронизировано с этой машиной.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Доступны новые файлы</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' и ещё %n другой файл(ов) были синхронизированны с этой машиной.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были синхронизированны с этой машиной.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были синхронизированны с этой машиной.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Файл удалён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' был удалён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Файлы удалены</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' и ещё %n другой файл(ов) были удалены.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были удалены.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были удалены.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Файл обновлён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' был обновлён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Файлы обновлены</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' и ещё %n другой файл(ов) были обновленны.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были обновленны.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были обновленны.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Введите адрес ownCloud, к которому вы хотите подключиться (без http или https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Адрес сервера</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Название ошибки</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>System Tray не доступна</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> |