Merge branch 'master' into fix-6409

options/locale/locale_cs-CZ.ini

@@ -1231,9 +1231,7 @@ settings.protected_branch_can_push_yes=Můžete nahrávat
 settings.protected_branch_can_push_no=Nemůžete nahrávat
 settings.branch_protection=Ochrana větví pro větev „<b>%s</b>“
 settings.protect_this_branch=Povolit ochranu větví
-settings.protect_this_branch_desc=Zamezit smazání a zakázat vynucená nahrávání do větve.
 settings.protect_whitelist_committers=Povolit vyjmenovaným nahrávání
-settings.protect_whitelist_committers_desc=Povolit vyjmenovaným uživatelům a týmům obejít omezení nahrávání.
 settings.protect_whitelist_users=Povolení uživatelé pro nahrávání:
 settings.protect_whitelist_search_users=Hledat uživatele…
 settings.protect_whitelist_teams=Povolené týmy pro nahrávání:

options/locale/locale_de-DE.ini

@@ -1258,9 +1258,7 @@ settings.protected_branch_can_push_yes=Du kannst pushen
 settings.protected_branch_can_push_no=Du kannst nicht pushen
 settings.branch_protection=Branch-Schutz für Branch „<b>%s</b>“
 settings.protect_this_branch=Branch-Schutz aktivieren
-settings.protect_this_branch_desc=Verhindere Löschen und deaktiviere das „force pushing” von Git auf diesen Branch.
 settings.protect_whitelist_committers=Push-Whitelist aktivieren
-settings.protect_whitelist_committers_desc=Erlaube Nutzern oder Teams auf der Whitelist Push-Beschränkungen zu umgehen.
 settings.protect_whitelist_users=Nutzer, die pushen dürfen:
 settings.protect_whitelist_search_users=Benutzer suchen…
 settings.protect_whitelist_teams=Teams, die pushen dürfen:

options/locale/locale_en-US.ini

@@ -1269,9 +1269,9 @@ settings.protected_branch_can_push_yes = You can push
 settings.protected_branch_can_push_no = You can not push
 settings.branch_protection = Branch Protection for Branch '<b>%s</b>'
 settings.protect_this_branch = Enable Branch Protection
-settings.protect_this_branch_desc = Prevent deletion and disable Git force pushing to the branch.
+settings.protect_this_branch_desc = Prevent deletion and disable any Git pushing to the branch.
 settings.protect_whitelist_committers = Enable Push Whitelist
-settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to bypass push restrictions.
+settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to push to this branch (but not force push).
 settings.protect_whitelist_users = Whitelisted users for pushing:
 settings.protect_whitelist_search_users = Search users…
 settings.protect_whitelist_teams = Whitelisted teams for pushing:

options/locale/locale_fr-FR.ini

@@ -1258,9 +1258,7 @@ settings.protected_branch_can_push_yes=Vous pouvez pousser
 settings.protected_branch_can_push_no=Vous ne pouvez pas pousser
 settings.branch_protection=Protection de la branche "<b>%s</b>
 settings.protect_this_branch=Protection de la branche
-settings.protect_this_branch_desc=Interdire de supprimer la branche et désactiver les mises à jours forcées.
 settings.protect_whitelist_committers=Activer la liste blanche pour les mises à jour
-settings.protect_whitelist_committers_desc=Autoriser les utilisateurs sur la liste blanche et les équipes de contourner les restrictions.
 settings.protect_whitelist_users=Utilisateurs en liste blanche :
 settings.protect_whitelist_search_users=Rechercher des utilisateurs…
 settings.protect_whitelist_teams=Équipes en liste blanche :

options/locale/locale_it-IT.ini

@@ -1034,9 +1034,7 @@ settings.protected_branch_can_push_yes=Puoi pushare
 settings.protected_branch_can_push_no=Non puoi pushare
 settings.branch_protection=Protezione branch per il branch '<b>%s</b>'
 settings.protect_this_branch=Attiva protezione branch
-settings.protect_this_branch_desc=Impedisci l'eliminazione e disabilita i push forzati di Git nel branch.
 settings.protect_whitelist_committers=Attiva la whitelist per i push
-settings.protect_whitelist_committers_desc=Consenti agli utenti o ai team nella whitelist di ignorare le restrizioni di push.
 settings.protect_whitelist_users=Utenti nella whitelist per pushare:
 settings.protect_whitelist_search_users=Cerca utenti…
 settings.protect_whitelist_teams=Team nella whitelist per pushare:

options/locale/locale_ja-JP.ini

@@ -1268,9 +1268,7 @@ settings.protected_branch_can_push_yes=プッシュできます
 settings.protected_branch_can_push_no=プッシュできません
 settings.branch_protection=ブランチ '<b>%s</b>' の保護
 settings.protect_this_branch=ブランチの保護を有効にする
-settings.protect_this_branch_desc=ブランチの削除を防止し、ブランチへの強制プッシュを無効にします。
 settings.protect_whitelist_committers=プッシュ・ホワイトリストを有効にする
-settings.protect_whitelist_committers_desc=ホワイトリストに登録したユーザーまたはチームに、プッシュ制限が適用されないようにします。
 settings.protect_whitelist_users=プッシュ・ホワイトリストに含むユーザー:
 settings.protect_whitelist_search_users=ユーザーを検索…
 settings.protect_whitelist_teams=プッシュ・ホワイトリストに含むチーム:

options/locale/locale_lv-LV.ini

