Skip to content

Commit 429d215

Browse files
serenebluesereneblue
committed
Merge branch 'v0.22.70'
2 parents 7743e5b + 5426b44 commit 429d215

File tree

4 files changed

+63
-24
lines changed

4 files changed

+63
-24
lines changed

‎src/_locales/ja/messages.json‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"message": "Default（既定値）にリセット"
145145
},
146146
"options-settings-permissions": {
147-
"message": "Chameleon は、指紋の耐性や追跡保護の有効化など、Firefox の設定の一部を制御できます。これは別の拡張機能と競合する可能性があります。プライバシー許可を削除することで、これらの設定を制御するカメレオンをオプトアウトできます。この権限を削除すると、これらの設定がリセットされることに注意してください。この許可が存在しない場合は、この許可をリクエストできます。"
147+
"message": "Chameleonは、フィンガープリントへの抵抗やトラッキング保護の有効化など、Firefoxのいくつかの設定を制御できます。これは他の拡張機能と競合する可能性があります。プライバシーの権限を削除することで、Chameleonがこれらの設定を制御することをオプトアウトできます。この権限を削除すると、これらの設定がリセットされることに注意してください。この権限が存在しない場合は、要求することができます。"
148148
},
149149
"options-settings-permissions-legacy": {
150150
"message": "プライバシー許可を有効にするには、Chameleon の特別なバージョンをインストールする必要があります。これは、クロスプラットフォーム/この拡張機能の新しいバージョンでサポートされている権限の複雑さによるものです。詳細については、以下にリンクされている wiki を参照してください。"
@@ -173,6 +173,18 @@
173173
"options-whitelist-headerIPLabel": {
174174
"message": "IP ヘッダ (Via や X-Forwarded のための)"
175175
},
176+
"options-whitelist-options-audioContext": {
177+
"message": "Enable spoof audio context"
178+
},
179+
"options-whitelist-options-clientRects": {
180+
"message": "Enable spoof client rects"
181+
},
182+
"options-whitelist-options-cssExfil": {
183+
"message": "CSS Exfil をブロックする"
184+
},
185+
"options-whitelist-options-mediaDevices": {
186+
"message": "メディアデバイスをブロックする"
187+
},
176188
"options-whitelist-options-name": {
177189
"message": "window.name 保護を有効にする"
178190
},
@@ -308,6 +320,9 @@
308320
"popup-profile-randomMobileProfile": {
309321
"message": "ランダムなプロファイル (Mobile)"
310322
},
323+
"popup-profile-showProfileOnIcon": {
324+
"message": "Show browser profile on icon"
325+
},
311326
"popup-headers": {
312327
"message": "ヘッダー"
313328
},
@@ -467,6 +482,9 @@
467482
"popup-options-cookiePolicy-rejectTrackers": {
468483
"message": "トラッカーを拒絶する"
469484
},
485+
"popup-options-cookiePolicy-rejectTrackersPartitionForeign": {
486+
"message": "Reject trackers and partition third-party cookies"
487+
},
470488
"popup-whitelist-contextMenu": {
471489
"message": "ホワイトリストで現在のタブドメインを開くためのコンテキストメニュー項目を追加する"
472490
},
@@ -485,6 +503,15 @@
485503
"popup-whitelist-open": {
486504
"message": "ホワイトリストで開く"
487505
},
506+
"text-addToRule": {
507+
"message": "Add to rule: $RULE_NAME$",
508+
"placeholders": {
509+
"rule_name": {
510+
"content": "$1",
511+
"example": "Firefox whitelist rule profile"
512+
}
513+
}
514+
},
488515
"text-allowAll": {
489516
"message": "すべて許可する"
490517
},
@@ -515,6 +542,15 @@
515542
"text-realProfile": {
516543
"message": "真正プロファイル"
517544
},
545+
"text-removeFromRule": {
546+
"message": "Remove from rule: $RULE_NAME$",
547+
"placeholders": {
548+
"rule_name": {
549+
"content": "$1",
550+
"example": "Firefox whitelist rule profile"
551+
}
552+
}
553+
},
518554
"text-save": {
519555
"message": "保存する"
520556
},
@@ -524,6 +560,9 @@
524560
"text-searchRules": {
525561
"message": "検索ルール"
526562
},
563+
"text-startupDelay": {
564+
"message": "Startup delay (sec)"
565+
},
527566
"text-timezone": {
528567
"message": "タイムゾーン"
529568
},

‎src/_locales/ko/messages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
"message": "font fingerprint 위장하기"
412412
},
413413
"popup-options-standard": {
414-
"message": "Standard"
414+
"message": "일반 설정"
415415
},
416416
"popup-options-standard-blockMediaDevices": {
417417
"message": "media devices 차단"

‎src/lib/profiles.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ const BrowserVersions: any = {
4343
edg: { desktop: '131.0.0.0', desktopChrome: '131.0.0.0', deprecated: '109.0.1518.55', deprecatedChrome: '109.0.0.0', android: '131.0.0.0', androidChrome: '131.0.0.0' },
4444
esr: { desktop: '128' },
4545
esr2: { desktop: '115' },
46-
ff: { desktop: '134', mobile: '134' },
47-
gcr: { desktop: '132.0.0.0', deprecated: '109.0.0.0', ios: '132.0.6834.78', android: '131.0.0.0' },
48-
sf: { desktop: '18.1', ios1: '15.6', ios2: '16.5', ios3: '18.1' },
46+
ff: { desktop: '135', mobile: '135' },
47+
gcr: { desktop: '133.0.0.0', deprecated: '109.0.0.0', ios: '133.0.6943.33', android: '133.0.0.0' },
48+
sf: { desktop: '18.3', ios1: '16.7.10', ios2: '17.7.2', ios3: '18.3' },
4949
};
5050

5151
const DesktopResolutions: string[] = ['1366x768', '1440x900', '1600x900', '1920x1080', '1920x1200', '2560x1440', '2560x1600', '3840x2160'];
@@ -1111,7 +1111,7 @@ export class Generator {
11111111
const device = devices.getDevice('tablet', os.id);
11121112
let screenRes: number[] = device.viewport.split('x').map(Number);
11131113

1114-
let ua = `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/${version} Safari/605.1.15`;
1114+
let ua = `Mozilla/5.0 (iPad; CPU OS ${os.uaPlatform} like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/${version} Mobile/15E148 Safari/604.1`;
11151115

11161116
return {
11171117
accept: {
@@ -1277,19 +1277,19 @@ export class Generator {
12771277
id: 'ios1',
12781278
name: 'iOS 16',
12791279
browsers: ['gcrm', 'gcrt', 'sfm', 'sft'],
1280-
uaPlatform: '16_7_2',
1280+
uaPlatform: '16_7_10',
12811281
},
12821282
{
12831283
id: 'ios2',
12841284
name: 'iOS 17',
12851285
browsers: ['gcrm', 'gcrt', 'sfm', 'sft'],
1286-
uaPlatform: '17_7',
1286+
uaPlatform: '17_7_2',
12871287
},
12881288
{
12891289
id: 'ios3',
12901290
name: 'iOS 18',
12911291
browsers: ['gcrm', 'gcrt', 'sfm', 'sft'],
1292-
uaPlatform: '18_1',
1292+
uaPlatform: '18_3',
12931293
},
12941294
],
12951295
android: [
@@ -1361,14 +1361,14 @@ export class Generator {
13611361
}
13621362

13631363
this.profileIds.desktop = this.profileIds.desktop.concat(
1364-
this.allProfiles.windows.map((p) => p.id),
1365-
this.allProfiles.macOS.map((p) => p.id),
1366-
this.allProfiles.linux.map((p) => p.id)
1364+
this.allProfiles.windows.map(p => p.id),
1365+
this.allProfiles.macOS.map(p => p.id),
1366+
this.allProfiles.linux.map(p => p.id)
13671367
);
13681368

13691369
this.profileIds.mobile = this.profileIds.mobile.concat(
1370-
this.allProfiles.iOS.map((p) => p.id),
1371-
this.allProfiles.android.map((p) => p.id)
1370+
this.allProfiles.iOS.map(p => p.id),
1371+
this.allProfiles.android.map(p => p.id)
13721372
);
13731373
}
13741374

@@ -1393,18 +1393,18 @@ export class Generator {
13931393
platform = 'android';
13941394
}
13951395

1396-
return this.browsers[profileData[1]](this.profiles[platform].find((p) => p.id === profileData[0]));
1396+
return this.browsers[profileData[1]](this.profiles[platform].find(p => p.id === profileData[0]));
13971397
}
13981398

13991399
getRandomByDevice(device: string): string {
14001400
let profilesCanUse: string[];
14011401

14021402
if (device === 'random') {
1403-
profilesCanUse = this.profileIds.desktop.concat(this.profileIds.mobile).filter((p) => !this.excludedProfiles.includes(p));
1403+
profilesCanUse = this.profileIds.desktop.concat(this.profileIds.mobile).filter(p => !this.excludedProfiles.includes(p));
14041404
} else if (device === 'randomDesktop') {
1405-
profilesCanUse = this.profileIds.desktop.filter((p) => !this.excludedProfiles.includes(p));
1405+
profilesCanUse = this.profileIds.desktop.filter(p => !this.excludedProfiles.includes(p));
14061406
} else {
1407-
profilesCanUse = this.profileIds.mobile.filter((p) => !this.excludedProfiles.includes(p));
1407+
profilesCanUse = this.profileIds.mobile.filter(p => !this.excludedProfiles.includes(p));
14081408
}
14091409

14101410
if (profilesCanUse.length > 0) {
@@ -1418,15 +1418,15 @@ export class Generator {
14181418
let profilesCanUse: string[];
14191419

14201420
if (os === 'windows') {
1421-
profilesCanUse = this.profileIds.desktop.filter((p) => p.includes('win') && !this.excludedProfiles.includes(p));
1421+
profilesCanUse = this.profileIds.desktop.filter(p => p.includes('win') && !this.excludedProfiles.includes(p));
14221422
} else if (os === 'macOS') {
1423-
profilesCanUse = this.profileIds.desktop.filter((p) => p.includes('mac') && !this.excludedProfiles.includes(p));
1423+
profilesCanUse = this.profileIds.desktop.filter(p => p.includes('mac') && !this.excludedProfiles.includes(p));
14241424
} else if (os === 'linux') {
1425-
profilesCanUse = this.profileIds.desktop.filter((p) => p.includes('lin') && !this.excludedProfiles.includes(p));
1425+
profilesCanUse = this.profileIds.desktop.filter(p => p.includes('lin') && !this.excludedProfiles.includes(p));
14261426
} else if (os === 'iOS') {
1427-
profilesCanUse = this.profileIds.mobile.filter((p) => p.includes('ios') && !this.excludedProfiles.includes(p));
1427+
profilesCanUse = this.profileIds.mobile.filter(p => p.includes('ios') && !this.excludedProfiles.includes(p));
14281428
} else if (os === 'android') {
1429-
profilesCanUse = this.profileIds.mobile.filter((p) => p.includes('and') && !this.excludedProfiles.includes(p));
1429+
profilesCanUse = this.profileIds.mobile.filter(p => p.includes('and') && !this.excludedProfiles.includes(p));
14301430
}
14311431

14321432
if (profilesCanUse.length > 0) {

‎src/options/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</button>
7676
</div>
7777
<a id="export"></a>
78-
<div v-if="platform != 'android' && !isLegacyVersion">
78+
<div v-if="!isLegacyVersion">
7979
<div class="text-xl mb-4" v-t="'options-settings-permissions.message'"></div>
8080
<div class="flex flex-col xl:flex-row">
8181
<button @click="togglePrivacyPermission" class="transparent-btn">

0 commit comments

Comments
 (0)