Skip to content

Commit 7732c39

Browse files
committed
Merge in 'release/3.1' changes
2 parents ed14382 + 8a3f61f commit 7732c39

File tree

15 files changed

+15
-15
lines changed

15 files changed

+15
-15
lines changed

src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">確定(&amp;O)</String>
6060
<String Id="FilesInUseCancelButton">取消(&amp;C)</String>
6161

62-
<String Id="Welcome">歡迎使用 [WixBundle] 安裝程式。</String>
62+
<String Id="Welcome">歡迎使用 [WixBundleName] 安裝程式。</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;授權條款&lt;/a&gt;&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隱私權聲明&lt;/a&gt;。</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Zrušit</String>
6161

62-
<String Id="Welcome">Vítá vás instalační program produktu [WixBundle]</String>
62+
<String Id="Welcome">Vítá vás instalační program produktu [WixBundleName]</String>
6363
<String Id="EulaPrivacy">[WixBundleName] – &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;licenční podmínky&lt;/a&gt; a &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Abbrechen</String>
6161

62-
<String Id="Welcome">Willkommen beim Setup von [WixBundle].</String>
62+
<String Id="Welcome">Willkommen beim Setup von [WixBundleName].</String>
6363
<String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Lizenzbedingungen&lt;/a&gt; und &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;Datenschutzerklärung&lt;/a&gt; für [WixBundleName].</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Cancel</String>
6161

62-
<String Id="Welcome">Welcome to the [WixBundle] Setup.</String>
62+
<String Id="Welcome">Welcome to the [WixBundleName] Setup.</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Annuler</String>
6161

62-
<String Id="Welcome">Bienvenue dans le programme d'installation de [WixBundle].</String>
62+
<String Id="Welcome">Bienvenue dans le programme d'installation de [WixBundleName].</String>
6363
<String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Termes du contrat de licence&lt;/a&gt; et &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;déclaration de confidentialité&lt;/a&gt; de [WixBundleName].</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1040/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Annulla</String>
6161

62-
<String Id="Welcome">Installazione di [WixBundle].</String>
62+
<String Id="Welcome">Installazione di [WixBundleName].</String>
6363
<String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Condizioni di licenza&lt;/a&gt; e &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;informativa sulla privacy&lt;/a&gt; di [WixBundleName].</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1041/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@
6060
<String Id="FilesInUseOkButton">OK(&amp;O)</String>
6161
<String Id="FilesInUseCancelButton">キャンセル(&amp;C)</String>
6262

63-
<String Id="Welcome">[WixBundle] のセットアップへようこそ。</String>
63+
<String Id="Welcome">[WixBundleName] のセットアップへようこそ。</String>
6464
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;ライセンス条項&lt;/a&gt;および&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;プライバシーに関する声明&lt;/a&gt;。</String>
6565
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1042/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">확인(&amp;O)</String>
6060
<String Id="FilesInUseCancelButton">취소(&amp;C)</String>
6161

62-
<String Id="Welcome">[WixBundle] 설치를 시작합니다.</String>
62+
<String Id="Welcome">[WixBundleName] 설치를 시작합니다.</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;사용 조건&lt;/a&gt;&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;개인정보처리방침&lt;/a&gt;.</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1045/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Anuluj</String>
6161

62-
<String Id="Welcome">Witamy w instalatorze produktu [WixBundle].</String>
62+
<String Id="Welcome">Witamy w instalatorze produktu [WixBundleName].</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;postanowienia licencyjne&lt;/a&gt; i &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;oświadczenie o ochronie prywatności&lt;/a&gt;.</String>
6464
</WixLocalization>

src/Installers/Windows/SharedFrameworkBundle/1046/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Cancelar</String>
6161

62-
<String Id="Welcome">Bem-vindo à Instalação do [WixBundle].</String>
62+
<String Id="Welcome">Bem-vindo à Instalação do [WixBundleName].</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;termos de licença&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;política de privacidade&lt;/a&gt;.</String>
6464
</WixLocalization>

0 commit comments

Comments
 (0)