Mercurialhg/netbeans/l10n / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | help
Automated merge with http://hg.netbeans.org/release61/l10n
authorrnovak@netbeans.org
Tue, 30 Sep 2008 17:38:15 +0200
changeset 10039d38a972eaa6
parent 1002 a4844e6f0599
parent 1001 c10ba92265cc
child 1004 6192837bc3df
Automated merge with http://hg.netbeans.org/release61/l10n 
     1.1 --- a/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties	Tue Sep 30 17:37:55 2008 +0200
     1.2 +++ b/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties	Tue Sep 30 17:38:15 2008 +0200
     1.3 @@ -44,8 +44,8 @@
     1.4  # NbServiceTagCreateAction.java
     1.5  
     1.6  #NOI18N
     1.7 -NSTCA.installer.source.name=NetBeans IDE {display-version} \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
     1.8 +NSTCA.installer.source.name=NetBeans IDE {display-version} Installer
     1.9  #NOI18N
    1.10 -NSTCA.installer.source.name.jdk={0} \u3068 NetBeans IDE {display-version} \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
    1.11 +NSTCA.installer.source.name.jdk={0} and NetBeans IDE {display-version} Installer
    1.12  #NOI18N
    1.13 -NSTCA.installer.source.name.jtb=Java EE 5 Tools Bundle Update 5 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
    1.14 +NSTCA.installer.source.name.jtb=Java EE 5 Tools Bundle Update 6 Installer

     2.1 --- a/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_ja.properties	Tue Sep 30 17:37:55 2008 +0200
     2.2 +++ b/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_ja.properties	Tue Sep 30 17:38:15 2008 +0200
     2.3 @@ -115,7 +115,7 @@
     2.4  
     2.5  NWP.welcome.text.header=<html><h2 style=''color: #FF8E00; bold''>NetBeans IDE {display-version} \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d</h2>
     2.6  NWP.welcome.text.header.jdk=<html><h2 style="color: #000000; bold">{0} \u3068 NetBeans IDE {display-version} \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d</h2>
     2.7 -NWP.welcome.text.header.jtb=<html><h2 style="color: #FF8E00; bold">Java Platform Enterprise Edition 5 Tools Bundle Update 5 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d</h2>
     2.8 +NWP.welcome.text.header.jtb=<html><h2 style="color: #FF8E00; bold">Java Platform Enterprise Edition 5 Tools Bundle Update 6 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d</h2>
     2.9  NWP.welcome.text.header.nbgfmysql=<html><h2 style="color: #FF8E00; bold">NetBeans IDE \u3068 GlassFish/MySQL \u30d0\u30f3\u30c9\u30eb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d</h2>
    2.10  
    2.11  NWP.welcome.text.header.mysql=\u3053\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u306f\u3001NetBeans IDE \u3068\u9078\u629e\u3057\u305f\u30b5\u30fc\u30d0\u30fc\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\u3002<br><br>IDE \u3068\u3068\u3082\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u30b5\u30fc\u30d0\u30fc\u3092\u9078\u629e:<br><br>

     3.1 --- a/src/pt_BR/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_pt_BR.properties	Tue Sep 30 17:37:55 2008 +0200
     3.2 +++ b/src/pt_BR/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_pt_BR.properties	Tue Sep 30 17:38:15 2008 +0200
     3.3 @@ -44,8 +44,8 @@
     3.4  # NbServiceTagCreateAction.java
     3.5  
     3.6  #NOI18N
     3.7 -NSTCA.installer.source.name=Instalador do NetBeans IDE {display-version}
     3.8 +NSTCA.installer.source.name=NetBeans IDE {display-version} Installer
     3.9  #NOI18N
    3.10 -NSTCA.installer.source.name.jdk=Instalador do {0} e do NetBeans IDE {display-version}
    3.11 +NSTCA.installer.source.name.jdk={0} and NetBeans IDE {display-version} Installer
    3.12  #NOI18N
    3.13 -NSTCA.installer.source.name.jtb=Instalador do Java EE 5 Tools Bundle Atualiza\u00e7\u00e3o 5
    3.14 +NSTCA.installer.source.name.jtb=Java EE 5 Tools Bundle Update 6 Installer

     4.1 --- a/src/pt_BR/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_pt_BR.properties	Tue Sep 30 17:37:55 2008 +0200
     4.2 +++ b/src/pt_BR/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_pt_BR.properties	Tue Sep 30 17:38:15 2008 +0200
     4.3 @@ -115,7 +115,7 @@
     4.4  
     4.5  NWP.welcome.text.header=<html><h2 style="color: #FF8E00; bold">Bem-vindo ao instalador do NetBeans IDE {display-version} </h2>
     4.6  NWP.welcome.text.header.jdk=<html><h2 style="color: #000000; bold">Bem-vindo ao instalador do {0} e do NetBeans IDE {display-version} </h2>
     4.7 -NWP.welcome.text.header.jtb=<html><h2 style="color: #FF8E00; bold">Bem-vindo ao Instalador da Plataforma Java, Enterprise Edition 5 Tools Bundle Update 5</h2>
     4.8 +NWP.welcome.text.header.jtb=<html><h2 style="color: #FF8E00; bold">Bem-vindo ao Instalador da Plataforma Java, Enterprise Edition 5 Tools Bundle Update 6</h2>
     4.9  NWP.welcome.text.header.nbgfmysql=<html><h2 style="color: #FF8E00; bold">Bem-vindo ao instalador do pacote NetBeans IDE com GlassFish e MySQL</h2>
    4.10  
    4.11  NWP.welcome.text.header.mysql=O instalador instalar\u00e1 o NetBeans IDE com os servidores selecionados.<br><br>Selecione os servidores a serem instaldos com o IDE:<br><br>

     5.1 --- a/src/zh_CN/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_zh_CN.properties	Tue Sep 30 17:37:55 2008 +0200
     5.2 +++ b/src/zh_CN/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_zh_CN.properties	Tue Sep 30 17:38:15 2008 +0200
     5.3 @@ -48,4 +48,4 @@
     5.4  #NOI18N
     5.5  NSTCA.installer.source.name.jdk={0} and NetBeans IDE {display-version} Installer
     5.6  #NOI18N
     5.7 -NSTCA.installer.source.name.jtb=Java EE 5 Tools Bundle Update 5 Installer
     5.8 +NSTCA.installer.source.name.jtb=Java EE 5 Tools Bundle Update 6 Installer

     6.1 --- a/src/zh_CN/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_zh_CN.properties	Tue Sep 30 17:37:55 2008 +0200
     6.2 +++ b/src/zh_CN/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_zh_CN.properties	Tue Sep 30 17:38:15 2008 +0200
     6.3 @@ -115,7 +115,7 @@
     6.4  
     6.5  NWP.welcome.text.header=<html><h2 style="color: #FF8E00; bold">\u6b22\u8fce\u4f7f\u7528 NetBeans IDE {display-version} \u7684\u5b89\u88c5\u7a0b\u5e8f</h2>
     6.6  NWP.welcome.text.header.jdk=<html><h2 style="color: #000000; bold">\u6b22\u8fce\u4f7f\u7528 {0} \u548c NetBeans IDE {display-version} \u7684\u5b89\u88c5\u7a0b\u5e8f</h2>
     6.7 -NWP.welcome.text.header.jtb=<html><h2 style="color: #FF8E00; bold">\u6b22\u8fce\u4f7f\u7528 Java Platform, Enterprise Edition 5 Tools Bundle Update 5 \u5b89\u88c5\u7a0b\u5e8f</h2>
     6.8 +NWP.welcome.text.header.jtb=<html><h2 style="color: #FF8E00; bold">\u6b22\u8fce\u4f7f\u7528 Java Platform, Enterprise Edition 5 Tools Bundle Update 6 \u5b89\u88c5\u7a0b\u5e8f</h2>
     6.9  NWP.welcome.text.header.nbgfmysql=<html><h2 style="color: #FF8E00; bold">\u6b22\u8fce\u4f7f\u7528\u5e26\u6709 GlassFish \u548c MySQL \u7684 NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5305</h2>
    6.10  
    6.11  NWP.welcome.text.header.mysql=\u5b89\u88c5\u7a0b\u5e8f\u5c06\u5b89\u88c5 NetBeans IDE \u4ee5\u53ca\u9009\u5b9a\u7684\u670d\u52a1\u5668\u3002<br><br>\u8bf7\u9009\u62e9\u8981\u4e0e IDE \u4e00\u8d77\u5b89\u88c5\u7684\u670d\u52a1\u5668\uff1a<br><br>
hg/netbeans/l10n