From 7772501cdfa5b42f99005aa1a3f375018c4495c7 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 10 Jul 2014 17:23:28 +0200 Subject: [PATCH 1/5] Remove unused socketPath variable. --- src/mirall/socketapi.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index 8a0b7c629..ec34e0263 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -160,15 +160,6 @@ SocketApi::SocketApi(QObject* parent, const QUrl& localFile) : QObject(parent) , _localServer(0) { - QString socketPath; - if (Utility::isWindows()) { - socketPath = QLatin1String("\\\\.\\pipe\\") - + Theme::instance()->appName(); - } else { - socketPath = localFile.toLocalFile(); - - } - // setup socket _localServer = new QTcpServer(this); _localServer->listen( QHostAddress::LocalHost, 33001); From a281b36d6fe40051082d1158752af70d644795a1 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 11 Jul 2014 11:30:47 +0200 Subject: [PATCH 2/5] SocketAPI: send the path with UPDATE_VIEW --- src/mirall/socketapi.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index ec34e0263..baac10778 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -222,9 +222,17 @@ void SocketApi::slotReadSocket() } } -void SocketApi::slotSyncStateChanged(const QString&) +void SocketApi::slotSyncStateChanged(const QString& alias) { - broadcastMessage("UPDATE_VIEW"); + QString msg = QLatin1String("UPDATE_VIEW"); + + Folder *f = FolderMan::instance()->folder(alias); + if (f) { + msg.append(QLatin1String(":")); + msg.append(QDir::cleanPath(f->path())); + } + + broadcastMessage(msg); } void SocketApi::slotJobCompleted(const QString &folder, const SyncFileItem &item) From b6c9b5645c6face96309098cfbde2f903d9b4e52 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 13 Jul 2014 01:25:20 -0400 Subject: [PATCH 3/5] [tx-robot] updated from transifex --- translations/mirall_zh_CN.ts | 52 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index d1a625170..7f0d13d8f 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -599,12 +599,12 @@ Are you sure you want to perform this operation? No E-Tag received from server, check Proxy/Gateway - + 未能收到来自服务器的 E-Tag，请检查代理/网关 We received a different E-Tag for resuming. Retrying next time. - + 我们收到了不同的恢复 E-Tag，将在下次尝试。 @@ -931,28 +931,28 @@ Checked items will also be deleted if they prevent a directory from being remove New Update Ready - + 新的更新已经准备就绪 A new update is about to be installed. The updater may ask for additional privileges during the process. - + 更新将会安装。安装过程可能会要求额外的权限。 Downloading version %1. Please wait... - + 正在下载版本 %1，请稍后.... Version %1 available. Restart application to start the update. - + 版本 %1 现在可用，请重启应用以开始更新。 Could not download update. Please click <a href='%1'>here</a> to download the update manually. - + 无法下载更新，请点击<a href='%1'>此处</a>手动下载更新。 @@ -1261,12 +1261,12 @@ It is not advisable to use it. No E-Tag received from server, check Proxy/Gateway - + 未能收到来自服务器的 E-Tag，请检查代理/网关 We received a different E-Tag for resuming. Retrying next time. - + 我们收到了不同的恢复 E-Tag，将在下次尝试。 @@ -1583,17 +1583,17 @@ It is not advisable to use it. <h3>Certificate Details</h3> - + <h3>证书信息</h3> Common Name (CN): - + 常用名 (CN)： Subject Alternative Names: - + 主体备用名称： @@ -1603,7 +1603,7 @@ It is not advisable to use it. Organizational Unit (OU): - + 单位 (OU)： @@ -1618,22 +1618,22 @@ It is not advisable to use it. Serial: - + 序列号： <h3>Issuer</h3> - + <h3>颁发者</h3> Issuer: - + 颁发者： Issued on: - + 颁发于： @@ -1643,7 +1643,7 @@ It is not advisable to use it. <h3>Fingerprints</h3> - + <h3>证书指纹</h3> @@ -1663,12 +1663,12 @@ It is not advisable to use it. <p><b>Note:</b> This certificate was manually approved</p> - + <p><b>注意：</b>此证书经手动批准</p> %1 (self-signed) - + %1 (自签署) @@ -1679,7 +1679,8 @@ It is not advisable to use it. This connection is encrypted using %1 bit %2. - + 此连接通过 %1 位的 %2 加密。 + @@ -1690,7 +1691,8 @@ It is not advisable to use it. This connection is NOT secure as it is not encrypted. - + 此连接未经过加密。 + @@ -1897,7 +1899,7 @@ It is not advisable to use it. CSync failed to access - + 访问 CSync 失败 @@ -1933,12 +1935,12 @@ It is not advisable to use it. Symbolic links are not supported in syncing. - + 符号链接不被同步支持。 File is listed on the ignore list. - + 文件在忽略列表中。 From eb0f0740976b329d6c26e9f4c95ca96b562d79da Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 13 Jul 2014 02:06:11 -0400 Subject: [PATCH 4/5] [tx-robot] updated from transifex --- admin/win/nsi/l10n/SimpChinese.nsh | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/admin/win/nsi/l10n/SimpChinese.nsh b/admin/win/nsi/l10n/SimpChinese.nsh index d28e6ab6e..4041ec542 100644 --- a/admin/win/nsi/l10n/SimpChinese.nsh +++ b/admin/win/nsi/l10n/SimpChinese.nsh @@ -1,5 +1,6 @@ # Auto-generated - do not modify StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "查看版本日志" +StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "有 ${APPLICATION_EXECUTABLE} 项进程需要关闭。$\n您想让安装程序关闭这些进程吗？" StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "杀死${APPLICATION_EXECUTABLE}进程。" StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "未找到要杀死的进程！" StrCpy $PageReinstall_NEW_Field_1 "您的系统已经安装${APPLICATION_NAME}较老版本。建议安装前卸载当前版本。选择将要执行的操作，点击下一步继续。" @@ -7,11 +8,15 @@ StrCpy $PageReinstall_NEW_Field_2 "在安装前先卸载" StrCpy $PageReinstall_NEW_Field_3 "不要卸载" StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "已经安装" StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "选择如何安装${APPLICATION_NAME}。" +StrCpy $PageReinstall_OLD_Field_1 "较新版本的 ${APPLICATION_NAME} 已经安装！安装较旧版本的程序是不推荐的。如果您希望继续安装较旧版本，建议先卸载较新版本。选择您想要执行的操作并点击下一步以继续。" +StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} 已经安装。\n请选择想要执行的操作并点击下一步。" StrCpy $PageReinstall_SAME_Field_2 "增加/重装组件" StrCpy $PageReinstall_SAME_Field_3 "卸载${APPLICATION_NAME}" StrCpy $UNINSTALLER_APPDATA_TITLE "卸载${APPLICATION_NAME}" +StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "选择需要执行的维护选项。" StrCpy $SEC_APPLICATION_DETAILS "安装${APPLICATION_NAME}基本组件。" StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "开始菜单程序快捷方式" +StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "添加 ${APPLICATION_NAME} 快捷方式到开始菜单。" StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "桌面快捷方式" StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "创建桌面快捷方式" StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "快速启动栏快捷方式" @@ -20,25 +25,20 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME}基本组件。" StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}快捷方式。" StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME}桌面快捷方式。" StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME}快速启动栏快捷方式。" +StrCpy $UNINSTALLER_APPDATA_SUBTITLE "从电脑中移除 ${APPLICATION_NAME} 数据文件夹。" +StrCpy $UNINSTALLER_APPDATA_LABEL_1 "移除 ${APPLICATION_NAME} 数据文件夹？" +StrCpy $UNINSTALLER_APPDATA_LABEL_2 "选择以删除数据文件夹，不选择以保留数据文件夹内容供后续使用。" StrCpy $UNINSTALLER_APPDATA_CHECKBOX "删除数据文件。" StrCpy $UNINSTALLER_FILE_Detail "覆盖卸载器" +StrCpy $UNINSTALLER_REGISTRY_Detail "正在写入注册表" StrCpy $UNINSTALLER_FINISHED_Detail "完成" +StrCpy $UNINSTALL_MESSAGEBOX "${APPLICATION_NAME} 可能并没有安装在 $INSTDIR。$\n$\n仍然继续吗？(不推荐)" +StrCpy $UNINSTALL_ABORT "用户取消了卸载" StrCpy $INIT_NO_QUICK_LAUNCH "快速启动栏快捷方式(N/A)" StrCpy $INIT_NO_DESKTOP "桌面快捷方式(覆盖)" +StrCpy $UAC_ERROR_ELEVATE "无法获得权限，错误：" +StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "安装程序需要管理员权限，请重试" +StrCpy $INIT_INSTALLER_RUNNING "安装程序已经运行。" +StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "卸载程序需要管理员权限，请重试" +StrCpy $INIT_UNINSTALLER_RUNNING "卸载程序已经运行。" StrCpy $SectionGroup_Shortcuts "快捷方式" -StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" -StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue." -StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue." -StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform." -StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu." -StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer." -StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?" -StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder." -StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys" -StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" -StrCpy $UNINSTALL_ABORT "Uninstall aborted by user" -StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:" -StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again" -StrCpy $INIT_INSTALLER_RUNNING "The installer is already running." -StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again" -StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running." From dde06dfabaf271aefd9e78af845af8d61e4c6d14 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 14 Jul 2014 01:25:21 -0400 Subject: [PATCH 5/5] [tx-robot] updated from transifex --- translations/mirall_ru.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index cd775ee1a..3641ac191 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -1354,7 +1354,7 @@ It is not advisable to use it. The file was renamed but is part of a read only share. The original file was restored. - + Этот файл был переименован но является частью распространения только для чтения. Оригинальный файл был восстановлен.