|
|
|
|
@ -6,44 +6,12 @@
|
|
|
|
|
{
|
|
|
|
|
"source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"startLines": "2,6,10",
|
|
|
|
|
"startColumns": "4,4,4",
|
|
|
|
|
"startOffsets": "55,271,499",
|
|
|
|
|
"endLines": "5,9,13",
|
|
|
|
|
"endColumns": "12,12,12",
|
|
|
|
|
"endOffsets": "266,494,724"
|
|
|
|
|
=======
|
|
|
|
|
"startLines": "-1",
|
|
|
|
|
"startColumns": "-1",
|
|
|
|
|
"startOffsets": "-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "105",
|
|
|
|
|
"endLines": "5",
|
|
|
|
|
"endColumns": "19",
|
|
|
|
|
"endOffsets": "210"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,2123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2172,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endColumns": "-1,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endOffsets": "-1,2166,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2218,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "215,384,432,505,571,644,694,734,782,830,875,932,986,1036,1087,1149,1217,1294,1353,1418,1481,1536,1596,1659,1713,1773,1826,1888,1973,2054,2104,2163,2206,2259,2312,2355,2406,2456,2516,2569,2620,2666,2714,2762,2808,2857,2904,2954,2999,3058,3110,3162,3205,3252,3308,3363,3418,3462,3504,3545,3595,3654,3705,3754,3803,3850,3897,3944,3989,4040,4093,4168,4227,4284,4358,4422,4491,4569,4679,4783,4856,4922,4977,5042,5107,5156,5239,5317,5355,5400,5448,5510,5567,5622,5681,5748,5806,5868,5916,5961,6009,6060,6126",
|
|
|
|
|
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
|
|
|
|
|
"endColumns": "14,47,72,65,72,49,39,47,47,44,56,53,49,50,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "379,427,500,566,639,689,729,777,825,870,927,981,1031,1082,1144,1212,1289,1348,1413,1476,1531,1591,1654,1708,1768,1821,1883,1968,2049,2099,2158,2201,2254,2307,2350,2401,2451,2511,2564,2615,2661,2709,2757,2803,2852,2899,2949,2994,3053,3105,3157,3200,3247,3303,3358,3413,3457,3499,3540,3590,3649,3700,3749,3798,3845,3892,3939,3984,4035,4088,4163,4222,4279,4353,4417,4486,4564,4674,4778,4851,4917,4972,5037,5102,5151,5234,5312,5350,5395,5443,5505,5562,5617,5676,5743,5801,5863,5911,5956,6004,6055,6121,6187"
|
|
|
|
|
>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
@ -208,10 +176,10 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,373,389,390,391,392,393,394,402,403,407,411,415,420,426,433,437,441,446,450,454,458,462,466,470,476,480,486,490,496,500,505,509,512,516,522,526,532,536,542,545,549,553,557,561,565,566,567,568,571,574,577,580,584,585,586,587,588,591,593,595,597,602,603,607,613,617,618,620,631,632,636,642,646,647,648,652,679,683,684,688,716,883,909,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1467,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1727,1729,1731,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1775,1776,1777,1778,1779,1780,1782,1786,1797,1798,1799,1800,1801,1802,1803,1808,1810,1812,1814,1816,1818,1819,1820,1821,1823,1825,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1841,1842,1843,1844,1846,1848,1849,1851,1852,1854,1856,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1871,1872,1873,1874,1876,1877,1878,1879,1880,1882,1884,1886,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1914,1989,1992,1995,1998,2012,2018,2028,2044,2050,2060,2089,2116,2125,2154,2497,2508,2624,2737,2761,2767,2773,2794,2918,2938,2944,2948,2954,2989,3001,3017,3021,3087,3102,3153,3165,3191",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15163,15237,15307,15385,15439,15509,15594,15642,15688,15759,15837,15915,15987,16061,16135,16209,16289,16362,16431,16503,16580,16641,16704,16770,16834,16905,16968,17033,17097,17158,17219,17271,17344,17418,17487,17562,17636,17710,17851,24487,25650,25728,25818,25906,26002,26092,26674,26763,27010,27291,27543,27828,28221,28698,28920,29142,29418,29645,29875,30105,30335,30565,30792,31211,31437,31862,32092,32520,32739,33022,33230,33361,33588,34014,34239,34666,34887,35312,35432,35708,36009,36333,36624,36938,37075,37206,37311,37553,37720,37924,38132,38403,38515,38627,38732,38849,39063,39209,39349,39435,39783,39871,40117,40535,40784,40866,40964,41556,41656,41908,42332,42587,42681,42770,43007,45031,45273,45375,45628,47784,57913,59429,69657,71185,72942,73568,73988,75049,76314,76570,76806,77353,77847,78452,78650,79230,79794,80169,80287,80825,80982,81178,81451,81707,81877,82018,82082,82364,82650,83326,83590,83928,84281,84375,84561,84867,85129,85254,85381,85620,85831,85950,86143,86320,86775,86956,87078,87337,87450,87637,87739,87846,87975,88250,88758,89254,90131,90425,90995,91144,91876,92048,92384,92476,93506,97788,102213,102275,102853,103437,103528,103641,103870,104030,104182,104353,104519,104688,104855,105018,105261,105431,105604,105775,106049,106248,106453,106783,106867,106963,107059,107157,107257,107359,107461,107563,107665,107767,107867,107963,108075,108204,108327,108458,108589,108687,108801,108895,109035,109169,109265,109377,109477,109593,109689,109801,109901,110041,110177,110341,110471,110629,110779,110920,111064,111199,111311,111461,111589,111717,111853,111985,112115,112245,112357,113255,113401,113545,115029,115095,115185,115261,115365,115455,115557,115665,115773,115873,115953,116045,116143,116253,116331,116437,116529,116633,116743,116865,117028,117578,117658,117758,117848,117958,118052,118158,118484,118584,118696,118810,118926,119042,119136,119250,119362,119464,119584,119706,119788,119892,120012,120138,120236,120330,120418,120530,120646,120768,120880,121055,121171,121257,121349,121461,121585,121652,121778,121846,121974,122118,122246,122315,122410,122525,122638,122737,122846,122957,123068,123169,123274,123374,123504,123595,123718,123812,123924,124010,124114,124210,124298,124416,124520,124624,124750,124838,124946,125046,125136,125246,125330,125432,125516,125570,125634,125740,125850,125934,126756,129372,129490,129605,129685,130046,130279,130796,131221,131399,131683,133027,134388,134776,135854,145372,145718,151738,155688,156439,156701,156901,157280,161558,162164,162393,162544,162759,163842,164154,164565,164692,167718,168319,170240,170580,171891",
|
|
|
|
|
"startOffsets": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15163,15237,15307,15385,15439,15509,15594,15642,15688,15759,15837,15915,15987,16061,16135,16209,16289,16362,16431,16503,16580,16641,16704,16770,16834,16905,16968,17033,17097,17158,17219,17271,17344,17418,17487,17562,17636,17710,17851,24480,25643,25721,25811,25899,25995,26085,26667,26756,27003,27284,27536,27821,28214,28691,28913,29135,29411,29638,29868,30098,30328,30558,30785,31204,31430,31855,32085,32513,32732,33015,33223,33354,33581,34007,34232,34659,34880,35305,35425,35701,36002,36326,36617,36931,37068,37199,37304,37546,37713,37917,38125,38396,38508,38620,38725,38842,39056,39202,39342,39428,39776,39864,40110,40528,40777,40859,40957,41549,41649,41901,42325,42580,42674,42763,43000,45024,45266,45368,45621,47777,57906,59422,69650,71178,72935,73561,73981,75042,76307,76563,76799,77346,77840,78445,78643,79223,79787,80162,80280,80818,80975,81171,81444,81700,81870,82011,82075,82357,82643,83319,83583,83921,84274,84368,84554,84860,85122,85247,85374,85613,85824,85943,86136,86313,86768,86949,87071,87330,87443,87630,87732,87839,87968,88243,88751,89247,90124,90418,90988,91137,91869,92041,92377,92469,93499,97781,102206,102268,102846,103430,103521,103634,103863,104023,104175,104346,104512,104681,104848,105011,105254,105424,105597,105768,106042,106241,106446,106776,106860,106956,107052,107150,107250,107352,107454,107556,107658,107760,107860,107956,108068,108197,108320,108451,108582,108680,108794,108888,109028,109162,109258,109370,109470,109586,109682,109794,109894,110034,110170,110334,110464,110622,110772,110913,111057,111192,111304,111454,111582,111710,111846,111978,112108,112238,112350,113248,113394,113538,115022,115088,115178,115254,115358,115448,115550,115658,115766,115866,115946,116038,116136,116246,116324,116430,116522,116626,116736,116858,117021,117571,117651,117751,117841,117951,118045,118151,118477,118577,118689,118803,118919,119035,119129,119243,119355,119457,119577,119699,119781,119885,120005,120131,120229,120323,120411,120523,120639,120761,120873,121048,121164,121250,121342,121454,121578,121645,121771,121839,121967,122111,122239,122308,122403,122518,122631,122730,122839,122950,123061,123162,123267,123367,123497,123588,123711,123805,123917,124003,124107,124203,124291,124409,124513,124617,124743,124831,124939,125039,125129,125239,125323,125425,125509,125563,125627,125733,125843,125927,126749,129365,129483,129598,129678,130039,130272,130789,131214,131392,131676,133020,134381,134769,135847,145365,145711,151731,155681,156432,156694,156894,157273,161551,162157,162386,162537,162752,163835,164147,164558,164685,167711,168312,170233,170573,171884",
|
|
|
|
|
"endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,373,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1451,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1715,1728,1730,1732,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1774,1775,1776,1777,1778,1779,1781,1785,1789,1797,1798,1799,1800,1801,1802,1803,1809,1811,1813,1815,1817,1818,1819,1820,1822,1824,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1840,1841,1842,1843,1845,1847,1848,1850,1851,1853,1855,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1870,1871,1872,1873,1875,1876,1877,1878,1879,1881,1883,1885,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1988,1991,1994,1997,2011,2017,2027,2043,2049,2059,2088,2115,2124,2153,2496,2500,2533,2641,2760,2766,2772,2793,2917,2937,2943,2947,2953,2988,3000,3016,3020,3086,3101,3152,3164,3190,3197",
|
|
|
|
|
"endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
|
|
|
|
|
"endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15232,15302,15380,15434,15504,15589,15637,15683,15754,15832,15910,15982,16056,16130,16204,16284,16357,16426,16498,16575,16636,16699,16765,16829,16900,16963,17028,17092,17153,17214,17266,17339,17413,17482,17557,17631,17705,17846,17916,24535,25723,25813,25901,25997,26087,26669,26758,27005,27286,27538,27823,28216,28693,28915,29137,29413,29640,29870,30100,30330,30560,30787,31206,31432,31857,32087,32515,32734,33017,33225,33356,33583,34009,34234,34661,34882,35307,35427,35703,36004,36328,36619,36933,37070,37201,37306,37548,37715,37919,38127,38398,38510,38622,38727,38844,39058,39204,39344,39430,39778,39866,40112,40530,40779,40861,40959,41551,41651,41903,42327,42582,42676,42765,43002,45026,45268,45370,45623,47779,57908,59424,69652,71180,72937,73563,73983,75044,76309,76565,76801,77348,77842,78447,78645,79225,79789,80164,80282,80820,80977,81173,81446,81702,81872,82013,82077,82359,82645,83321,83585,83923,84276,84370,84556,84862,85124,85249,85376,85615,85826,85945,86138,86315,86770,86951,87073,87332,87445,87632,87734,87841,87970,88245,88753,89249,90126,90420,90990,91139,91871,92043,92379,92471,92749,97783,102208,102270,102848,103432,103523,103636,103865,104025,104177,104348,104514,104683,104850,105013,105256,105426,105599,105770,106044,106243,106448,106778,106862,106958,107054,107152,107252,107354,107456,107558,107660,107762,107862,107958,108070,108199,108322,108453,108584,108682,108796,108890,109030,109164,109260,109372,109472,109588,109684,109796,109896,110036,110172,110336,110466,110624,110774,110915,111059,111194,111306,111456,111584,111712,111848,111980,112110,112240,112352,112492,113396,113540,113678,115090,115180,115256,115360,115450,115552,115660,115768,115868,115948,116040,116138,116248,116326,116432,116524,116628,116738,116860,117023,117180,117653,117753,117843,117953,118047,118153,118245,118579,118691,118805,118921,119037,119131,119245,119357,119459,119579,119701,119783,119887,120007,120133,120231,120325,120413,120525,120641,120763,120875,121050,121166,121252,121344,121456,121580,121647,121773,121841,121969,122113,122241,122310,122405,122520,122633,122732,122841,122952,123063,123164,123269,123369,123499,123590,123713,123807,123919,124005,124109,124205,124293,124411,124515,124619,124745,124833,124941,125041,125131,125241,125325,125427,125511,125565,125629,125735,125845,125929,126049,129367,129485,129600,129680,130041,130274,130791,131216,131394,131678,133022,134383,134771,135849,145367,145502,147006,152305,156434,156696,156896,157275,161553,162159,162388,162539,162754,163837,164149,164560,164687,167713,168314,170235,170575,171886,172089"
|
|
|
|
|
"endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15232,15302,15380,15434,15504,15589,15637,15683,15754,15832,15910,15982,16056,16130,16204,16284,16357,16426,16498,16575,16636,16699,16765,16829,16900,16963,17028,17092,17153,17214,17266,17339,17413,17482,17557,17631,17705,17846,17916,24528,25716,25806,25894,25990,26080,26662,26751,26998,27279,27531,27816,28209,28686,28908,29130,29406,29633,29863,30093,30323,30553,30780,31199,31425,31850,32080,32508,32727,33010,33218,33349,33576,34002,34227,34654,34875,35300,35420,35696,35997,36321,36612,36926,37063,37194,37299,37541,37708,37912,38120,38391,38503,38615,38720,38837,39051,39197,39337,39423,39771,39859,40105,40523,40772,40854,40952,41544,41644,41896,42320,42575,42669,42758,42995,45019,45261,45363,45616,47772,57901,59417,69645,71173,72930,73556,73976,75037,76302,76558,76794,77341,77835,78440,78638,79218,79782,80157,80275,80813,80970,81166,81439,81695,81865,82006,82070,82352,82638,83314,83578,83916,84269,84363,84549,84855,85117,85242,85369,85608,85819,85938,86131,86308,86763,86944,87066,87325,87438,87625,87727,87834,87963,88238,88746,89242,90119,90413,90983,91132,91864,92036,92372,92464,92742,97776,102201,102263,102841,103425,103516,103629,103858,104018,104170,104341,104507,104676,104843,105006,105249,105419,105592,105763,106037,106236,106441,106771,106855,106951,107047,107145,107245,107347,107449,107551,107653,107755,107855,107951,108063,108192,108315,108446,108577,108675,108789,108883,109023,109157,109253,109365,109465,109581,109677,109789,109889,110029,110165,110329,110459,110617,110767,110908,111052,111187,111299,111449,111577,111705,111841,111973,112103,112233,112345,112485,113389,113533,113671,115083,115173,115249,115353,115443,115545,115653,115761,115861,115941,116033,116131,116241,116319,116425,116517,116621,116731,116853,117016,117173,117646,117746,117836,117946,118040,118146,118238,118572,118684,118798,118914,119030,119124,119238,119350,119452,119572,119694,119776,119880,120000,120126,120224,120318,120406,120518,120634,120756,120868,121043,121159,121245,121337,121449,121573,121640,121766,121834,121962,122106,122234,122303,122398,122513,122626,122725,122834,122945,123056,123157,123262,123362,123492,123583,123706,123800,123912,123998,124102,124198,124286,124404,124508,124612,124738,124826,124934,125034,125124,125234,125318,125420,125504,125558,125622,125728,125838,125922,126042,129360,129478,129593,129673,130034,130267,130784,131209,131387,131671,133015,134376,134764,135842,145360,145495,146999,152298,156427,156689,156889,157268,161546,162152,162381,162532,162747,163830,164142,164553,164680,167706,168307,170228,170568,171879,172082"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -234,7 +202,6 @@
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"startLines": "19,26",
|
|
|
|
|
"startColumns": "4,4",
|
|
|
|
|
"startOffsets": "758,1073",
|
|
|
|
|
@ -264,10 +231,10 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,376,1716,1717,1721,1722,1726,1902,1903,2501,2642,2673,2698,2731",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24679,112497,112614,112815,112925,113126,126054,126126,145507,152310,153964,154839,155521",
|
|
|
|
|
"startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24672,112490,112607,112808,112918,113119,126047,126119,145500,152303,153957,154832,155514",
|
|
|
|
|
"endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,376,1716,1720,1721,1725,1726,1902,1903,2507,2672,2693,2730,2736",
|
|
|
|
|
"endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
|
|
|
|
|
"endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24745,112609,112810,112920,113121,113250,126121,126188,145713,153959,154640,155516,155683"
|
|
|
|
|
"endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24738,112602,112803,112913,113114,113243,126114,126181,145706,153952,154633,155509,155676"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -275,18 +242,18 @@
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "135,118,72,75,74,73,18,19,20,124,125,133,132,119,25,141,142,81,82,80,79,78,94,93,92,84,38,37,64,28,29,85,40,76,126,71,67,134,41,47,52,42,63,62,61,56,55,53,54,58,57,59,48,70,122,60,68,46,51,50,49,66,45,65,43,44,69,120,121,27,33,35,32,34,31,30,24,23,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,131,129,128,130,26,83,91,96,95,97,90,89,88,87,143,21,22",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "8450,7565,3957,4218,4122,4053,823,873,925,7864,7913,8308,8257,7619,1285,8859,8913,4672,4766,4601,4517,4434,5633,5550,5448,4942,2007,1956,3456,1489,1542,5003,2100,4301,7976,3886,3641,8366,2159,2474,2775,2217,3385,3324,3267,2989,2937,2834,2887,3089,3039,3145,2521,3820,7803,3205,3690,2427,2720,2632,2574,3579,2377,3534,2274,2317,3753,7679,7740,1434,1753,1861,1706,1808,1650,1602,1230,1177,6089,6022,6330,7468,6694,6613,6768,6857,7099,7020,6173,6248,6554,6394,6474,5967,7243,7365,8216,8089,8032,8142,1369,4874,5362,5768,5699,5848,5303,5248,5186,5126,8974,977,1087",
|
|
|
|
|
"startOffsets": "8443,7558,3950,4211,4115,4046,823,866,918,7857,7906,8301,8250,7612,1278,8852,8906,4665,4759,4594,4510,4427,5626,5543,5441,4935,2000,1949,3449,1482,1535,4996,2093,4294,7969,3879,3634,8359,2152,2467,2768,2210,3378,3317,3260,2982,2930,2827,2880,3082,3032,3138,2514,3813,7796,3198,3683,2420,2713,2625,2567,3572,2370,3527,2267,2310,3746,7672,7733,1427,1746,1854,1699,1801,1643,1595,1223,1170,6082,6015,6323,7461,6687,6606,6761,6850,7092,7013,6166,6241,6547,6387,6467,5960,7236,7358,8209,8082,8025,8135,1362,4867,5355,5761,5692,5841,5296,5241,5179,5119,8967,970,1080",
|
|
|
|
|
"endLines": "139,118,72,75,74,73,18,19,20,124,125,133,132,119,25,141,142,81,82,80,79,78,94,93,92,84,38,37,64,28,29,85,40,76,126,71,67,134,41,47,52,42,63,62,61,56,55,53,54,58,57,59,48,70,122,60,68,46,51,50,49,66,45,65,43,44,69,120,121,27,33,35,32,34,31,30,24,23,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,131,129,128,130,26,83,91,96,95,97,90,89,88,87,143,21,22",
|
|
|
|
|
"endColumns": "14,53,95,82,95,68,49,51,51,48,62,57,50,59,83,53,60,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,83,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,59,61,62,46,54,87,57,61,49,44,42,59,66,60,62,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,66,109,89",
|
|
|
|
|
"endOffsets": "8853,7614,4048,4296,4213,4117,868,920,972,7908,7971,8361,8303,7674,1364,8908,8969,4761,4869,4667,4596,4512,5694,5628,5545,4998,2064,2002,3529,1537,1597,5103,2154,4398,8026,3952,3685,8445,2212,2516,2829,2269,3451,3380,3319,3034,2984,2882,2932,3140,3084,3200,2569,3881,7858,3262,3748,2469,2770,2715,2627,3636,2422,3574,2312,2372,3815,7735,7798,1484,1803,1909,1748,1856,1701,1645,1280,1225,6168,6084,6389,7559,6763,6689,6852,7015,7238,7094,6243,6325,6608,6469,6549,6017,7360,7463,8252,8137,8084,8211,1429,4937,5443,5843,5763,5937,5357,5298,5243,5181,9036,1082,1172"
|
|
|
|
|
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,53,60,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,83,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,59,61,62,46,54,87,57,61,49,44,42,59,66,60,62,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,66,109,89",
|
|
|
|
|
"endOffsets": "8846,7607,4041,4289,4206,4110,861,913,965,7901,7964,8354,8296,7667,1357,8901,8962,4754,4862,4660,4589,4505,5687,5621,5538,4991,2057,1995,3522,1530,1590,5096,2147,4391,8019,3945,3678,8438,2205,2509,2822,2262,3444,3373,3312,3027,2977,2875,2925,3133,3077,3193,2562,3874,7851,3255,3741,2462,2763,2708,2620,3629,2415,3567,2305,2365,3808,7728,7791,1477,1796,1902,1741,1849,1694,1638,1273,1218,6161,6077,6382,7552,6756,6682,6845,7008,7231,7087,6236,6318,6601,6462,6542,6010,7353,7456,8245,8130,8077,8204,1422,4930,5436,5836,5756,5930,5350,5291,5236,5174,9029,1075,1165"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "231,236,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,374,375,377,378,379,380,381,382,383,384,385,386,387,388",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "14757,15109,17921,18017,18100,18196,18265,18315,18367,18419,18468,18531,18589,18640,18700,18784,18838,18899,18993,19101,19172,19256,19339,19405,19488,19590,19651,19713,19764,19842,19895,19955,20060,20119,20221,20276,20347,20396,20480,20538,20585,20644,20701,20772,20833,20890,20940,20992,21045,21095,21151,21201,21261,21314,21380,21440,21502,21565,21612,21667,21755,21813,21875,21925,21970,22013,22073,22140,22201,22264,22319,22374,22427,22474,22527,22583,22631,22686,22739,22823,22890,22954,23050,23124,23205,23294,23457,23601,23680,23755,23837,23896,23976,24056,24111,24233,24336,24377,24430,24540,24614,24750,24818,24904,24984,25053,25147,25206,25261,25323,25383,25450,25560",
|
|
|
|
|
"startOffsets": "14757,15109,17921,18017,18100,18196,18265,18308,18360,18412,18461,18524,18582,18633,18693,18777,18831,18892,18986,19094,19165,19249,19332,19398,19481,19583,19644,19706,19757,19835,19888,19948,20053,20112,20214,20269,20340,20389,20473,20531,20578,20637,20694,20765,20826,20883,20933,20985,21038,21088,21144,21194,21254,21307,21373,21433,21495,21558,21605,21660,21748,21806,21868,21918,21963,22006,22066,22133,22194,22257,22312,22367,22420,22467,22520,22576,22624,22679,22732,22816,22883,22947,23043,23117,23198,23287,23450,23594,23673,23748,23830,23889,23969,24049,24104,24226,24329,24370,24423,24533,24607,24743,24811,24897,24977,25046,25140,25199,25254,25316,25376,25443,25553",
|
|
|
|
|
"endLines": "235,236,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,374,375,377,378,379,380,381,382,383,384,385,386,387,388",
|
|
|
|
|
"endColumns": "14,53,95,82,95,68,49,51,51,48,62,57,50,59,83,53,60,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,83,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,59,61,62,46,54,87,57,61,49,44,42,59,66,60,62,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,66,109,89",
|
|
|
|
|
"endOffsets": "15104,15158,18012,18095,18191,18260,18310,18362,18414,18463,18526,18584,18635,18695,18779,18833,18894,18988,19096,19167,19251,19334,19400,19483,19585,19646,19708,19759,19837,19890,19950,20055,20114,20216,20271,20342,20391,20475,20533,20580,20639,20696,20767,20828,20885,20935,20987,21040,21090,21146,21196,21256,21309,21375,21435,21497,21560,21607,21662,21750,21808,21870,21920,21965,22008,22068,22135,22196,22259,22314,22369,22422,22469,22522,22578,22626,22681,22734,22818,22885,22949,23045,23119,23200,23289,23452,23596,23675,23750,23832,23891,23971,24051,24106,24228,24331,24372,24425,24482,24609,24674,24813,24899,24979,25048,25142,25201,25256,25318,25378,25445,25555,25645"
|
|
|
|
|
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,53,60,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,83,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,59,61,62,46,54,87,57,61,49,44,42,59,66,60,62,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,66,109,89",
|
|
|
|
|
"endOffsets": "15104,15158,18012,18095,18191,18260,18303,18355,18407,18456,18519,18577,18628,18688,18772,18826,18887,18981,19089,19160,19244,19327,19393,19476,19578,19639,19701,19752,19830,19883,19943,20048,20107,20209,20264,20335,20384,20468,20526,20573,20632,20689,20760,20821,20878,20928,20980,21033,21083,21139,21189,21249,21302,21368,21428,21490,21553,21600,21655,21743,21801,21863,21913,21958,22001,22061,22128,22189,22252,22307,22362,22415,22462,22515,22571,22619,22674,22727,22811,22878,22942,23038,23112,23193,23282,23445,23589,23668,23743,23825,23884,23964,24044,24099,24221,24324,24365,24418,24475,24602,24667,24806,24892,24972,25041,25135,25194,25249,25311,25371,25438,25548,25638"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -302,10 +269,10 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "1452,1456,1460,1464,1733,1737,1741,1745,1749,1753,1757,1907,1910",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "92754,92962,93173,93346,113683,113866,114051,114236,114439,114645,114828,126338,126520",
|
|
|
|
|
"startOffsets": "92747,92955,93166,93339,113676,113859,114044,114229,114432,114638,114821,126331,126513",
|
|
|
|
|
"endLines": "1455,1459,1463,1466,1736,1740,1744,1748,1752,1756,1760,1909,1913",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "92957,93168,93341,93501,113861,114046,114231,114434,114640,114823,115024,126515,126751"
|
|
|
|
|
"endOffsets": "92950,93161,93334,93494,113854,114039,114224,114427,114633,114816,115017,126508,126744"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -321,10 +288,10 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "12,1904,2534,2540",
|
|
|
|
|
"startColumns": "4,4,4,4",
|
|
|
|
|
"startOffsets": "420,126193,147011,147222",
|
|
|
|
|
"startOffsets": "420,126186,147004,147215",
|
|
|
|
|
"endLines": "12,1906,2539,2623",
|
|
|
|
|
"endColumns": "60,12,24,24",
|
|
|
|
|
"endOffsets": "476,126333,147217,151733"
|
|
|
|
|
"endOffsets": "476,126326,147210,151726"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -357,10 +324,10 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "1790,1791,1804",
|
|
|
|
|
"startColumns": "4,4,4",
|
|
|
|
|
"startOffsets": "117185,117254,118250",
|
|
|
|
|
"startOffsets": "117178,117247,118243",
|
|
|
|
|
"endLines": "1790,1796,1807",
|
|
|
|
|
"endColumns": "68,12,12",
|
|
|
|
|
"endOffsets": "117249,117573,118479"
|
|
|
|
|
"endOffsets": "117242,117566,118472"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -376,10 +343,10 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2694",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "154645",
|
|
|
|
|
"startOffsets": "154638",
|
|
|
|
|
"endLines": "2697",
|
|
|
|
|
"endColumns": "24",
|
|
|
|
|
"endOffsets": "154834"
|
|
|
|
|
"endOffsets": "154827"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
@ -875,9 +842,9 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "132",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "8413",
|
|
|
|
|
"startOffsets": "8415",
|
|
|
|
|
"endColumns": "100",
|
|
|
|
|
"endOffsets": "8509"
|
|
|
|
|
"endOffsets": "8511"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -892,28 +859,28 @@
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,129",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "432,528,623,723,805,902,1008,1084,1160,1251,1344,1442,1538,1633,1726,1821,1913,2004,2095,2173,2269,2365,2460,2557,2652,2750,2899,8216",
|
|
|
|
|
"startOffsets": "432,528,623,723,805,902,1008,1084,1160,1251,1344,1442,1538,1633,1726,1821,1913,2004,2095,2173,2269,2365,2460,2557,2652,2750,2899,8218",
|
|
|
|
|
"endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
|
|
|
|
|
"endOffsets": "523,618,718,800,897,1003,1079,1155,1246,1339,1437,1533,1628,1721,1816,1908,1999,2090,2168,2264,2360,2455,2552,2647,2745,2894,2988,8289"
|
|
|
|
|
"endOffsets": "523,618,718,800,897,1003,1079,1155,1246,1339,1437,1533,1628,1721,1816,1908,1999,2090,2168,2264,2360,2455,2552,2647,2745,2894,2988,8291"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "133,44,82,81,80,79,49,20,21,123,124,131,130,45,26,50,88,89,87,86,85,101,100,99,91,71,29,30,92,83,125,78,74,132,38,54,59,39,70,69,68,63,62,60,61,65,64,66,55,77,48,67,75,53,58,57,56,73,42,72,40,41,76,46,47,28,34,36,33,35,32,31,25,24,108,107,110,122,115,114,116,117,119,118,109,113,111,112,106,120,121,129,127,126,128,27,90,98,103,102,104,97,96,95,94,22,23",
|
|
|
|
|
"startLines": "134,52,83,82,81,80,47,20,21,124,125,132,131,53,26,48,89,90,88,87,86,102,101,100,92,72,29,30,93,84,126,79,75,133,38,55,60,39,71,70,69,64,63,61,62,66,65,67,56,78,46,68,76,51,59,58,57,74,42,73,40,41,77,44,45,28,34,36,33,35,32,31,25,24,109,108,111,123,116,115,117,118,120,119,110,114,112,113,107,121,122,130,128,127,129,27,91,99,104,103,105,98,97,96,95,22,23",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "7141,2105,3997,3930,3856,3805,2355,897,946,6626,6672,7029,6978,2154,1235,2398,4369,4438,4309,4243,4179,5113,5052,4988,4572,3368,1408,1462,4627,4071,6730,3745,3528,7084,1846,2504,2755,1900,3307,3253,3201,2952,2903,2807,2856,3047,2999,3097,2548,3685,2308,3148,3572,2460,2707,2650,2594,3472,2044,3429,1951,1993,3625,2206,2257,1356,1667,1765,1619,1717,1571,1525,1183,1129,5495,5435,5638,6551,5954,5884,6019,6098,6283,6209,5571,5828,5696,5762,5385,6388,6472,6939,6830,6781,6876,1298,4516,4928,5228,5169,5296,4879,4833,4784,4732,995,1062",
|
|
|
|
|
"endLines": "135,44,82,81,80,79,49,20,21,123,124,131,130,45,26,50,88,89,87,86,85,101,100,99,91,71,29,30,92,83,125,78,74,132,38,54,59,39,70,69,68,63,62,60,61,65,64,66,55,77,48,67,75,53,58,57,56,73,42,72,40,41,76,46,47,28,34,36,33,35,32,31,25,24,108,107,110,122,115,114,116,117,119,118,109,113,111,112,106,120,121,129,127,126,128,27,90,98,103,102,104,97,96,95,94,22,23",
|
|
|
|
|
"endColumns": "14,47,72,65,72,49,41,47,47,44,56,53,49,50,61,56,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,55,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,45,51,51,42,46,55,54,54,43,41,40,49,58,49,49,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "7315,2148,4065,3991,3924,3850,2392,940,989,6666,6724,7078,7023,2200,1292,2450,4432,4510,4363,4303,4237,5163,5107,5046,4621,3423,1456,1519,4707,4147,6775,3799,3566,7135,1894,2542,2801,1945,3362,3301,3247,2993,2946,2850,2897,3091,3041,3142,2588,3739,2349,3195,3619,2498,2749,2701,2644,3522,2083,3466,1987,2038,3679,2251,2302,1402,1711,1809,1661,1759,1613,1565,1229,1177,5565,5489,5690,6620,6013,5948,6092,6203,6382,6277,5632,5878,5756,5822,5429,6466,6545,6972,6870,6824,6933,1350,4566,4982,5290,5222,5353,4922,4873,4827,4778,1056,1123"
|
|
|
|
|
"startOffsets": "7145,2403,3999,3932,3858,3807,2254,897,946,6628,6674,7031,6980,2452,1235,2297,4371,4440,4311,4245,4181,5115,5054,4990,4574,3370,1408,1462,4629,4073,6732,3747,3530,7086,1846,2506,2757,1900,3309,3255,3203,2954,2905,2809,2858,3049,3001,3099,2550,3687,2207,3150,3574,2359,2709,2652,2596,3474,2044,3431,1951,1993,3627,2105,2156,1356,1667,1765,1619,1717,1571,1525,1183,1129,5497,5437,5640,6553,5956,5886,6021,6100,6285,6211,5573,5830,5698,5764,5387,6390,6474,6941,6832,6783,6878,1298,4518,4930,5230,5171,5298,4881,4835,4786,4734,995,1062",
|
|
|
|
|
"endLines": "136,52,83,82,81,80,47,20,21,124,125,132,131,53,26,48,89,90,88,87,86,102,101,100,92,72,29,30,93,84,126,79,75,133,38,55,60,39,71,70,69,64,63,61,62,66,65,67,56,78,46,68,76,51,59,58,57,74,42,73,40,41,77,44,45,28,34,36,33,35,32,31,25,24,109,108,111,123,116,115,117,118,120,119,110,114,112,113,107,121,122,130,128,127,129,27,91,99,104,103,105,98,97,96,95,22,23",
|
|
|
|
|
"endColumns": "14,47,72,65,72,49,41,47,47,44,56,53,49,50,61,56,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,57,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,45,51,51,42,46,55,54,54,43,41,40,49,58,49,49,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "7319,2446,4067,3993,3926,3852,2291,940,989,6668,6726,7080,7025,2498,1292,2349,4434,4512,4365,4305,4239,5165,5109,5048,4623,3425,1456,1519,4709,4149,6777,3801,3568,7139,1894,2544,2803,1945,3364,3303,3249,2995,2948,2852,2899,3093,3043,3144,2590,3741,2248,3197,3621,2397,2751,2703,2646,3524,2083,3468,1987,2038,3681,2150,2201,1402,1711,1809,1661,1759,1613,1565,1229,1177,5567,5491,5692,6622,6015,5950,6094,6205,6384,6279,5634,5880,5758,5824,5431,6468,6547,6974,6872,6826,6935,1350,4568,4984,5292,5224,5355,4924,4875,4829,4780,1056,1123"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "6,9,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "215,384,2993,3066,3132,3205,3255,3297,3345,3393,3438,3495,3549,3599,3650,3712,3769,3837,3914,3973,4038,4101,4156,4216,4279,4333,4393,4446,4508,4593,4674,4724,4783,4826,4881,4934,4977,5028,5078,5138,5191,5242,5288,5336,5384,5430,5479,5526,5576,5621,5680,5726,5778,5830,5873,5920,5976,6031,6086,6130,6172,6213,6263,6322,6372,6422,6473,6522,6571,6618,6665,6712,6757,6808,6861,6936,6995,7052,7126,7190,7259,7337,7447,7551,7624,7690,7745,7810,7875,7924,8007,8085,8123,8168,8294,8356,8514,8569,8628,8695,8753,8815,8863,8908,8956,9007,9073",
|
|
|
|
|
"startOffsets": "215,384,2993,3066,3132,3205,3255,3297,3345,3393,3438,3495,3549,3599,3650,3712,3769,3837,3914,3973,4038,4101,4156,4216,4279,4333,4393,4446,4508,4593,4674,4724,4783,4826,4883,4936,4979,5030,5080,5140,5193,5244,5290,5338,5386,5432,5481,5528,5578,5623,5682,5728,5780,5832,5875,5922,5978,6033,6088,6132,6174,6215,6265,6324,6374,6424,6475,6524,6573,6620,6667,6714,6759,6810,6863,6938,6997,7054,7128,7192,7261,7339,7449,7553,7626,7692,7747,7812,7877,7926,8009,8087,8125,8170,8296,8358,8516,8571,8630,8697,8755,8817,8865,8910,8958,9009,9075",
|
|
|
|
|
"endLines": "8,9,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143",
|
|
|
|
|
"endColumns": "14,47,72,65,72,49,41,47,47,44,56,53,49,50,61,56,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,54,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,45,51,51,42,46,55,54,54,43,41,40,49,58,49,49,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "379,427,3061,3127,3200,3250,3292,3340,3388,3433,3490,3544,3594,3645,3707,3764,3832,3909,3968,4033,4096,4151,4211,4274,4328,4388,4441,4503,4588,4669,4719,4778,4821,4876,4929,4972,5023,5073,5133,5186,5237,5283,5331,5379,5425,5474,5521,5571,5616,5675,5721,5773,5825,5868,5915,5971,6026,6081,6125,6167,6208,6258,6317,6367,6417,6468,6517,6566,6613,6660,6707,6752,6803,6856,6931,6990,7047,7121,7185,7254,7332,7442,7546,7619,7685,7740,7805,7870,7919,8002,8080,8118,8163,8211,8351,8408,8564,8623,8690,8748,8810,8858,8903,8951,9002,9068,9134"
|
|
|
|
|
"endColumns": "14,47,72,65,72,49,41,47,47,44,56,53,49,50,61,56,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,56,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,45,51,51,42,46,55,54,54,43,41,40,49,58,49,49,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "379,427,3061,3127,3200,3250,3292,3340,3388,3433,3490,3544,3594,3645,3707,3764,3832,3909,3968,4033,4096,4151,4211,4274,4328,4388,4441,4503,4588,4669,4719,4778,4821,4878,4931,4974,5025,5075,5135,5188,5239,5285,5333,5381,5427,5476,5523,5573,5618,5677,5723,5775,5827,5870,5917,5973,6028,6083,6127,6169,6210,6260,6319,6369,6419,6470,6519,6568,6615,6662,6709,6754,6805,6858,6933,6992,7049,7123,7187,7256,7334,7444,7548,7621,7687,7742,7807,7872,7921,8004,8082,8120,8165,8213,8353,8410,8566,8625,8692,8750,8812,8860,8905,8953,9004,9070,9136"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -3160,14 +3127,6 @@
|
|
|
|
|
"source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "2,3",
|
|
|
|
|
=======
|
|
|
|
|
"startLines": "-1,-1",
|
|
|
|
|
"startColumns": "-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2,8",
|
|
|
|
|
>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
|
|
|
|
|
"startColumns": "4,4",
|
|
|
|
|
"startOffsets": "55,212",
|
|
|
|
|
"endColumns": "156,134",
|
|
|
|
|
@ -3177,54 +3136,7 @@
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"outputFile": "net.micode.notes.app-merged_res-8:/values-ar_values-ar.arsc.flat",
|
|
|
|
|
=======
|
|
|
|
|
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "18",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "730",
|
|
|
|
|
"endLines": "21",
|
|
|
|
|
"endColumns": "19",
|
|
|
|
|
"endOffsets": "838"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "105",
|
|
|
|
|
"endLines": "5",
|
|
|
|
|
"endColumns": "19",
|
|
|
|
|
"endOffsets": "210"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "123,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "6679,3697,3630,3556,3505,846,887,936,6219,6265,6624,6573,1225,3961,4030,3901,3834,3770,4704,4643,4579,4164,3068,1398,1452,4219,1805,6323,3445,3228,1917,2204,2455,1971,3007,2953,2901,2652,2603,2507,2556,2747,2699,2797,2248,3385,2848,3272,2160,2407,2350,2294,3172,2115,3129,2022,2064,3325,1346,1657,1755,1609,1707,1561,1515,1173,1119,5086,5026,5229,6142,5545,5475,5610,5689,5874,5800,5162,5419,5287,5353,4976,5979,6063,6534,6425,6376,6471,1288,4108,4519,4819,4760,4887,4470,4424,4375,4323,985,1052",
|
|
|
|
|
"endLines": "125,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
|
|
|
|
|
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "6853,3764,3691,3624,3550,881,930,979,6259,6317,6673,6618,1282,4024,4102,3955,3895,3828,4754,4698,4637,4213,3123,1446,1509,4298,1880,6368,3499,3266,1965,2242,2501,2016,3062,3001,2947,2693,2646,2550,2597,2791,2741,2842,2288,3439,2895,3319,2198,2449,2401,2344,3222,2154,3166,2058,2109,3379,1392,1701,1799,1651,1749,1603,1555,1219,1167,5156,5080,5281,6211,5604,5539,5683,5794,5973,5868,5223,5469,5347,5413,5020,6057,6136,6567,6465,6419,6528,1340,4158,4573,4881,4813,4944,4513,4464,4418,4369,1046,1113"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2703,2750,2800,2845,2904,2956,3008,3051,3098,3154,3209,3264,3308,3350,3391,3441,3500,3551,3600,3649,3696,3743,3790,3835,3886,3939,4014,4073,4130,4204,4268,4337,4415,4525,4629,4702,4768,4823,4888,4953,5002,5085,5163,5201,5246,5294,5356,5413,5468,5527,5594,5652,5714,5762,5807,5855,5906,5972",
|
|
|
|
|
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
|
|
|
|
|
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
|
|
|
|
|
"endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3303,3345,3386,3436,3495,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967,6033"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
|
|
|
|
|
>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml",
|
|
|
|
|
|
