diff --git a/shadowsocks-csharp/Controller/SystemProxy.cs b/shadowsocks-csharp/Controller/SystemProxy.cs index fa3c5a8e..c8cc6f8d 100755 --- a/shadowsocks-csharp/Controller/SystemProxy.cs +++ b/shadowsocks-csharp/Controller/SystemProxy.cs @@ -48,10 +48,11 @@ namespace Shadowsocks.Controller //Must Notify IE first, or the connections do not chanage CopyProxySettingFromLan(); } - catch (Exception) + catch (Exception e) { - MessageBox.Show("can not change registry!"); - throw; + Logging.LogUsefulException(e); + // TODO this should be moved into views + MessageBox.Show(I18N.GetString("Failed to update registry")); } } @@ -68,10 +69,11 @@ namespace Shadowsocks.Controller SystemProxy.NotifyIE(); CopyProxySettingFromLan(); } - catch (Exception) + catch (Exception e) { - MessageBox.Show("can not change registry!"); - throw; + Logging.LogUsefulException(e); + // TODO this should be moved into views + MessageBox.Show(I18N.GetString("Failed to update registry")); } } diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt index 82ea1744..ed6dfbd8 100644 --- a/shadowsocks-csharp/Data/cn.txt +++ b/shadowsocks-csharp/Data/cn.txt @@ -43,5 +43,6 @@ Disabled=已禁用代理 Update PAC from GFWList=从 GFWList 更新 PAC Failed to update PAC file =更新 PAC 文件失败 PAC updated=更新 PAC 成功 -"Failed to find QRCode=无法找到二维码 +No QRCode found. Try to zoom in or move it to the center of the screen.=找不到二维码,尝试把它放大或者移动到靠近屏幕中间的位置 Failed to decode QRCode=无法解析二维码 +Failed to update registry=无法修改注册表 diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs index c64be08c..f1258cd0 100755 --- a/shadowsocks-csharp/View/MenuViewController.cs +++ b/shadowsocks-csharp/View/MenuViewController.cs @@ -435,7 +435,7 @@ namespace Shadowsocks.View } } } - MessageBox.Show(I18N.GetString("Failed to find QRCode")); + MessageBox.Show(I18N.GetString("No QRCode found. Try to zoom in or move it to the center of the screen.")); } void splash_FormClosed(object sender, FormClosedEventArgs e) @@ -451,7 +451,7 @@ namespace Shadowsocks.View private void AutoStartupItem_Click(object sender, EventArgs e) { AutoStartupItem.Checked = !AutoStartupItem.Checked; if (!AutoStartup.Set(AutoStartupItem.Checked)) { - MessageBox.Show("Failed to edit registry"); + MessageBox.Show(I18N.GetString("Failed to update registry")); } } }