Merge branch 'master' into v4m

2 files changed, 43 insertions, 43 deletions

diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml
index 63f7b3248..a53bc6789 100644
--- a/docs/_data/browser-bugs.yml
+++ b/docs/_data/browser-bugs.yml
@@ -1,6 +1,6 @@
 -
   browser: >
-    Internet Explorer 11
+    Internet Explorer 11 & Microsoft Edge
   summary: >
     Hovered element still remains in `:hover` state after scrolling away.
   upstream_bug: >
@@ -10,7 +10,7 @@
 
 -
   browser: >
-    Internet Explorer 11
+    Internet Explorer 11 & Microsoft Edge
   summary: >
     When hovering over a `<select>` menu item, the cursor for the element underneath the menu is displayed.
   upstream_bug: >
@@ -20,6 +20,16 @@
 
 -
   browser: >
+    Internet Explorer 11 & Microsoft Edge
+  summary: >
+    CSS `border-radius` sometimes causes lines of bleed-through of the `background-color` of the parent element.
+  upstream_bug: >
+    IE#1463734
+  origin: >
+    Bootstrap#16671
+
+-
+  browser: >
     Firefox
   summary: >
     `.table-bordered` with an empty `<tbody>` is missing borders.
@@ -102,16 +112,6 @@
   browser: >
     Chrome
   summary: >
-    `display: table;` within `display: block;` forces sibling content to new line.
-  upstream_bug: >
-    Chromium#309483
-  origin: >
-    Bootstrap#9950
-
--
-  browser: >
-    Chrome
-  summary: >
     Incorrect viewport size used for media queries when printing.
   upstream_bug: >
     Chromium#273306
@@ -170,6 +170,16 @@
 
 -
   browser: >
+    Safari
+  summary: >
+    Incorrect placement of `position: fixed` element when it's a child of a `position: relative; left: X%;` element.
+  upstream_bug: >
+    WebKit#147284, Safari#21993128
+  origin: >
+    Bootstrap#16814
+
+-
+  browser: >
     Safari (OS X)
   summary: >
     Scrollbar clipped in `select[multiple]` with padding.
@@ -214,44 +224,14 @@
   browser: >
     Safari (OS X)
   summary: >
-    Alpha linear-gradient has dark line at its edge.
-  upstream_bug: >
-    WebKit#139803, Safari#19434933
-  origin: >
-    Bootstrap#15205
-
--
-  browser: >
-    Safari (OS X)
-  summary: >
-    Caps Lock indicator not shown in `<input type="password">` with `display: block`
-  upstream_bug: >
-    WebKit#141804, Safari#19892433
-  origin: >
-    Bootstrap#15832
-
--
-  browser: >
-    Safari (OS X)
-  summary: >
     Focus ring of image map within a modal is displayed in the wrong location.
   upstream_bug: >
-    WebKit#143527
+    WebKit#143527, Safari#21908735
   origin: >
     Bootstrap#16180
 
 -
   browser: >
-    Safari (OS X)
-  summary: >
-    Unnecessary line-wrapping of `.navbar-brand` text for no apparent reason
-  upstream_bug: >
-    WebKit#144990, Safari#20950962
-  origin: >
-    Bootstrap#15998
-
--
-  browser: >
     Safari (iOS)
   summary: >
     `transform: translate3d(0,0,0);` rendering bug.
@@ -279,3 +259,13 @@
     WebKit#139848, Safari#19434878
   origin: >
     Bootstrap#11266, Bootstrap#13098
+
+-
+  browser: >
+    Safari (iOS)
+  summary: >
+    Tapping below `<input>`s can focus them in some cases
+  upstream_bug: >
+    WebKit#146244, Safari#21509310
+  origin: >
+    Bootstrap#15968
diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml
index b073a6631..dc8717dd8 100644
--- a/docs/_data/translations.yml
+++ b/docs/_data/translations.yml
@@ -28,6 +28,11 @@
   description: Bootstrap 한국어
   url: http://bootstrapk.com/
 
+- name: Brazilian Portuguese
+  code: pt-BR
+  description: Bootstrap em Português do Brasil
+  url: http://bootstrapbrasil.github.io/
+
 - name: Russian
   code: ru
   description: Bootstrap по-русски
@@ -38,6 +43,11 @@
   description: Bootstrap en Español
   url: http://www.oneskyapp.com/es/docs/bootstrap/
 
+- name: Turkish
+  code: tr
+  description: Türkçe Bootstrap
+  url: http://www.trbootstrap.com
+
 - name: Ukrainian
   code: uk
   description: Bootstrap українською