Skip to content
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

Jump to bottom

Import strings from android-l10n. #3337

Merged
merged 1 commit into from
May 6, 2020
Merged

Import strings from android-l10n. #3337

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/res/values-en-rGB/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,11 +1609,11 @@ the Select` button. When clicked it closes all the previously selected tabs -->
<!-- This string is displayed as the title of a dialog that is displayed the first time a user access DRM content if they haven't
explicitly enable/Disable the DRM setting yet. -->
<string name="drm_first_use_title_v1">This site contains DRM content.</string>

<!-- This string is displayed as the body of a dialog that is displayed the first time a user access DRM content if they haven't
explicitly enable/Disable the DRM setting yet.
'%1$s' will be replaced at runtime with the Learn More page link. -->
<string name="drm_first_use_body_v1">Allowing DRM permits this site to identify this device every time you visit. &lt;a href=&quot;%1$s&quot;&gt;Learn More&lt;/a&gt;</string>
<string name="drm_first_use_body_v2">Allowing DRM permits sites to identify this device every time you visit. &lt;a href=&quot;%1$s&quot;&gt;Learn More&lt;/a&gt;</string>

<!-- This string is displayed in the enable button that is displayed inside the dialog that is displayed the first time a user access
access DRM content if they haven't explicitly enable/Disable the DRM setting yet. -->
Expand Down
37 changes: 18 additions & 19 deletions app/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

<!-- This string is used as the title of the pop-ups dialog used to remove sites from the currently
allowed pop-up sites. -->
<string name="settings_privacy_policy_popups_title">ポップアップの許可設定</string>
<string name="settings_privacy_policy_popups_title_v1">ポップアップの例外</string>

<!-- This string is displayed under the title the pop-ups dialog used to remove sites from the currently
allowed pop-up sites. -->
Expand Down Expand Up @@ -427,6 +427,10 @@
User-Agent (UA) string of the browser. -->
<string name="developer_options_ua_mode">ユーザーエージェントモード</string>

<!-- This string is used to label a set of radio buttons that allow the user to change the
default downloads storage. -->
<string name="security_options_downloads_storage">ダウンロード先の既定のストレージ</string>

<!-- This string is used to label the 'Desktop' radio button of the 'User-Agent Mode' settings option. -->
<string name="developer_options_ua_desktop">デスクトップ</string>

Expand All @@ -436,6 +440,12 @@
<!-- This string is used to label the 'VR' radio button of the 'User-Agent Mode' settings option. -->
<string name="developer_options_ua_vr">VR</string>

<!-- This string is used to label the 'Internal Storage' radio button of the 'Downloads Storage' settings option. -->
<string name="privacy_options_downloads_storage_internal">内部</string>

<!-- This string is used to label the 'External Storage' radio button of the 'Downloads Storage' settings option. -->
<string name="privacy_options_downloads_storage_external">外部</string>

<!-- This string is used to label the 'Standard' radio button of the 'Enhanced Tracking protection' settings option. -->
<string name="privacy_options_tracking_etp">標準</string>

Expand Down Expand Up @@ -589,11 +599,7 @@
when that the content was just synced some time ago. -->
<string name="fxa_account_last_synced">最終同期日時: %1$d 分前</string>

<!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
and is used to enable or disable playback of DRM controlled content. -->
<string name="security_options_drm_content">DRM 制御のコンテンツを再生 (&lt;a href=&quot;http://somesite.com/&quot;&gt;詳細&lt;/a&gt;)</string>

<!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
<!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
and is used to enable or disable the tabs restoration after a fresh app start. -->
<string name="security_options_restore_tabs">再起動後にタブとウィンドウを復元する</string>

Expand Down Expand Up @@ -978,9 +984,6 @@
<!-- This string labels the Reset button that removes all the sites from the stored allowed pop-ups sites. -->
<string name="privacy_options_popups_reset">ポップアップウィンドウのブロック設定をリセット</string>

<!-- This string is displayed on top of the allowed sites list in the allowed pop-ups panel. -->
<string name="privacy_options_popups_list_header">次のウェブサイトがポップアップウィンドウの表示を要求しています:</string>

<!-- This string is displayed in the first line of a text that's displayed in the middle of allowed pop-ups panel instead of the exceptions list
when there are no exceptions. -->
<string name="privacy_options_popups_list_empty_first">ポップアップウィンドウが表示されるウェブサイトを開くと、ポップアップのブロックを選択するダイアログが表示されます。</string>
Expand All @@ -992,10 +995,6 @@
<!-- This string is used to label radio buttons for setting ETP in. -->
<string name="privacy_options_tracking">強化型トラッキング防止。 (&lt;a href=&quot;%1$s&quot;&gt;詳細情報&lt;/a&gt;)</string>

<!-- This string labels the button in the privacy option panel that opens the dialog to add/remove
Tracking protection exceptions. -->
<string name="privacy_options_tracking_exceptions">例外</string>

<!-- This string labels the Reset button that restores the default controller settings values. -->
<string name="controller_options_reset">コントローラーの設定をリセット</string>

Expand Down Expand Up @@ -1428,12 +1427,12 @@ the Select` button. When clicked it closes all the previously selected tabs -->
<string name="slow_script_dialog_action_wait">待機</string>


<!-- This string is displayed in the title of the quick Tracking Protection dialog, accessed from the Tracking Protection icon in the URL bar. -->
<!-- This string is displayed in the title of the quick Tracking Protection dialog, accessed from the Tracking Protection icon in the URL bar.
'%1$s' will be replaced at runtime with the status of the setting.
'%2$s' will be replaced at runtime with the Learn More page link. -->
<string name="tracking_dialog_message">このサイトでの強化型トラッキング防止は %1$s です。 (&lt;a href=&quot;%2$s&quot;&gt;詳細情報&lt;/a&gt;)</string>

<!-- This string is displayed in the enable button of the quick Tracking Protection dialog, accessed from the Tracking Protection icon in the URL bar. -->
<string name="tracking_dialog_button_enable">有効化</string>


<!-- This string is displayed in the disable button of the quick Tracking Protection dialog, accessed from the Tracking Protection icon in the URL bar. -->
<string name="tracking_dialog_button_disable">無効化</string>
</resources>

</resources>