|
|
|
|
@ -1,42 +1,7 @@
|
|
|
|
|
{
|
|
|
|
|
"logs": [
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\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": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,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,118,116,115,117,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",
|
|
|
|
|
"startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
|
|
|
|
|
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,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,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
|
|
|
|
|
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
"outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
|
|
|
|
|
@ -47,10 +12,6 @@
|
|
|
|
|
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,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,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
|
|
|
|
|
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
"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",
|
|
|
|
|
@ -60,11 +21,6 @@
|
|
|
|
|
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,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,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
|
|
|
|
|
}
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
|
|
|
|
|
@ -84,10 +40,6 @@
|
|
|
|
|
"endColumns": "19",
|
|
|
|
|
"endOffsets": "210"
|
|
|
|
|
}
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
@ -95,202 +47,6 @@
|
|
|
|
|
"outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "19,20,21,22,18",
|
|
|
|
|
"startColumns": "4,4,4,4,4",
|
|
|
|
|
"startOffsets": "783,836,890,944,730",
|
|
|
|
|
"endColumns": "51,52,52,51,51",
|
|
|
|
|
"endOffsets": "830,884,938,991,777"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "13,14,15,16,17",
|
|
|
|
|
"startColumns": "4,4,4,4,4",
|
|
|
|
|
"startOffsets": "477,529,582,635,687",
|
|
|
|
|
"endColumns": "51,52,52,51,51",
|
|
|
|
|
"endOffsets": "524,577,630,682,734"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "18",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "730",
|
|
|
|
|
"endColumns": "56",
|
|
|
|
|
"endOffsets": "782"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "12",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "420",
|
|
|
|
|
"endColumns": "56",
|
|
|
|
|
"endOffsets": "472"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,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",
|
|
|
|
|
"startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
|
|
|
|
|
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
|
|
|
|
|
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,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,109,89",
|
|
|
|
|
"endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "18,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,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
|
|
|
|
|
"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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
|
|
|
|
|
"endLines": "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,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
|
|
|
|
|
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,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,109,89",
|
|
|
|
|
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "19,26",
|
|
|
|
|
"startColumns": "4,4",
|
|
|
|
|
"startOffsets": "758,1073",
|
|
|
|
|
"endLines": "24,29",
|
|
|
|
|
"endColumns": "19,19",
|
|
|
|
|
"endOffsets": "1065,1191"
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1",
|
|
|
|
|
"startColumns": "-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2,8",
|
|
|
|
|
"startColumns": "4,4",
|
|
|
|
|
"startOffsets": "105,300",
|
|
|
|
|
"endLines": "7,11",
|
|
|
|
|
"endColumns": "19,19",
|
|
|
|
|
"endOffsets": "295,415"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
|
|
|
|
|
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
|
|
|
|
|
"endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
|
|
|
|
|
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
|
|
|
|
|
}
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1",
|
|
|
|
|
"startColumns": "-1",
|
|
|
|
|
"startOffsets": "-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "12",
|
|
|
|
|
"startColumns": "4",
|
|
|
|
|
"startOffsets": "420",
|
|
|
|
|
"endColumns": "56",
|
|
|
|
|
"endOffsets": "472"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "-1,-1,-1,-1,-1",
|
|
|
|
|
"startColumns": "-1,-1,-1,-1,-1",
|
|
|
|
|
"startOffsets": "-1,-1,-1,-1,-1"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "13,14,15,16,17",
|
|
|
|
|
"startColumns": "4,4,4,4,4",
|
|
|
|
|
"startOffsets": "477,529,582,635,687",
|
|
|
|
|
"endColumns": "51,52,52,51,51",
|
|
|
|
|
"endOffsets": "524,577,630,682,734"
|
|
|
|
|
}
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\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"
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
"outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
|
|
|
|
|
@ -336,15 +92,15 @@
|
|
|
|
|
"startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
|
|
|
|
|
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
|
|
|
|
|
"endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
|
|
|
|
|
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
|
|
|
|
|
"startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
|
|
|
|
|
"startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
|
|
|
|
|
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
|
|
|
|
|
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
|
|
|
|
|
"endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
|
|
|
|
|
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@ -384,7 +140,7 @@
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
|
|
|
|
|
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
|
|
|
|
|
"map": [
|
|
|
|
|
{
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
|
|
|
|
|
@ -395,10 +151,6 @@
|
|
|
|
|
"endLines": "21",
|
|
|
|
|
"endColumns": "19",
|
|
|
|
|
"endOffsets": "817"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
"to": {
|
|
|
|
|
"startLines": "2",
|
|
|
|
|
@ -410,19 +162,6 @@
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,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",
|
|
|
|
|
"startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
|
|
|
|
|
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,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,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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
|
|
|
|
|
=======
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
|
|
|
|
|
"from": {
|
|
|
|
|
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
|
|
|
|
|
@ -431,10 +170,6 @@
|
|
|
|
|
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,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,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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> liuyitao-branch
|
|
|
|
|
},
|
|
|
|
|
"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",
|
|
|
|
|
|
