Browse Source

Chronological shuffle for 59a1 patches

Ian Neal 8 months ago
parent
commit
97eca1a8b0

+ 21 - 25
mozilla-release/patches/1425280-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1513287817 21600
 # Node ID 889f51eea06ec20c7d3c040c0cbe8571f96cd3fb
-# Parent  70d32d6669476ef8e8050ba33881e5caac73d81e
+# Parent  f492ea98166c0263d09cbd656f95af66b479911b
 Bug 1425280 - Fix localization note mismatch in devtools files;r=pbro
 
 MozReview-Commit-ID: FVJUjB25smI
@@ -243,30 +243,26 @@ diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client
  # in the variables list on certain variables or properties as tooltips.
  # Expanations of what these represent can be found at the following links:
  # https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
-diff --git a/devtools/client/locales/en-US/font-inspector.properties.1425280.earlier b/devtools/client/locales/en-US/font-inspector.properties.1425280.earlier
-new file mode 100644
---- /dev/null
-+++ b/devtools/client/locales/en-US/font-inspector.properties.1425280.earlier
-@@ -0,0 +1,19 @@
-+--- font-inspector.properties
-++++ font-inspector.properties
-+@@ -19,15 +19,15 @@ fontinspector.usedAs=Used as:
-+ # LOCALIZATION NOTE (fontinspector.system) This label indicates that the font is a local
-+ # system font.
-+ fontinspector.system=system
-+ 
-+ # LOCALIZATION NOTE (fontinspector.remote) This label indicates that the font is a remote
-+ # font.
-+ fontinspector.remote=remote
-+ 
-+-# LOCALIZATION NOTE (fontinspector.previewHint):
-++# LOCALIZATION NOTE (fontinspector.previewText):
-+ # This is the label shown as the placeholder in font inspector preview text box.
-+ fontinspector.previewText=Preview Text
-+ 
-+ # LOCALIZATION NOTE (fontinspector.noFontsOnSelectedElement): This label is shown when
-+ # no fonts found on the selected element.
-+ fontinspector.noFontsOnSelectedElement=No fonts were found for the current element.
+diff --git a/devtools/client/locales/en-US/font-inspector.properties b/devtools/client/locales/en-US/font-inspector.properties
+--- a/devtools/client/locales/en-US/font-inspector.properties
++++ b/devtools/client/locales/en-US/font-inspector.properties
+@@ -19,15 +19,15 @@ fontinspector.usedAs=Used as:
+ # LOCALIZATION NOTE (fontinspector.system) This label indicates that the font is a local
+ # system font.
+ fontinspector.system=system
+ 
+ # LOCALIZATION NOTE (fontinspector.remote) This label indicates that the font is a remote
+ # font.
+ fontinspector.remote=remote
+ 
+-# LOCALIZATION NOTE (fontinspector.previewHint):
++# LOCALIZATION NOTE (fontinspector.previewText):
+ # This is the label shown as the placeholder in font inspector preview text box.
+ fontinspector.previewText=Preview Text
+ 
+ # LOCALIZATION NOTE (fontinspector.noFontsOnSelectedElement): This label is shown when
+ # no fonts found on the selected element.
+ fontinspector.noFontsOnSelectedElement=No fonts were found for the current element.
 diff --git a/devtools/client/locales/en-US/har.properties b/devtools/client/locales/en-US/har.properties
 --- a/devtools/client/locales/en-US/har.properties
 +++ b/devtools/client/locales/en-US/har.properties

+ 1 - 1
mozilla-release/patches/1437548-1-60a1.patch

@@ -1063,7 +1063,7 @@ diff --git a/devtools/client/locales/en-US/font-inspector.properties b/devtools/
  # font.
  fontinspector.remote=remote
  
--# LOCALIZATION NOTE (fontinspector.previewHint):
+-# LOCALIZATION NOTE (fontinspector.previewText):
 -# This is the label shown as the placeholder in font inspector preview text box.
 -fontinspector.previewText=Preview Text
 -

+ 0 - 55
mozilla-release/patches/TOP-NOBUG-l10nmerge-25319.patch