@@ -1205,9 +1205,7 @@ settings.protected_branch_can_push_yes=Jūs varat nosūtīt izmaiņas
 settings.protected_branch_can_push_no=Jūs nevarat nosūtīt izmaiņas
 settings.branch_protection=Atzara aizsardzība atzaram '<b>%s</b>'
 settings.protect_this_branch=Iespējot atzara aizsardzību
-settings.protect_this_branch_desc=Neļauj dzēšanu un piespiedu Git izmaiņu nosūtīšanu uz atzaru.
 settings.protect_whitelist_committers=Iespējot izmaiņu nosūtīšanas ierobežojumus
-settings.protect_whitelist_committers_desc=Atļaut tikai noteiktiem lietotājiem vai komandām apiet izmaiņu nosūtīšanas ierobežojumus.
 settings.protect_whitelist_users=Lietotāji, kas var veikt izmaiņu nosūtīšanu:
 settings.protect_whitelist_search_users=Meklēt lietotājus…
 settings.protect_whitelist_teams=Komandas, kas var veikt izmaiņu nosūtīšanu:

options/locale/locale_pt-BR.ini

@@ -1268,9 +1268,7 @@ settings.protected_branch_can_push_yes=Você pode fazer push
 settings.protected_branch_can_push_no=Você não pode fazer push
 settings.branch_protection=Proteção de branch para '<b>%s</b>'
 settings.protect_this_branch=Habilitar proteção de branch
-settings.protect_this_branch_desc=Evitar exclusão e desabilitar Git force pushing para o branch.
 settings.protect_whitelist_committers=Habilitar controle de permissão de push
-settings.protect_whitelist_committers_desc=Permitir que determinados usuários ou equipes possam realizar push.
 settings.protect_whitelist_users=Usuários com permissão para realizar push:
 settings.protect_whitelist_search_users=Pesquisar usuários...
 settings.protect_whitelist_teams=Equipes com permissão para realizar push:

options/locale/locale_ru-RU.ini

@@ -1167,9 +1167,7 @@ settings.protected_branch_can_push_yes=Вы можете выполнять push
 settings.protected_branch_can_push_no=Вы не можете выполнять push
 settings.branch_protection=Защита ветки <b>%s</b>
 settings.protect_this_branch=Защитить эту ветку
-settings.protect_this_branch_desc=Выключить принудительный push и защитить от удаления.
 settings.protect_whitelist_committers=Белый список тех, кто может делать push в эту ветку
-settings.protect_whitelist_committers_desc=Добавить пользователей или команды в белый список ветки. На них не будут распространяться обычные ограничения на push.
 settings.protect_whitelist_users=Пользователи, которые могут делать push в эту ветку:
 settings.protect_whitelist_search_users=Поиск пользователей…
 settings.protect_whitelist_teams=Команды, члены которых могут делать push в эту ветку:

options/locale/locale_sv-SE.ini

@@ -1065,9 +1065,7 @@ settings.protected_branch_can_push_yes=Du kan pusha
 settings.protected_branch_can_push_no=Du kan inte pusha
 settings.branch_protection=Branchskydd för '<b>%s</b>'
 settings.protect_this_branch=Aktivera branchskydd
-settings.protect_this_branch_desc=Förhindra borttagning och inaktivera tvingad git push mot branchen.
 settings.protect_whitelist_committers=Aktivera vitlistning för Push
-settings.protect_whitelist_committers_desc=Tillåt vitlistade användare eller team att förbigå push restriktioner.
 settings.protect_whitelist_users=Vitlistade användare för pushning:
 settings.protect_whitelist_search_users=Sök användare…
 settings.protect_whitelist_teams=Vitlistade team för pushning:

options/locale/locale_uk-UA.ini

@@ -1114,9 +1114,7 @@ settings.protected_branch_can_push_yes=Ви можете виконувати pu
 settings.protected_branch_can_push_no=Ви не можете виконувати push
 settings.branch_protection=Захист гілки <b>%s</b>
 settings.protect_this_branch=Захистити цю гілку
-settings.protect_this_branch_desc=Вимкнути примусовий push і захистити від видалення.
 settings.protect_whitelist_committers=Білий список тих, хто може робити push в цю гілку
-settings.protect_whitelist_committers_desc=Додати користувачів або команди в білий список гілки. На них не будуть поширюватися звичайні обмеження на push.
 settings.protect_whitelist_users=Користувачі, які можуть робити push в цю гілку:
 settings.protect_whitelist_search_users=Пошук користувачів…
 settings.protect_whitelist_teams=Команди, учасники яких можуть робити push в цю гілку:

options/locale/locale_zh-CN.ini

@@ -660,7 +660,7 @@ video_not_supported_in_browser=您的浏览器不支持使用 HTML5 'video' 标
 audio_not_supported_in_browser=您的浏览器不支持使用 HTML5 'video' 标签。
 stored_lfs=存储到Git LFS
 commit_graph=提交图
-blame=Blame视图
+blame=Blame
 normal_view=普通视图
 
 editor.new_file=新建文件
@@ -1270,7 +1270,7 @@ settings.branch_protection=分支 '<b>%s</b>' 的分支保护
 settings.protect_this_branch=启用分支保护
 settings.protect_this_branch_desc=防止删除并禁用 Git 强制推送到分支。
 settings.protect_whitelist_committers=启用推送白名单
-settings.protect_whitelist_committers_desc=允许列入白名单用户或团队绕过推送限制。
+settings.protect_whitelist_committers_desc=允许白名单用户或团队推向此分支 (但不强制推送)。
 settings.protect_whitelist_users=推送白名单用户：
 settings.protect_whitelist_search_users=搜索用户...
 settings.protect_whitelist_teams=推送白名单团队：