Skip to content

Fix merge mistake #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwosty merged 1 commit into from
Apr 2, 2018
Merged

Fix merge mistake #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix merge mistake
  • Loading branch information
@Nhowka
Nhowka committed Apr 2, 2018
commit 428fea45cd1f6738e326ea76302bdcac3c1c7642
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/xlf/FSComp.txt.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,6 +6985,7 @@
<trans-unit id="keywordDescriptionMatchBang">
<source>Used in computation expressions to pattern match directly over the result of another computation expression.</source>
<target state="new">Used in computation expressions to pattern match directly over the result of another computation expression.</target>
<note />
</trans-unit>
<trans-unit id="ilreadFileChanged">
<source>The file '{0}' changed on disk unexpectedly, please reload.</source>
Expand Down