@@ -1,55 +0,0 @@
-# HG changeset patch
-# User Frank-Rainer Grahl <frgrahl@gmx.net>
-# Date 1705946469 -3600
-# Parent  8731631fdf2ab7e54fa9308876299a724b3cedfa
-No Bug - Silence l10n merge complaining about untranslated file. r=me a=me
-
-diff --git a/devtools/client/locales/en-US/font-inspector.properties b/devtools/client/locales/en-US/font-inspector.properties
---- a/devtools/client/locales/en-US/font-inspector.properties
-+++ b/devtools/client/locales/en-US/font-inspector.properties
-@@ -4,16 +4,21 @@
- 
- # LOCALIZATION NOTE This file contains the Font Inspector strings.
- # The Font Inspector is a panel accessible in the Inspector sidebar.
- 
- # LOCALIZATION NOTE (fontinspector.system) This label indicates that the font is a local
- # system font.
- fontinspector.system=system
- 
-+# -# LOCALIZATION NOTE (fontinspector.previewHint):
-+# +# LOCALIZATION NOTE (fontinspector.previewText):
-+# # This is the label shown as the placeholder in font inspector preview text box.
-+# fontinspector.previewText=Preview Text
-+ 
- # LOCALIZATION NOTE (fontinspector.noFontsOnSelectedElement): This label is shown when
- # no fonts found on the selected element.
- fontinspector.noFontsOnSelectedElement=No fonts were found for the current element.
- 
- # LOCALIZATION NOTE (fontinspector.otherFontsInPageHeader): This is the text for the
- # header of a collapsible section containing other fonts used in the page.
- fontinspector.otherFontsInPageHeader=Other fonts in page
- 
-diff --git a/devtools/client/locales/en-US/font-inspector.properties.1425280.earlier b/devtools/client/locales/en-US/font-inspector.properties.1425280.earlier
-deleted file mode 100644
---- a/devtools/client/locales/en-US/font-inspector.properties.1425280.earlier
-+++ /dev/null
-@@ -1,19 +0,0 @@
----- font-inspector.properties
--+++ font-inspector.properties
--@@ -19,15 +19,15 @@ fontinspector.usedAs=Used as:
-- # LOCALIZATION NOTE (fontinspector.system) This label indicates that the font is a local
-- # system font.
-- fontinspector.system=system
-- 
-- # LOCALIZATION NOTE (fontinspector.remote) This label indicates that the font is a remote
-- # font.
-- fontinspector.remote=remote
-- 
---# LOCALIZATION NOTE (fontinspector.previewHint):
--+# LOCALIZATION NOTE (fontinspector.previewText):
-- # This is the label shown as the placeholder in font inspector preview text box.
-- fontinspector.previewText=Preview Text
-- 
-- # LOCALIZATION NOTE (fontinspector.noFontsOnSelectedElement): This label is shown when
-- # no fonts found on the selected element.
-- fontinspector.noFontsOnSelectedElement=No fonts were found for the current element.

+ 103 - 104
mozilla-release/patches/series

@@ -348,93 +348,94 @@
 1353319-3-59a1.patch
 1404176-59a1.patch
 1413860-59a1.patch
-1414159-59a1.patch
-1407178-59a1.patch
-1408926-59a1.patch
 1399125-59a1.patch
+1407178-59a1.patch
 1403452-59a1.patch
+1408926-59a1.patch
 1403899-59a1.patch
+1414159-59a1.patch
+1409651-59a1.patch
+1416704-59a1.patch
 1363957-59a1.patch
 1414275-1-59a1.patch
 1414275-2-59a1.patch
 1414275-3-59a1.patch
 1414362-59a1.patch
+1414124-59a1.patch
 1403977-1-59a1.patch
 1403977-2-59a1.patch
+1371293-3-59a1.patch
+1371293-4-59a1.patch
 1371293-5-59a1.patch
+1371293-7-59a1.patch
 1406287-1-59a1.patch
 1406287-2-59a1.patch
 1406287-3-59a1.patch
 1406287-4-59a1.patch
-1409651-59a1.patch
-1416704-59a1.patch
-1414124-59a1.patch
-1371293-3-59a1.patch
-1371293-4-59a1.patch
-1371293-7-59a1.patch
-1415612-59a1.patch
-1416960-59a1.patch
 1416193-59a1.patch
 1415554-59a1.patch
+1415612-59a1.patch
 1404917-1-59a1.patch
 1404917-2-59a1.patch
 1404917-3-59a1.patch
 1416194-59a1.patch
 1411645-59a1.patch
 1414447-59a1.patch
-1415167-59a1.patch
+1416960-59a1.patch
 1387511-1-59a1.patch
 1387511-2-59a1.patch
-1383711-59a1.patch
-1408339-2only-PARTIAL-59a1.patch
+1415167-59a1.patch
 1417368-59a1.patch
 1415650-59a1.patch
 1406030-59a1.patch
+1383711-59a1.patch
+1408339-2only-PARTIAL-59a1.patch
 1417512-59a1.patch
