diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/skins/default/xui/zh | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/skins/default/xui/zh')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/zh/notifications.xml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml index 1234e02..1b85998 100644 --- a/linden/indra/newview/skins/default/xui/zh/notifications.xml +++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml | |||
| @@ -3647,24 +3647,6 @@ GLOW — 发光 | |||
| 3647 | name="okignore" | 3647 | name="okignore" |
| 3648 | yestext="OK"/> | 3648 | yestext="OK"/> |
| 3649 | </notification> | 3649 | </notification> |
| 3650 | |||
| 3651 | <notification name="WebLaunchImprudenceBlog"> | ||
| 3652 | 前往 Imprudence 官方日志阅读最新的新闻和信息。 | ||
| 3653 | <usetemplate | ||
| 3654 | ignoretext="打开网络浏览器阅读网络日志时" | ||
| 3655 | name="okcancelignore" | ||
| 3656 | notext="取消" | ||
| 3657 | yestext="打开网页"/> | ||
| 3658 | </notification> | ||
| 3659 | |||
| 3660 | <notification name="WebLaunchImprudenceForums"> | ||
| 3661 | 前往 Imprudence 官方论坛讨论 Imprudence 工程。 | ||
| 3662 | <usetemplate | ||
| 3663 | ignoretext="打开网络浏览器阅读论坛时" | ||
| 3664 | name="okcancelignore" | ||
| 3665 | notext="取消" | ||
| 3666 | yestext="打开网页"/> | ||
| 3667 | </notification> | ||
| 3668 | 3650 | ||
| 3669 | <notification | 3651 | <notification |
| 3670 | icon="alert.tga" | 3652 | icon="alert.tga" |