Skip to content

Commit b527455

Browse files
kp-diego-trevisankp-diego-trevisan
committed
Merge branch 'master' into chore-fix-directories-and-convert-groups-to-folders
2 parents 2c43903 + c8b8bdf commit b527455

25 files changed

Lines changed: 101 additions & 136 deletions

‎.github/workflows/development_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010
cancel-in-progress: true
1111
jobs:
1212
development_build:
13-
runs-on: macos-15
13+
runs-on: macos-26
1414
env:
1515
CERTIFICATE_PASSWORD: ${{ secrets.DEVELOPER_CERTIFICATE_PASSWORD }}
1616
KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }}
@@ -24,10 +24,10 @@ jobs:
2424
run: |
2525
git config --global url."https://${{ secrets.ORG_GITHUB_USERNAME }}:${{ secrets.ORG_GITHUB_TOKEN }}@github.com/".insteadOf "git@github.com:"
2626
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828

29-
- name: Select XCode version
30-
run: sudo xcode-select -s /Applications/Xcode_16.2.0.app
29+
- name: Select Xcode version
30+
run: sudo xcode-select -s /Applications/Xcode_16.4.0.app
3131

3232
- name: Set up Ruby
3333
uses: ruby/setup-ruby@v1

‎.github/workflows/ios_pull_request.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
pull_request:
44
workflow_dispatch:
55
concurrency:
6-
group: "${{ github.run_id }}"
6+
group: "${{ github.workflow }}-${{ github.ref }}"
77
cancel-in-progress: true
88
jobs:
99
build:
10-
runs-on: macos-15
10+
runs-on: macos-26
1111
env:
1212
TEST_RUNNER_PIA_TEST_USER: ${{ secrets.PIA_ACCOUNT_USERNAME}}
1313
TEST_RUNNER_PIA_TEST_PASSWORD: ${{ secrets.PIA_ACCOUNT_PASSWORD }}
@@ -18,9 +18,9 @@ jobs:
1818
run: |
1919
git config --global url."https://${{ secrets.ORG_GITHUB_USERNAME }}:${{ secrets.ORG_GITHUB_TOKEN }}@github.com/".insteadOf "git@github.com:"
2020
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

23-
- name: Select XCode version
23+
- name: Select Xcode version
2424
run: sudo xcode-select -s /Applications/Xcode_16.4.0.app
2525

2626
- name: Set up Ruby
@@ -34,8 +34,3 @@ jobs:
3434
- name: Run iOS unit tests
3535
run: bundle exec fastlane tests
3636

37-
- name: Run iOS e2e tests
38-
run: bundle exec fastlane ios_e2e_tests
39-
timeout-minutes: 45
40-
41-

‎.github/workflows/ios_testflight_deploy.yml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎.github/workflows/tvos_pull_request.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
pull_request:
44
workflow_dispatch:
55
concurrency:
6-
group: "${{ github.run_id }}"
6+
group: "${{ github.workflow }}-${{ github.ref }}"
77
cancel-in-progress: true
88
jobs:
99
build:
10-
runs-on: macos-15
10+
runs-on: macos-26
1111
env:
1212
TEST_RUNNER_PIA_TEST_USER: ${{ secrets.PIA_ACCOUNT_USERNAME}}
1313
TEST_RUNNER_PIA_TEST_PASSWORD: ${{ secrets.PIA_ACCOUNT_PASSWORD }}
@@ -18,10 +18,10 @@ jobs:
1818
run: |
1919
git config --global url."https://${{ secrets.ORG_GITHUB_USERNAME }}:${{ secrets.ORG_GITHUB_TOKEN }}@github.com/".insteadOf "git@github.com:"
2020
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

23-
- name: Select XCode version
24-
run: sudo xcode-select -s /Applications/Xcode_16.2.0.app
23+
- name: Select Xcode version
24+
run: sudo xcode-select -s /Applications/Xcode_16.4.0.app
2525

2626
- name: Set up Ruby
2727
uses: ruby/setup-ruby@v1
@@ -34,12 +34,12 @@ jobs:
3434
- name: Run tvOS unit tests
3535
run: bundle exec fastlane tvOStests
3636

37-
- name: Run tvOS snapshot tests
38-
run: bundle exec fastlane tvos_snapshot_tests
37+
# - name: Run tvOS snapshot tests
38+
# run: bundle exec fastlane tvos_snapshot_tests
3939