+1417462-59a1.patch
 1416105-59a1.patch
 1417501-59a1.patch
 1353716-59a1.patch
 1417035-59a1.patch
 1410351-59a1.patch
 1417483-59a1.patch
-1408970-59a1.patch
-1417444-59a1.patch
-1417462-59a1.patch
 1408927-59a1.patch
 1404400-59a1.patch
-1371936-59a1.patch
-1405008-59a1.patch
+1408970-59a1.patch
+1417444-59a1.patch
 1418250-59a1.patch
 1418320-59a1.patch
 1319597-59a1.patch
 1333254-59a1.patch
+1371936-59a1.patch
 1408929-59a1.patch
+1405008-59a1.patch
 1419059-59a1.patch
+1408930-59a1.patch
+1378524-59a1.patch
 1415205-1-59a1.patch
 1415205-2-59a1.patch
 1408182-59a1.patch
 1411889-59a1.patch
 1372115-59a1.patch
+1399242-1-59a1.patch
 1399242-2-59a1.patch
 1399242-3-59a1.patch
 1405288-1-59a1.patch
 1405288-2-59a1.patch
 1405288-3-59a1.patch
 1405288-4-59a1.patch
-1408930-59a1.patch
-1378524-59a1.patch
-1399242-1-59a1.patch
 1418808-59a1.patch
-1418274-59a1.patch
 1403871-1-59a1.patch
 1403871-2-59a1.patch
 1403871-3-59a1.patch
+1418274-59a1.patch
 1419447-59a1.patch
 1408401-59a1.patch
 1419665-59a1.patch
 1381648-59a1.patch
 1419416-59a1.patch
 1419075-59a1.patch
+1408944-59a1.patch
 1419382-1-59a1.patch
 1419382-2-59a1.patch
 1419382-3-59a1.patch
@@ -445,11 +446,6 @@
 1419792-59a1.patch
 1418477-1-59a1.patch
 1418477-2-59a1.patch
-1408944-59a1.patch
-1415532-1-59a1.patch
-1415532-2-59a1.patch
-1419734-59a1.patch
-1408931-59a1.patch
 1416201-1-59a1.patch
 1416201-2-59a1.patch
 1416201-3-59a1.patch
@@ -464,56 +460,60 @@
 1419410-59a1.patch
 1419787-59a1.patch
 1419487-59a1.patch
+1415532-1-59a1.patch
+1415532-2-59a1.patch
+1419734-59a1.patch
+1408931-59a1.patch
 1419426-59a1.patch
-1420273-59a1.patch
-1419407-59a1.patch
-1416928-1-59a1.patch
-1416928-2-59a1.patch
 1408947-59a1.patch
 1420179-59a1.patch
+1420273-59a1.patch
 1420272-59a1.patch
 1294873-59a1.patch
+1419407-59a1.patch
 1405350-59a1.patch
+1416928-1-59a1.patch
+1416928-2-59a1.patch
 1408938-59a1.patch
-1419533-59a1.patch
-1408946-59a1.patch
-1408945-59a1.patch
-1408943-59a1.patch
-1408948-59a1.patch
 1420711-59a1.patch
 1416394-59a1.patch
 1420451-59a1.patch
 1419471-59a1.patch
 1421242-59a1.patch
 1417805-59a1.patch
+1419533-59a1.patch
+1408946-59a1.patch
+1408945-59a1.patch
+1408943-59a1.patch
+1408948-59a1.patch
 1420395-59a1.patch
+1421066-59a1.patch
 1420604-59a1.patch
 1418066-59a1.patch
 1419076-59a1.patch
 1419087-59a1.patch
 1417439-59a1.patch
-1421066-59a1.patch
 1419828-59a1.patch
 1408941-59a1.patch
+1404851-59a1.patch
+1408942-59a1.patch
 1420419-1-59a1.patch
 1420419-2-59a1.patch
 1404928-59a1.patch
+1401548-59a1.patch
+1408124-59a1.patch
 1411565-59a1.patch
+1420233-59a1.patch
+1420303-59a1.patch
 1401942-1-59a1.patch
 1401942-2-59a1.patch
+1333140-2no1-59a1.patch
+1421582-59a1.patch
 1403536-59a1.patch
 1418928-59a1.patch
 1419367-59a1.patch
 1419368-59a1.patch
 1419405-59a1.patch
-1404851-59a1.patch
-1408942-59a1.patch
-1401548-59a1.patch
-1408124-59a1.patch
-1420233-59a1.patch
-1420303-59a1.patch
-1333140-2no1-59a1.patch
-1421582-59a1.patch
 1417039-59a1.patch
 1422258-59a1.patch
 1422265-59a1.patch
