Skip to content

Commit ec9866f

Browse files
authored
Merge branch 'main' into users/amitjoshi/improve-bulkhead-resilience
2 parents 0c5c4b4 + 3c2a714 commit ec9866f

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/translations-export.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@ jobs:
5050
id: check-changes
5151
run: |
5252
git add -A
53-
if (git diff --cached --quiet) {
53+
git diff --cached --quiet
54+
if ($LASTEXITCODE -eq 0) {
5455
echo "has_changes=false" >> $env:GITHUB_OUTPUT
5556
} else {
5657
echo "has_changes=true" >> $env:GITHUB_OUTPUT
5758
}
59+
exit 0
5860
5961
- name: Commit and Push Changes
6062
if: steps.check-changes.outputs.has_changes == 'true'

l10n/bundle.l10n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"One or more attribute names have been changed or removed. Contact your admin.": "One or more attribute names have been changed or removed. Contact your admin.",
2626
"Authorization Failed. Please run again to authorize it": "Authorization Failed. Please run again to authorize it",
2727
"There was a permissions problem with the server": "There was a permissions problem with the server",
28-
"Theres a problem on the back end": "Theres a problem on the back end",
28+
"There's a problem on the back end": "There's a problem on the back end",
2929
"Try again": "Try again",
3030
"We encountered an error preparing the files for edit.": "We encountered an error preparing the files for edit.",
3131
"Response data is empty": "Response data is empty",

loc/translations-export/vscode-powerplatform.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,8 +1248,8 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
12481248
<trans-unit id="++CODE++51cb4178967d50f62f3e41976c0063aa5f9ab3d1be4cef3a820e59e4baa7a069">
12491249
<source xml:lang="en">There was a problem opening the workspace</source>
12501250
</trans-unit>
1251-
<trans-unit id="++CODE++37ea190531b914739bf1ff100b3d44579b6d703de0b79b380094714aa3b3c259">
1252-
<source xml:lang="en">Theres a problem on the back end</source>
1251+
<trans-unit id="++CODE++0bd7e288337919a633d6237e1c6f79e721699cc0cf3dc0204279215c4f8591c8">
1252+
<source xml:lang="en">There's a problem on the back end</source>
12531253
</trans-unit>
12541254
<trans-unit id="++CODE++bcfc420c0358eb6f248fa6328797cfa38fa121baea6320a623280a0d34eeee75">
12551255
<source xml:lang="en">This file was exported with a newer version of the extension. Please update your extension to import this file.</source>

0 commit comments

Comments
 (0)