40-
- name: Run tvOS e2e tests
41-
run: bundle exec fastlane tvos_e2e_tests
42-
timeout-minutes: 45
40+
# - name: Run tvOS e2e tests
41+
# run: bundle exec fastlane tvos_e2e_tests
42+
# timeout-minutes: 45
4343

4444

4545

‎.github/workflows/tvos_testflight_deploy.yml‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎PIA VPN/Resources/L10n/SwiftGen+Strings.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,14 @@ internal enum L10n {
240240
internal static let on = L10n.tr("Localizable", "dashboard.vpn.on", fallback: "VPN: ON")
241241
/// Protected
242242
internal static let protected = L10n.tr("Localizable", "dashboard.vpn.protected", fallback: "Protected")
243+
internal enum ChangeLocation {
244+
internal enum Alert {
245+
/// Your VPN will briefly disconnect while connecting to the new location.
246+
internal static let message = L10n.tr("Localizable", "dashboard.vpn.change_location.alert.message", fallback: "Your VPN will briefly disconnect while connecting to the new location.")
247+
/// Changing location
248+
internal static let title = L10n.tr("Localizable", "dashboard.vpn.change_location.alert.title", fallback: "Changing location")
249+
}
250+
}
243251
internal enum Disconnect {
244252
/// This network is untrusted. Do you really want to disconnect the VPN?
245253
internal static let untrusted = L10n.tr("Localizable", "dashboard.vpn.disconnect.untrusted", fallback: "This network is untrusted. Do you really want to disconnect the VPN?")

‎PIA VPN/Resources/L10n/ar.lproj/Localizable.strings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
"dashboard.vpn.leakprotection.ikev2.alert.message" = "لمنع تسرب البيانات، اضغط على التبديل الآن للتغير إلى بروتوكول IKEv2 VPN وإعادة الاتصال تلقائيًا.";
236236
"dashboard.vpn.leakprotection.ikev2.alert.cta1" = "التبديل الآن";
237237

238+
"dashboard.vpn.change_location.alert.title" = "تغيير الموقع";
239+
"dashboard.vpn.change_location.alert.message" = "سينقطع اتصال VPN مؤقتًا أثناء الاتصال بالموقع الجديد.";
240+
238241
// VPN PERMISSION
239242

240243
"vpn_permission.title" = "PIA";

‎PIA VPN/Resources/L10n/da.lproj/Localizable.strings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
"dashboard.vpn.leakprotection.ikev2.alert.message" = "For at forhindre datalækage skal du trykke på Skift nu for at skifte til IKEv2 VPN-protokollen og automatisk oprette forbindelse igen.";
236236
"dashboard.vpn.leakprotection.ikev2.alert.cta1" = "Skift nu";
237237

238+
"dashboard.vpn.change_location.alert.title" = "Skifter placering";
239+
"dashboard.vpn.change_location.alert.message" = "Din VPN afbrydes kort, mens der oprettes forbindelse til den nye placering.";
240+
238241
// VPN PERMISSION
239242

240243
"vpn_permission.title" = "PIA";

‎PIA VPN/Resources/L10n/de.lproj/Localizable.strings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
"dashboard.vpn.leakprotection.ikev2.alert.message" = "Um Datenlecks zu verhindern, tippe auf „Jetzt wechseln“, um zum IKEv2 VPN-Protokoll zu wechseln und automatisch erneut eine Verbindung herzustellen.";
236236
"dashboard.vpn.leakprotection.ikev2.alert.cta1" = "Jetzt wechseln";
237237

238+
"dashboard.vpn.change_location.alert.title" = "Standort wird geändert";
239+
"dashboard.vpn.change_location.alert.message" = "Ihr VPN wird beim Verbinden mit dem neuen Standort kurz getrennt.";
240+
238241
// VPN PERMISSION
239242

240243
"vpn_permission.title" = "PIA";

‎PIA VPN/Resources/L10n/en.lproj/Localizable.strings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
"dashboard.vpn.leakprotection.ikev2.alert.message" = "To prevent data leaks, tap Switch Now to change to the IKEv2 VPN protocol and automatically reconnect.";
236236
"dashboard.vpn.leakprotection.ikev2.alert.cta1" = "Switch Now";
237237

238+
"dashboard.vpn.change_location.alert.title" = "Changing location";
239+
"dashboard.vpn.change_location.alert.message" = "Your VPN will briefly disconnect while connecting to the new location.";
240+
238241
// VPN PERMISSION
239242

240243
"vpn_permission.title" = "PIA";

0 commit comments

Comments
 (0)