@@ -526,67 +526,64 @@
 1408939-59a1.patch
 1408934-59a1.patch
 1419301-59a1.patch
-1419592-59a1.patch
-1408949-1-59a1.patch
-1408949-2-59a1.patch
-1408949-3-59a1.patch
-1422341-59a1.patch
 1422314-59a1.patch
 1420594-1-59a1.patch
 1420594-2-59a1.patch
 1420594-3-59a1.patch
+1419592-59a1.patch
 1419369-59a1.patch
 1220758-59a1.patch
+1408949-1-59a1.patch
+1408949-2-59a1.patch
+1408949-3-59a1.patch
 1420954-1-59a1.patch
 1420954-2-59a1.patch
+1422341-59a1.patch
 1401944-59a1.patch
 1422218-1-59a1.patch
 1422218-2-59a1.patch
 1422218-3-59a1.patch
 1422218-4-59a1.patch
-1419925-59a1.patch
-1422470-59a1.patch
 1102464-1-59a1.patch
 1102464-2-59a1.patch
+1419925-59a1.patch
 1423502-59a1.patch
 1422841-1-59a1.patch
 1422841-2-59a1.patch
 1369945-59a1.patch
+1422470-59a1.patch
+1420499-59a1.patch
 1423961-59a1.patch
 1419336-1-59a1.patch
 1419336-2-59a1.patch
-1386613-1-59a1.patch
-1386613-2-59a1.patch
-1386613-3-59a1.patch
-1424362-59a1.patch
-1419401-59a1.patch
-1420499-59a1.patch
 1408933-59a1.patch
 1241131-1-59a1.patch
 1241131-2-59a1.patch
 1424025-59a1.patch
+1386613-1-59a1.patch
+1386613-2-59a1.patch
+1386613-3-59a1.patch
 1421663-59a1.patch
+1424362-59a1.patch
+1419401-59a1.patch
 1424658-59a1.patch
 1411622-59a1.patch
 1424916-59a1.patch
 1272969-59a1.patch
+1424669-59a1.patch
 1419479-59a1.patch
 1419078-59a1.patch
-1424669-59a1.patch
 1424275-59a1.patch
-1423158-59a1.patch
-1415472-59a1.patch
-1421491-59a1.patch
 1425270-59a1.patch
 1422815-59a1.patch
 1419083-59a1.patch
+1423158-59a1.patch
 1424949-1-59a1.patch
 1424949-2-59a1.patch
 1418927-1-59a1.patch
 1418927-2-59a1.patch
 1424162-59a1.patch
-1426251-59a1.patch
-1425876-59a1.patch
+1415472-59a1.patch
 1425318-1-59a1.patch
 1425318-2-59a1.patch
 1425318-3-59a1.patch
@@ -594,61 +591,65 @@
 1424721-59a1.patch
 1420622-59a1.patch
 1419086-59a1.patch
+1421491-59a1.patch
+1426251-59a1.patch
+1425876-59a1.patch
 1426018-59a1.patch
 1419366-59a1.patch
+1421992-4c-59a1.patch
 1426108-59a1.patch
 1420289-59a1.patch
+1425897-59a1.patch
 1365574-59a1.patch
+1402485-59a1.patch
 1425653-59a1.patch
 1425839-59a1.patch
+1426462-59a1.patch
 1227746-59a1.patch
 1424690-59a1.patch
-1421992-4c-59a1.patch
-1425897-59a1.patch
-1402485-59a1.patch
-1426462-59a1.patch
-1425280-59a1.patch
-1405252-59a1.patch
-1408932-59a1.patch
 1427051-59a1.patch
 1426996-59a1.patch
 1427595-59a1.patch
+1425280-59a1.patch
+1405252-59a1.patch
+1408932-59a1.patch
+1425733-59a1.patch
 1426094-59a1.patch
 1426809-59a1.patch
 1419088-59a1.patch
 1421335-1-59a1.patch
 1421335-2-59a1.patch
-1406038-59a1.patch
-1425733-59a1.patch
 1426688-1-59a1.patch
 1426688-2-59a1.patch
-1427184-59a1.patch
-1424722-59a1.patch
 1428006-59a1.patch
 1404368-59a1.patch
 1408950-59a1.patch
 1426194-1-59a1.patch
 1426194-2-59a1.patch
 1426057-59a1.patch
+1406038-59a1.patch
+1427184-59a1.patch
+1424722-59a1.patch
 1426908-59a1.patch
 1151156-59a1.patch
-1427392-59a1.patch
-1396434-59a1.patch
-1306892-1-59a1.patch
-1428394-1-59a1.patch
-1428394-2-59a1.patch
-1405254-59a1.patch
 1426920-59a1.patch
 1428231-59a1.patch
 1428043-59a1.patch
+1427392-59a1.patch
 1427187-59a1.patch
 1398981-59a1.patch
 1427908-59a1.patch
+1396434-59a1.patch
 1404853-59a1.patch
+1306892-1-59a1.patch
+1428394-1-59a1.patch
+1428394-2-59a1.patch
+1405254-59a1.patch
 1405333-59a1.patch
 1408893-59a1.patch
 1428521-59a1.patch
 1393464-59a1.patch
+1428455-59a1.patch
 1426501-1-59a1.patch
 1426501-2-59a1.patch
 1426501-3-59a1.patch
@@ -661,7 +662,6 @@
 1424156-4-59a1.patch
 1428717-59a1.patch
 1414554-59a1.patch
-1428455-59a1.patch
 1426634-59a1.patch
 1404392-59a1.patch
 1428014-59a1.patch
@@ -677,61 +677,65 @@
 1427677-1-59a1.patch
 1427677-2-59a1.patch
 1428925-59a1.patch
-1403907-59a1.patch
 1428777-59a1.patch
 1429254-59a1.patch
+1403907-59a1.patch
 1419370-59a1.patch
-1428429-59a1.patch
 1429238-59a1.patch
+1428429-59a1.patch
 1404849-59a1.patch
 1405636-59a1.patch
 1429599-59a1.patch
 1419326-59a1.patch
 1420934-59a1.patch
+1429721-59a1.patch
+1399897-1-59a1.patch
+1399897-2-59a1.patch
 1406841-59a1.patch
 1429271-59a1.patch
 1391277-59a1.patch
 1428722-1-59a1.patch
 1428722-2-59a1.patch
 1428722-3-59a1.patch
-1429721-59a1.patch
-1399897-1-59a1.patch
-1399897-2-59a1.patch
+1429982-59a1.patch
+1429656-59a1.patch
+1430001-59a1.patch
+1420811-59a1.patch
 1430237-59a1.patch
 1405340-59a1.patch
 1405341-59a1.patch
+1430547-59a1.patch
 1429365-59a1.patch
 1430329-59a1.patch
 1425964-1-59a1.patch
 1425964-2-59a1.patch
 1425273-1-59a1.patch
-1429982-59a1.patch
-1429656-59a1.patch
-1430001-59a1.patch
-1420811-59a1.patch
-1430547-59a1.patch
+1430770-59a1.patch
 1429121-1-59a1.patch
 1429121-2-59a1.patch
 1425273-2-59a1.patch
 1303171-59a1.patch
-1430770-59a1.patch
-1430799-59a1.patch
 1406039-59a1.patch
 1427006-59a1.patch
 1428685-59a1.patch
 1429908-59a1.patch
-1396666-59a1.patch
+1430799-59a1.patch
 1427718-59a1.patch
 1421213-1-59a1.patch
 1421213-2-59a1.patch
+1396666-59a1.patch
+1405637-59a1.patch
 1430745-59a1.patch
 1430703-59a1.patch
+1422061-59a1.patch
+1404378-59a1.patch
 1431282-59a1.patch
 1431334-59a1.patch
 1417446-59a1.patch
-1405637-59a1.patch
-1422061-59a1.patch
-1404378-59a1.patch
+1430773-59a1.patch
+1404371-59a1.patch
+1430855-59a1.patch
+1430299-59a1.patch
 1406285-01-59a1.patch
 1406285-02-59a1.patch
 1406285-03-59a1.patch
@@ -750,10 +754,6 @@
 1406285-16-59a1.patch
 1406285-17-59a1.patch
 1406285-18-59a1.patch
-1430773-59a1.patch
-1404371-59a1.patch
-1430855-59a1.patch
-1430299-59a1.patch
 1431204-1-59a1.patch
 1431204-2-59a1.patch
 1430776-59a1.patch
@@ -6442,7 +6442,6 @@ TOP-1846703-binutilsfix-11504.patch
 TOP-1859635-NSS3901-11506.patch
 TOP-NOBUG-killtelemetry-debugger-25319.patch
 TOP-1472170-PARTIAL-NOTESTS-63a1.patch
-TOP-NOBUG-l10nmerge-25319.patch
 TOP-1864587-angle-11507.patch
 TOP-NOBUG-REGEXP-01-Import-25318.patch
 TOP-NOBUG-REGEXP-02-1361856-1-dotall-76a1-25318.patch