From d05e29222625cdd175d240329711a07191855d26 Mon Sep 17 00:00:00 2001 From: Liam Nichols Date: Wed, 26 Aug 2020 13:29:31 +0100 Subject: [PATCH 1/6] Rewrite and test range calculation logic --- Source/ListPatternBuilder.swift | 35 +++++++---------------------- Tests/ArgumentRangesTests.swift | 32 ++++++++++++++++++++++++++ Tests/ListPatternBuilderTests.swift | 8 +++++++ 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/Source/ListPatternBuilder.swift b/Source/ListPatternBuilder.swift index 78a4e61..a970315 100644 --- a/Source/ListPatternBuilder.swift +++ b/Source/ListPatternBuilder.swift @@ -69,7 +69,7 @@ class ListPatternBuilder { var items = items var string = items.removeLast() - var itemRanges = [(string.startIndex ..< string.endIndex).sameRange(in: string.utf16)!] + var itemRanges = [string.startIndex ..< string.endIndex] var remainingItems = items var nextFormat = patterns.end @@ -79,13 +79,14 @@ class ListPatternBuilder { var ranges: [Range] = [] let formatted = String(format: nextFormat, ranges: &ranges, nextItem, string) - let formattedUtf16 = formatted.utf16 - let itemRange = ranges.first(where: { formatted[$0] == nextItem })!.sameRange(in: formattedUtf16)! - let stringRange = ranges.first(where: { formatted[$0] == string })!.sameRange(in: formattedUtf16)! + let itemRange = ranges.first(where: { formatted[$0] == nextItem })! + let stringRange = ranges.first(where: { formatted[$0] == string })! - let offset = formattedUtf16.distance(from: formattedUtf16.startIndex, to: stringRange.lowerBound) + let baseIndex = stringRange.lowerBound itemRanges = itemRanges.map { - formattedUtf16.index($0.lowerBound, offsetBy: offset) ..< formattedUtf16.index($0.upperBound, offsetBy: offset) + let startIndex = formatted.index(baseIndex, offsetBy: string.distance(from: string.startIndex, to: $0.lowerBound)) + let endIndex = formatted.index(baseIndex, offsetBy: string.distance(from: string.startIndex, to: $0.upperBound)) + return startIndex ..< endIndex } string = formatted @@ -95,26 +96,6 @@ class ListPatternBuilder { return List(string: string, items: items, - itemRanges: itemRanges.map({ $0.sameRange(in: string)! })) - } -} - -extension Range where Bound == String.Index { - - func sameRange(in utf16: String.UTF16View) -> Range? { - - guard let lowerBound = lowerBound.samePosition(in: utf16), - let upperBound = upperBound.samePosition(in: utf16) else { return nil } - return lowerBound ..< upperBound - } -} - -extension Range where Bound == String.UTF16View.Index { - - func sameRange(in string: String) -> Range? { - - guard let lowerBound = lowerBound.samePosition(in: string), - let upperBound = upperBound.samePosition(in: string) else { return nil } - return lowerBound ..< upperBound + itemRanges: itemRanges) } } diff --git a/Tests/ArgumentRangesTests.swift b/Tests/ArgumentRangesTests.swift index d97eff3..4a89bd9 100644 --- a/Tests/ArgumentRangesTests.swift +++ b/Tests/ArgumentRangesTests.swift @@ -142,4 +142,36 @@ class ArgumentRangesTests: XCTestCase { NSRange(location: 93, length: 6), ]) } + + func testMoreComplicatedArgumentRanges() throws { + + let input = """ + First String: %@ + Third String: %3$@ + Second String: %2$@ + """ + + var ranges: [Range] = [] + let output = String(format: input, ranges: &ranges, "👍", "👍🏽", "👍👍👍") + + XCTAssertEqual( + output, + """ + First String: 👍 + Third String: 👍👍👍 + Second String: 👍🏽 + """ + ) + + XCTAssertEqual(ranges.map({ NSRange($0, in: output) }), [ + NSRange(location: 14, length: 2), + NSRange(location: 31, length: 6), + NSRange(location: 53, length: 4) + ]) + + XCTAssertEqual( + ranges.map({ String(output[$0]) }), + ["👍", "👍👍👍", "👍🏽"] + ) + } } diff --git a/Tests/ListPatternBuilderTests.swift b/Tests/ListPatternBuilderTests.swift index 549c552..b6c1c46 100644 --- a/Tests/ListPatternBuilderTests.swift +++ b/Tests/ListPatternBuilderTests.swift @@ -89,4 +89,12 @@ class ListPatternBuilderTests: XCTestCase { XCTAssertEqual(result.string, "ONE TWO THREE FOUR FIVE SIX SEVEN") XCTAssertEqual(result.itemRanges.map { result.string[$0] }, ["ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN"]) } + + func testFormatArgumentWithUnicodeWeirdness() { + + let builder = ListPatternBuilder(patterns: patterns) + let result = builder.build(from: ["👍🏽", "👍", "👍👎🏼", "👍👍🏽👍"]) + XCTAssertEqual(result.string, "👍🏽 [START] 👍 [MIDDLE] 👍👎🏼 [END] 👍👍🏽👍") + XCTAssertEqual(result.itemRanges.map { result.string[$0] }, ["👍🏽", "👍", "👍👎🏼", "👍👍🏽👍"]) + } } From 483123007379d0e863f0de11a2954558862ff222 Mon Sep 17 00:00:00 2001 From: Liam Nichols Date: Tue, 25 Aug 2020 20:24:51 +0100 Subject: [PATCH 2/6] Update import_cldr_data.rb to stop converting argument placeholders to printf style format specifiers --- fastlane/import_cldr_data.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/fastlane/import_cldr_data.rb b/fastlane/import_cldr_data.rb index 97bb38e..23f799c 100644 --- a/fastlane/import_cldr_data.rb +++ b/fastlane/import_cldr_data.rb @@ -232,26 +232,18 @@ def data private def formatted_list_patterns - cldr_list_patterns.map { |k,v| [convert_pattern_name(k), convert_patterns(v)] }.to_h + cldr_list_patterns.map { |k,v| [convert_pattern_name(k), v] }.to_h end def cldr_list_patterns @cldr_list_patterns end - def convert_patterns(patterns) - patterns.transform_values! { |v| convert_argument_specifiers(v) } - end - def convert_pattern_name(key) uncapitalize(key.gsub("listPattern-type-", "").split("-").map { |x| x.capitalize }.join("")) end - def convert_argument_specifiers(format) - format.gsub(/\{([0-9]+)\}/) { "%#{$1.to_i + 1}$@" } - end - def uncapitalize(str) str[0, 1].downcase + str[1..-1] end -end \ No newline at end of file +end From b48ae4c43f46bf552fb625864a21b98a6f917158 Mon Sep 17 00:00:00 2001 From: Liam Nichols Date: Tue, 25 Aug 2020 20:25:07 +0100 Subject: [PATCH 3/6] re-import CLDR v35 data with changed specifiers --- Source/Resources.xcassets/af.dataset/af.json | 72 +++++++++---------- .../Resources.xcassets/agq.dataset/agq.json | 72 +++++++++---------- Source/Resources.xcassets/ak.dataset/ak.json | 72 +++++++++---------- Source/Resources.xcassets/am.dataset/am.json | 72 +++++++++---------- Source/Resources.xcassets/ar.dataset/ar.json | 72 +++++++++---------- Source/Resources.xcassets/as.dataset/as.json | 72 +++++++++---------- .../Resources.xcassets/asa.dataset/asa.json | 72 +++++++++---------- .../Resources.xcassets/ast.dataset/ast.json | 72 +++++++++---------- Source/Resources.xcassets/az.dataset/az.json | 72 +++++++++---------- .../Resources.xcassets/bas.dataset/bas.json | 72 +++++++++---------- Source/Resources.xcassets/be.dataset/be.json | 72 +++++++++---------- .../Resources.xcassets/bem.dataset/bem.json | 72 +++++++++---------- .../Resources.xcassets/bez.dataset/bez.json | 72 +++++++++---------- Source/Resources.xcassets/bg.dataset/bg.json | 72 +++++++++---------- Source/Resources.xcassets/bm.dataset/bm.json | 72 +++++++++---------- Source/Resources.xcassets/bn.dataset/bn.json | 72 +++++++++---------- Source/Resources.xcassets/bo.dataset/bo.json | 72 +++++++++---------- Source/Resources.xcassets/br.dataset/br.json | 72 +++++++++---------- .../Resources.xcassets/brx.dataset/brx.json | 72 +++++++++---------- Source/Resources.xcassets/bs.dataset/bs.json | 72 +++++++++---------- .../bs_Cyrl.dataset/bs_Cyrl.json | 72 +++++++++---------- Source/Resources.xcassets/ca.dataset/ca.json | 72 +++++++++---------- .../ca_ES_VALENCIA.json | 72 +++++++++---------- .../Resources.xcassets/ccp.dataset/ccp.json | 72 +++++++++---------- Source/Resources.xcassets/ce.dataset/ce.json | 72 +++++++++---------- .../Resources.xcassets/ceb.dataset/ceb.json | 72 +++++++++---------- .../Resources.xcassets/cgg.dataset/cgg.json | 72 +++++++++---------- .../Resources.xcassets/chr.dataset/chr.json | 72 +++++++++---------- .../Resources.xcassets/ckb.dataset/ckb.json | 72 +++++++++---------- Source/Resources.xcassets/cs.dataset/cs.json | 72 +++++++++---------- Source/Resources.xcassets/cu.dataset/cu.json | 72 +++++++++---------- Source/Resources.xcassets/cy.dataset/cy.json | 72 +++++++++---------- Source/Resources.xcassets/da.dataset/da.json | 72 +++++++++---------- .../Resources.xcassets/dav.dataset/dav.json | 72 +++++++++---------- Source/Resources.xcassets/de.dataset/de.json | 72 +++++++++---------- .../Resources.xcassets/dje.dataset/dje.json | 72 +++++++++---------- .../Resources.xcassets/dsb.dataset/dsb.json | 72 +++++++++---------- .../Resources.xcassets/dua.dataset/dua.json | 72 +++++++++---------- .../Resources.xcassets/dyo.dataset/dyo.json | 72 +++++++++---------- Source/Resources.xcassets/dz.dataset/dz.json | 72 +++++++++---------- .../Resources.xcassets/ebu.dataset/ebu.json | 72 +++++++++---------- Source/Resources.xcassets/ee.dataset/ee.json | 72 +++++++++---------- Source/Resources.xcassets/el.dataset/el.json | 72 +++++++++---------- Source/Resources.xcassets/en.dataset/en.json | 72 +++++++++---------- .../en_AU.dataset/en_AU.json | 72 +++++++++---------- .../en_CA.dataset/en_CA.json | 72 +++++++++---------- .../en_GB.dataset/en_GB.json | 72 +++++++++---------- .../en_IN.dataset/en_IN.json | 72 +++++++++---------- .../en_US_POSIX.dataset/en_US_POSIX.json | 72 +++++++++---------- Source/Resources.xcassets/eo.dataset/eo.json | 72 +++++++++---------- Source/Resources.xcassets/es.dataset/es.json | 72 +++++++++---------- .../es_DO.dataset/es_DO.json | 72 +++++++++---------- .../es_PY.dataset/es_PY.json | 72 +++++++++---------- Source/Resources.xcassets/et.dataset/et.json | 72 +++++++++---------- Source/Resources.xcassets/eu.dataset/eu.json | 72 +++++++++---------- .../Resources.xcassets/ewo.dataset/ewo.json | 72 +++++++++---------- Source/Resources.xcassets/fa.dataset/fa.json | 72 +++++++++---------- Source/Resources.xcassets/ff.dataset/ff.json | 72 +++++++++---------- Source/Resources.xcassets/fi.dataset/fi.json | 72 +++++++++---------- .../Resources.xcassets/fil.dataset/fil.json | 72 +++++++++---------- Source/Resources.xcassets/fo.dataset/fo.json | 72 +++++++++---------- Source/Resources.xcassets/fr.dataset/fr.json | 72 +++++++++---------- .../Resources.xcassets/fur.dataset/fur.json | 72 +++++++++---------- Source/Resources.xcassets/fy.dataset/fy.json | 72 +++++++++---------- Source/Resources.xcassets/ga.dataset/ga.json | 72 +++++++++---------- Source/Resources.xcassets/gd.dataset/gd.json | 72 +++++++++---------- Source/Resources.xcassets/gl.dataset/gl.json | 72 +++++++++---------- .../Resources.xcassets/gsw.dataset/gsw.json | 72 +++++++++---------- Source/Resources.xcassets/gu.dataset/gu.json | 72 +++++++++---------- .../Resources.xcassets/guz.dataset/guz.json | 72 +++++++++---------- Source/Resources.xcassets/gv.dataset/gv.json | 72 +++++++++---------- Source/Resources.xcassets/ha.dataset/ha.json | 72 +++++++++---------- .../Resources.xcassets/haw.dataset/haw.json | 72 +++++++++---------- Source/Resources.xcassets/he.dataset/he.json | 72 +++++++++---------- Source/Resources.xcassets/hi.dataset/hi.json | 72 +++++++++---------- Source/Resources.xcassets/hr.dataset/hr.json | 72 +++++++++---------- .../Resources.xcassets/hsb.dataset/hsb.json | 72 +++++++++---------- Source/Resources.xcassets/hu.dataset/hu.json | 72 +++++++++---------- Source/Resources.xcassets/hy.dataset/hy.json | 72 +++++++++---------- Source/Resources.xcassets/ia.dataset/ia.json | 72 +++++++++---------- Source/Resources.xcassets/id.dataset/id.json | 72 +++++++++---------- Source/Resources.xcassets/ig.dataset/ig.json | 72 +++++++++---------- Source/Resources.xcassets/ii.dataset/ii.json | 72 +++++++++---------- Source/Resources.xcassets/is.dataset/is.json | 72 +++++++++---------- Source/Resources.xcassets/it.dataset/it.json | 72 +++++++++---------- Source/Resources.xcassets/ja.dataset/ja.json | 72 +++++++++---------- .../Resources.xcassets/jgo.dataset/jgo.json | 72 +++++++++---------- .../Resources.xcassets/jmc.dataset/jmc.json | 72 +++++++++---------- Source/Resources.xcassets/jv.dataset/jv.json | 72 +++++++++---------- Source/Resources.xcassets/ka.dataset/ka.json | 72 +++++++++---------- .../Resources.xcassets/kab.dataset/kab.json | 72 +++++++++---------- .../Resources.xcassets/kam.dataset/kam.json | 72 +++++++++---------- .../Resources.xcassets/kde.dataset/kde.json | 72 +++++++++---------- .../Resources.xcassets/kea.dataset/kea.json | 72 +++++++++---------- .../Resources.xcassets/khq.dataset/khq.json | 72 +++++++++---------- Source/Resources.xcassets/ki.dataset/ki.json | 72 +++++++++---------- Source/Resources.xcassets/kk.dataset/kk.json | 72 +++++++++---------- .../Resources.xcassets/kkj.dataset/kkj.json | 72 +++++++++---------- Source/Resources.xcassets/kl.dataset/kl.json | 72 +++++++++---------- .../Resources.xcassets/kln.dataset/kln.json | 72 +++++++++---------- Source/Resources.xcassets/km.dataset/km.json | 72 +++++++++---------- Source/Resources.xcassets/kn.dataset/kn.json | 72 +++++++++---------- Source/Resources.xcassets/ko.dataset/ko.json | 72 +++++++++---------- .../Resources.xcassets/kok.dataset/kok.json | 72 +++++++++---------- Source/Resources.xcassets/ks.dataset/ks.json | 72 +++++++++---------- .../Resources.xcassets/ksb.dataset/ksb.json | 72 +++++++++---------- .../Resources.xcassets/ksf.dataset/ksf.json | 72 +++++++++---------- .../Resources.xcassets/ksh.dataset/ksh.json | 72 +++++++++---------- Source/Resources.xcassets/ku.dataset/ku.json | 72 +++++++++---------- Source/Resources.xcassets/kw.dataset/kw.json | 72 +++++++++---------- Source/Resources.xcassets/ky.dataset/ky.json | 72 +++++++++---------- .../Resources.xcassets/lag.dataset/lag.json | 72 +++++++++---------- Source/Resources.xcassets/lb.dataset/lb.json | 72 +++++++++---------- Source/Resources.xcassets/lg.dataset/lg.json | 72 +++++++++---------- .../Resources.xcassets/lkt.dataset/lkt.json | 72 +++++++++---------- Source/Resources.xcassets/ln.dataset/ln.json | 72 +++++++++---------- Source/Resources.xcassets/lo.dataset/lo.json | 72 +++++++++---------- .../Resources.xcassets/lrc.dataset/lrc.json | 72 +++++++++---------- Source/Resources.xcassets/lt.dataset/lt.json | 72 +++++++++---------- Source/Resources.xcassets/lu.dataset/lu.json | 72 +++++++++---------- .../Resources.xcassets/luo.dataset/luo.json | 72 +++++++++---------- .../Resources.xcassets/luy.dataset/luy.json | 72 +++++++++---------- Source/Resources.xcassets/lv.dataset/lv.json | 72 +++++++++---------- .../Resources.xcassets/mas.dataset/mas.json | 72 +++++++++---------- .../Resources.xcassets/mer.dataset/mer.json | 72 +++++++++---------- .../Resources.xcassets/mfe.dataset/mfe.json | 72 +++++++++---------- Source/Resources.xcassets/mg.dataset/mg.json | 72 +++++++++---------- .../Resources.xcassets/mgh.dataset/mgh.json | 72 +++++++++---------- .../Resources.xcassets/mgo.dataset/mgo.json | 72 +++++++++---------- Source/Resources.xcassets/mi.dataset/mi.json | 72 +++++++++---------- Source/Resources.xcassets/mk.dataset/mk.json | 72 +++++++++---------- Source/Resources.xcassets/ml.dataset/ml.json | 72 +++++++++---------- Source/Resources.xcassets/mn.dataset/mn.json | 72 +++++++++---------- Source/Resources.xcassets/mr.dataset/mr.json | 72 +++++++++---------- Source/Resources.xcassets/ms.dataset/ms.json | 72 +++++++++---------- Source/Resources.xcassets/mt.dataset/mt.json | 72 +++++++++---------- .../Resources.xcassets/mua.dataset/mua.json | 72 +++++++++---------- Source/Resources.xcassets/my.dataset/my.json | 72 +++++++++---------- .../Resources.xcassets/mzn.dataset/mzn.json | 72 +++++++++---------- .../Resources.xcassets/naq.dataset/naq.json | 72 +++++++++---------- Source/Resources.xcassets/nb.dataset/nb.json | 72 +++++++++---------- Source/Resources.xcassets/nd.dataset/nd.json | 72 +++++++++---------- .../Resources.xcassets/nds.dataset/nds.json | 72 +++++++++---------- Source/Resources.xcassets/ne.dataset/ne.json | 72 +++++++++---------- Source/Resources.xcassets/nl.dataset/nl.json | 72 +++++++++---------- .../Resources.xcassets/nmg.dataset/nmg.json | 72 +++++++++---------- Source/Resources.xcassets/nn.dataset/nn.json | 72 +++++++++---------- .../Resources.xcassets/nnh.dataset/nnh.json | 72 +++++++++---------- .../Resources.xcassets/nus.dataset/nus.json | 72 +++++++++---------- .../Resources.xcassets/nyn.dataset/nyn.json | 72 +++++++++---------- Source/Resources.xcassets/om.dataset/om.json | 72 +++++++++---------- Source/Resources.xcassets/or.dataset/or.json | 72 +++++++++---------- Source/Resources.xcassets/os.dataset/os.json | 72 +++++++++---------- Source/Resources.xcassets/pa.dataset/pa.json | 72 +++++++++---------- Source/Resources.xcassets/pl.dataset/pl.json | 72 +++++++++---------- .../Resources.xcassets/prg.dataset/prg.json | 72 +++++++++---------- Source/Resources.xcassets/ps.dataset/ps.json | 72 +++++++++---------- Source/Resources.xcassets/pt.dataset/pt.json | 72 +++++++++---------- Source/Resources.xcassets/qu.dataset/qu.json | 72 +++++++++---------- Source/Resources.xcassets/rm.dataset/rm.json | 72 +++++++++---------- Source/Resources.xcassets/rn.dataset/rn.json | 72 +++++++++---------- Source/Resources.xcassets/ro.dataset/ro.json | 72 +++++++++---------- .../Resources.xcassets/rof.dataset/rof.json | 72 +++++++++---------- .../Resources.xcassets/root.dataset/root.json | 72 +++++++++---------- Source/Resources.xcassets/ru.dataset/ru.json | 72 +++++++++---------- Source/Resources.xcassets/rw.dataset/rw.json | 72 +++++++++---------- .../Resources.xcassets/rwk.dataset/rwk.json | 72 +++++++++---------- .../Resources.xcassets/sah.dataset/sah.json | 72 +++++++++---------- .../Resources.xcassets/saq.dataset/saq.json | 72 +++++++++---------- .../Resources.xcassets/sbp.dataset/sbp.json | 72 +++++++++---------- Source/Resources.xcassets/sd.dataset/sd.json | 72 +++++++++---------- Source/Resources.xcassets/se.dataset/se.json | 72 +++++++++---------- .../Resources.xcassets/seh.dataset/seh.json | 72 +++++++++---------- .../Resources.xcassets/ses.dataset/ses.json | 72 +++++++++---------- Source/Resources.xcassets/sg.dataset/sg.json | 72 +++++++++---------- .../Resources.xcassets/shi.dataset/shi.json | 72 +++++++++---------- Source/Resources.xcassets/si.dataset/si.json | 72 +++++++++---------- Source/Resources.xcassets/sk.dataset/sk.json | 72 +++++++++---------- Source/Resources.xcassets/sl.dataset/sl.json | 72 +++++++++---------- .../Resources.xcassets/smn.dataset/smn.json | 72 +++++++++---------- Source/Resources.xcassets/sn.dataset/sn.json | 72 +++++++++---------- Source/Resources.xcassets/so.dataset/so.json | 72 +++++++++---------- Source/Resources.xcassets/sq.dataset/sq.json | 72 +++++++++---------- Source/Resources.xcassets/sr.dataset/sr.json | 72 +++++++++---------- .../sr_Latn.dataset/sr_Latn.json | 72 +++++++++---------- Source/Resources.xcassets/sv.dataset/sv.json | 72 +++++++++---------- Source/Resources.xcassets/sw.dataset/sw.json | 72 +++++++++---------- Source/Resources.xcassets/ta.dataset/ta.json | 72 +++++++++---------- Source/Resources.xcassets/te.dataset/te.json | 72 +++++++++---------- .../Resources.xcassets/teo.dataset/teo.json | 72 +++++++++---------- Source/Resources.xcassets/tg.dataset/tg.json | 72 +++++++++---------- Source/Resources.xcassets/th.dataset/th.json | 72 +++++++++---------- Source/Resources.xcassets/ti.dataset/ti.json | 72 +++++++++---------- Source/Resources.xcassets/tk.dataset/tk.json | 72 +++++++++---------- Source/Resources.xcassets/to.dataset/to.json | 72 +++++++++---------- Source/Resources.xcassets/tr.dataset/tr.json | 72 +++++++++---------- Source/Resources.xcassets/tt.dataset/tt.json | 72 +++++++++---------- .../Resources.xcassets/twq.dataset/twq.json | 72 +++++++++---------- .../Resources.xcassets/tzm.dataset/tzm.json | 72 +++++++++---------- Source/Resources.xcassets/ug.dataset/ug.json | 72 +++++++++---------- Source/Resources.xcassets/uk.dataset/uk.json | 72 +++++++++---------- Source/Resources.xcassets/ur.dataset/ur.json | 72 +++++++++---------- .../ur_IN.dataset/ur_IN.json | 72 +++++++++---------- Source/Resources.xcassets/uz.dataset/uz.json | 72 +++++++++---------- .../Resources.xcassets/vai.dataset/vai.json | 72 +++++++++---------- Source/Resources.xcassets/vi.dataset/vi.json | 72 +++++++++---------- Source/Resources.xcassets/vo.dataset/vo.json | 72 +++++++++---------- .../Resources.xcassets/vun.dataset/vun.json | 72 +++++++++---------- .../Resources.xcassets/wae.dataset/wae.json | 72 +++++++++---------- Source/Resources.xcassets/wo.dataset/wo.json | 72 +++++++++---------- Source/Resources.xcassets/xh.dataset/xh.json | 72 +++++++++---------- .../Resources.xcassets/xog.dataset/xog.json | 72 +++++++++---------- .../Resources.xcassets/yav.dataset/yav.json | 72 +++++++++---------- Source/Resources.xcassets/yi.dataset/yi.json | 72 +++++++++---------- Source/Resources.xcassets/yo.dataset/yo.json | 72 +++++++++---------- .../Resources.xcassets/yue.dataset/yue.json | 72 +++++++++---------- .../yue_Hans.dataset/yue_Hans.json | 72 +++++++++---------- .../Resources.xcassets/zgh.dataset/zgh.json | 72 +++++++++---------- Source/Resources.xcassets/zh.dataset/zh.json | 72 +++++++++---------- .../zh_Hant.dataset/zh_Hant.json | 72 +++++++++---------- .../zh_Hant_HK.dataset/zh_Hant_HK.json | 72 +++++++++---------- Source/Resources.xcassets/zu.dataset/zu.json | 72 +++++++++---------- 222 files changed, 7992 insertions(+), 7992 deletions(-) diff --git a/Source/Resources.xcassets/af.dataset/af.json b/Source/Resources.xcassets/af.dataset/af.json index e61c150..45c0aae 100644 --- a/Source/Resources.xcassets/af.dataset/af.json +++ b/Source/Resources.xcassets/af.dataset/af.json @@ -2,58 +2,58 @@ "localeIdentifier": "af", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ of %2$@", - "2": "%1$@ of %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} of {1}", + "2": "{0} of {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ of %2$@", - "2": "%1$@ of %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} of {1}", + "2": "{0} of {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ of %2$@", - "2": "%1$@ of %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} of {1}", + "2": "{0} of {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/agq.dataset/agq.json b/Source/Resources.xcassets/agq.dataset/agq.json index 3cc4730..044aaba 100644 --- a/Source/Resources.xcassets/agq.dataset/agq.json +++ b/Source/Resources.xcassets/agq.dataset/agq.json @@ -2,58 +2,58 @@ "localeIdentifier": "agq", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ak.dataset/ak.json b/Source/Resources.xcassets/ak.dataset/ak.json index 7a626a5..6182ed1 100644 --- a/Source/Resources.xcassets/ak.dataset/ak.json +++ b/Source/Resources.xcassets/ak.dataset/ak.json @@ -2,58 +2,58 @@ "localeIdentifier": "ak", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/am.dataset/am.json b/Source/Resources.xcassets/am.dataset/am.json index 297e44d..8d100c5 100644 --- a/Source/Resources.xcassets/am.dataset/am.json +++ b/Source/Resources.xcassets/am.dataset/am.json @@ -2,58 +2,58 @@ "localeIdentifier": "am", "listPatterns": { "standard": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@, እና %2$@", - "2": "%1$@ እና %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}", + "2": "{0} እና {1}" }, "or": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@ ወይም %2$@", - "2": "%1$@ ወይም %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0} ወይም {1}", + "2": "{0} ወይም {1}" }, "orNarrow": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@ ወይም %2$@", - "2": "%1$@ ወይም %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0} ወይም {1}", + "2": "{0} ወይም {1}" }, "orShort": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@ ወይም %2$@", - "2": "%1$@ ወይም %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0} ወይም {1}", + "2": "{0} ወይም {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@, እና %2$@", - "2": "%1$@ እና %2$@" + "start": "{0}, {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}", + "2": "{0} እና {1}" }, "standardShort": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@, እና %2$@", - "2": "%1$@ እና %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}", + "2": "{0} እና {1}" }, "unit": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@፣ %2$@", - "2": "%1$@፣ %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}፣ {1}", + "2": "{0}፣ {1}" }, "unitNarrow": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@፣ %2$@", - "middle": "%1$@፣ %2$@", - "end": "%1$@፣ %2$@", - "2": "%1$@፣ %2$@" + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}፣ {1}", + "2": "{0}፣ {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ar.dataset/ar.json b/Source/Resources.xcassets/ar.dataset/ar.json index fcc3d23..86ea313 100644 --- a/Source/Resources.xcassets/ar.dataset/ar.json +++ b/Source/Resources.xcassets/ar.dataset/ar.json @@ -2,58 +2,58 @@ "localeIdentifier": "ar", "listPatterns": { "standard": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، و%2$@", - "2": "%1$@ و%2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، و{1}", + "2": "{0} و{1}" }, "or": { - "start": "%1$@ و%2$@", - "middle": "%1$@ و%2$@", - "end": "%1$@ أو %2$@", - "2": "%1$@ أو %2$@" + "start": "{0} و{1}", + "middle": "{0} و{1}", + "end": "{0} أو {1}", + "2": "{0} أو {1}" }, "orNarrow": { - "start": "%1$@ و%2$@", - "middle": "%1$@ و%2$@", - "end": "%1$@ أو %2$@", - "2": "%1$@ أو %2$@" + "start": "{0} و{1}", + "middle": "{0} و{1}", + "end": "{0} أو {1}", + "2": "{0} أو {1}" }, "orShort": { - "start": "%1$@ و%2$@", - "middle": "%1$@ و%2$@", - "end": "%1$@ أو %2$@", - "2": "%1$@ أو %2$@" + "start": "{0} و{1}", + "middle": "{0} و{1}", + "end": "{0} أو {1}", + "2": "{0} أو {1}" }, "standardNarrow": { - "start": "%1$@ و%2$@", - "middle": "%1$@ و%2$@", - "end": "%1$@ و%2$@", - "2": "%1$@ و%2$@" + "start": "{0} و{1}", + "middle": "{0} و{1}", + "end": "{0} و{1}", + "2": "{0} و{1}" }, "standardShort": { - "start": "%1$@، و%2$@", - "middle": "%1$@، و%2$@", - "end": "%1$@، و%2$@", - "2": "%1$@ و%2$@" + "start": "{0}، و{1}", + "middle": "{0}، و{1}", + "end": "{0}، و{1}", + "2": "{0} و{1}" }, "unit": { - "start": "%1$@، و%2$@", - "middle": "%1$@، و%2$@", - "end": "%1$@، و%2$@", - "2": "%1$@ و%2$@" + "start": "{0}، و{1}", + "middle": "{0}، و{1}", + "end": "{0}، و{1}", + "2": "{0} و{1}" }, "unitNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، %2$@", - "2": "%1$@، %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، {1}", + "2": "{0}، {1}" }, "unitShort": { - "start": "%1$@، و%2$@", - "middle": "%1$@، و%2$@", - "end": "%1$@، و%2$@", - "2": "%1$@ و%2$@" + "start": "{0}، و{1}", + "middle": "{0}، و{1}", + "end": "{0}، و{1}", + "2": "{0} و{1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/as.dataset/as.json b/Source/Resources.xcassets/as.dataset/as.json index 7e7ba73..9a67215 100644 --- a/Source/Resources.xcassets/as.dataset/as.json +++ b/Source/Resources.xcassets/as.dataset/as.json @@ -2,58 +2,58 @@ "localeIdentifier": "as", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ আৰু %2$@", - "2": "%1$@ আৰু %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} আৰু {1}", + "2": "{0} আৰু {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ বা %2$@", - "2": "%1$@ বা %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} বা {1}", + "2": "{0} বা {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ বা %2$@", - "2": "%1$@ বা %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} বা {1}", + "2": "{0} বা {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ বা %2$@", - "2": "%1$@ বা %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} বা {1}", + "2": "{0} বা {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ আৰু %2$@", - "2": "%1$@ আৰু %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} আৰু {1}", + "2": "{0} আৰু {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/asa.dataset/asa.json b/Source/Resources.xcassets/asa.dataset/asa.json index 128fe81..e6f41cd 100644 --- a/Source/Resources.xcassets/asa.dataset/asa.json +++ b/Source/Resources.xcassets/asa.dataset/asa.json @@ -2,58 +2,58 @@ "localeIdentifier": "asa", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ast.dataset/ast.json b/Source/Resources.xcassets/ast.dataset/ast.json index 0d232fa..d7f768c 100644 --- a/Source/Resources.xcassets/ast.dataset/ast.json +++ b/Source/Resources.xcassets/ast.dataset/ast.json @@ -2,58 +2,58 @@ "localeIdentifier": "ast", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/az.dataset/az.json b/Source/Resources.xcassets/az.dataset/az.json index b61e10d..ee8735f 100644 --- a/Source/Resources.xcassets/az.dataset/az.json +++ b/Source/Resources.xcassets/az.dataset/az.json @@ -2,58 +2,58 @@ "localeIdentifier": "az", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ və %2$@", - "2": "%1$@ və %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} və {1}", + "2": "{0} və {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, yaxud %2$@", - "2": "%1$@ yaxud %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}", + "2": "{0} yaxud {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, yaxud %2$@", - "2": "%1$@ yaxud %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}", + "2": "{0} yaxud {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, yaxud %2$@", - "2": "%1$@ yaxud %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}", + "2": "{0} yaxud {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ və %2$@", - "2": "%1$@ və %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} və {1}", + "2": "{0} və {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bas.dataset/bas.json b/Source/Resources.xcassets/bas.dataset/bas.json index 2142c56..3224ea6 100644 --- a/Source/Resources.xcassets/bas.dataset/bas.json +++ b/Source/Resources.xcassets/bas.dataset/bas.json @@ -2,58 +2,58 @@ "localeIdentifier": "bas", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/be.dataset/be.json b/Source/Resources.xcassets/be.dataset/be.json index 0497316..2eb0f84 100644 --- a/Source/Resources.xcassets/be.dataset/be.json +++ b/Source/Resources.xcassets/be.dataset/be.json @@ -2,58 +2,58 @@ "localeIdentifier": "be", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ці %2$@", - "2": "%1$@ ці %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ці {1}", + "2": "{0} ці {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ці %2$@", - "2": "%1$@ ці %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ці {1}", + "2": "{0} ці {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ці %2$@", - "2": "%1$@ ці %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ці {1}", + "2": "{0} ці {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bem.dataset/bem.json b/Source/Resources.xcassets/bem.dataset/bem.json index 8245acb..c3562c3 100644 --- a/Source/Resources.xcassets/bem.dataset/bem.json +++ b/Source/Resources.xcassets/bem.dataset/bem.json @@ -2,58 +2,58 @@ "localeIdentifier": "bem", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bez.dataset/bez.json b/Source/Resources.xcassets/bez.dataset/bez.json index 14815bf..ebf933d 100644 --- a/Source/Resources.xcassets/bez.dataset/bez.json +++ b/Source/Resources.xcassets/bez.dataset/bez.json @@ -2,58 +2,58 @@ "localeIdentifier": "bez", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bg.dataset/bg.json b/Source/Resources.xcassets/bg.dataset/bg.json index 2d490e6..8155738 100644 --- a/Source/Resources.xcassets/bg.dataset/bg.json +++ b/Source/Resources.xcassets/bg.dataset/bg.json @@ -2,58 +2,58 @@ "localeIdentifier": "bg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и{1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и{1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} и {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} и {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bm.dataset/bm.json b/Source/Resources.xcassets/bm.dataset/bm.json index fdf332d..41d87b1 100644 --- a/Source/Resources.xcassets/bm.dataset/bm.json +++ b/Source/Resources.xcassets/bm.dataset/bm.json @@ -2,58 +2,58 @@ "localeIdentifier": "bm", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bn.dataset/bn.json b/Source/Resources.xcassets/bn.dataset/bn.json index 200d47c..c5218a8 100644 --- a/Source/Resources.xcassets/bn.dataset/bn.json +++ b/Source/Resources.xcassets/bn.dataset/bn.json @@ -2,58 +2,58 @@ "localeIdentifier": "bn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ এবং %2$@", - "2": "%1$@ এবং %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} এবং {1}", + "2": "{0} এবং {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, বা %2$@", - "2": "%1$@ বা %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, বা {1}", + "2": "{0} বা {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, বা %2$@", - "2": "%1$@ বা %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, বা {1}", + "2": "{0} বা {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, বা %2$@", - "2": "%1$@ বা %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, বা {1}", + "2": "{0} বা {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ এবং %2$@", - "2": "%1$@ এবং %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} এবং {1}", + "2": "{0} এবং {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ এবং %2$@", - "2": "%1$@ এবং %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} এবং {1}", + "2": "{0} এবং {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bo.dataset/bo.json b/Source/Resources.xcassets/bo.dataset/bo.json index 803ad98..d5a35c7 100644 --- a/Source/Resources.xcassets/bo.dataset/bo.json +++ b/Source/Resources.xcassets/bo.dataset/bo.json @@ -2,58 +2,58 @@ "localeIdentifier": "bo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/br.dataset/br.json b/Source/Resources.xcassets/br.dataset/br.json index 6ee803c..b8f066b 100644 --- a/Source/Resources.xcassets/br.dataset/br.json +++ b/Source/Resources.xcassets/br.dataset/br.json @@ -2,58 +2,58 @@ "localeIdentifier": "br", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, pe %2$@", - "2": "%1$@ pe %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, pe {1}", + "2": "{0} pe {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, pe %2$@", - "2": "%1$@ pe %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, pe {1}", + "2": "{0} pe {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, pe %2$@", - "2": "%1$@ pe %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, pe {1}", + "2": "{0} pe {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/brx.dataset/brx.json b/Source/Resources.xcassets/brx.dataset/brx.json index 557c16a..3ab3764 100644 --- a/Source/Resources.xcassets/brx.dataset/brx.json +++ b/Source/Resources.xcassets/brx.dataset/brx.json @@ -2,58 +2,58 @@ "localeIdentifier": "brx", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bs.dataset/bs.json b/Source/Resources.xcassets/bs.dataset/bs.json index 6ca9744..67c2763 100644 --- a/Source/Resources.xcassets/bs.dataset/bs.json +++ b/Source/Resources.xcassets/bs.dataset/bs.json @@ -2,58 +2,58 @@ "localeIdentifier": "bs", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/bs_Cyrl.dataset/bs_Cyrl.json b/Source/Resources.xcassets/bs_Cyrl.dataset/bs_Cyrl.json index 06a5999..21fcd25 100644 --- a/Source/Resources.xcassets/bs_Cyrl.dataset/bs_Cyrl.json +++ b/Source/Resources.xcassets/bs_Cyrl.dataset/bs_Cyrl.json @@ -2,58 +2,58 @@ "localeIdentifier": "bs_Cyrl", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ca.dataset/ca.json b/Source/Resources.xcassets/ca.dataset/ca.json index 8b46d1b..32031c3 100644 --- a/Source/Resources.xcassets/ca.dataset/ca.json +++ b/Source/Resources.xcassets/ca.dataset/ca.json @@ -2,58 +2,58 @@ "localeIdentifier": "ca", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ca_ES_VALENCIA.dataset/ca_ES_VALENCIA.json b/Source/Resources.xcassets/ca_ES_VALENCIA.dataset/ca_ES_VALENCIA.json index 5199a24..9972006 100644 --- a/Source/Resources.xcassets/ca_ES_VALENCIA.dataset/ca_ES_VALENCIA.json +++ b/Source/Resources.xcassets/ca_ES_VALENCIA.dataset/ca_ES_VALENCIA.json @@ -2,58 +2,58 @@ "localeIdentifier": "ca_ES_VALENCIA", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ccp.dataset/ccp.json b/Source/Resources.xcassets/ccp.dataset/ccp.json index f81e687..4d9e339 100644 --- a/Source/Resources.xcassets/ccp.dataset/ccp.json +++ b/Source/Resources.xcassets/ccp.dataset/ccp.json @@ -2,58 +2,58 @@ "localeIdentifier": "ccp", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 𑄃𑄳𑄃 %2$@", - "2": "%1$@ 𑄃𑄳𑄃 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 𑄃𑄳𑄃 {1}", + "2": "{0} 𑄃𑄳𑄃 {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 𑄃𑄳𑄃 %2$@", - "2": "%1$@ 𑄃𑄳𑄃 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 𑄃𑄳𑄃 {1}", + "2": "{0} 𑄃𑄳𑄃 {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 𑄃𑄳𑄃 %2$@", - "2": "%1$@ 𑄃𑄳𑄃 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 𑄃𑄳𑄃 {1}", + "2": "{0} 𑄃𑄳𑄃 {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ce.dataset/ce.json b/Source/Resources.xcassets/ce.dataset/ce.json index 86effd5..4fa8e02 100644 --- a/Source/Resources.xcassets/ce.dataset/ce.json +++ b/Source/Resources.xcassets/ce.dataset/ce.json @@ -2,58 +2,58 @@ "localeIdentifier": "ce", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ceb.dataset/ceb.json b/Source/Resources.xcassets/ceb.dataset/ceb.json index 0937366..8a910a7 100644 --- a/Source/Resources.xcassets/ceb.dataset/ceb.json +++ b/Source/Resources.xcassets/ceb.dataset/ceb.json @@ -2,58 +2,58 @@ "localeIdentifier": "ceb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/cgg.dataset/cgg.json b/Source/Resources.xcassets/cgg.dataset/cgg.json index b8db34e..530af13 100644 --- a/Source/Resources.xcassets/cgg.dataset/cgg.json +++ b/Source/Resources.xcassets/cgg.dataset/cgg.json @@ -2,58 +2,58 @@ "localeIdentifier": "cgg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/chr.dataset/chr.json b/Source/Resources.xcassets/chr.dataset/chr.json index 94af1bb..5c33a2b 100644 --- a/Source/Resources.xcassets/chr.dataset/chr.json +++ b/Source/Resources.xcassets/chr.dataset/chr.json @@ -2,58 +2,58 @@ "localeIdentifier": "chr", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ᎠᎴ %2$@", - "2": "%1$@ ᎠᎴ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ᎠᎴ {1}", + "2": "{0} ᎠᎴ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ᎠᎴᏱᎩ %2$@", - "2": "%1$@ ᎠᎴᏱᎩ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ᎠᎴᏱᎩ {1}", + "2": "{0} ᎠᎴᏱᎩ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ᎠᎴᏱᎩ %2$@", - "2": "%1$@ ᎠᎴᏱᎩ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ᎠᎴᏱᎩ {1}", + "2": "{0} ᎠᎴᏱᎩ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ᎠᎴᏱᎩ %2$@", - "2": "%1$@ ᎠᎴᏱᎩ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ᎠᎴᏱᎩ {1}", + "2": "{0} ᎠᎴᏱᎩ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, & %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, & %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ckb.dataset/ckb.json b/Source/Resources.xcassets/ckb.dataset/ckb.json index 4f7ac9d..0a36f30 100644 --- a/Source/Resources.xcassets/ckb.dataset/ckb.json +++ b/Source/Resources.xcassets/ckb.dataset/ckb.json @@ -2,58 +2,58 @@ "localeIdentifier": "ckb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/cs.dataset/cs.json b/Source/Resources.xcassets/cs.dataset/cs.json index dcc95d0..94ba6ac 100644 --- a/Source/Resources.xcassets/cs.dataset/cs.json +++ b/Source/Resources.xcassets/cs.dataset/cs.json @@ -2,58 +2,58 @@ "localeIdentifier": "cs", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ nebo %2$@", - "2": "%1$@ nebo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} nebo {1}", + "2": "{0} nebo {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ nebo %2$@", - "2": "%1$@ nebo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} nebo {1}", + "2": "{0} nebo {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ nebo %2$@", - "2": "%1$@ nebo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} nebo {1}", + "2": "{0} nebo {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/cu.dataset/cu.json b/Source/Resources.xcassets/cu.dataset/cu.json index 05c35e8..5a487ab 100644 --- a/Source/Resources.xcassets/cu.dataset/cu.json +++ b/Source/Resources.xcassets/cu.dataset/cu.json @@ -2,58 +2,58 @@ "localeIdentifier": "cu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/cy.dataset/cy.json b/Source/Resources.xcassets/cy.dataset/cy.json index 67c5338..77db537 100644 --- a/Source/Resources.xcassets/cy.dataset/cy.json +++ b/Source/Resources.xcassets/cy.dataset/cy.json @@ -2,58 +2,58 @@ "localeIdentifier": "cy", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, a(c) %2$@", - "2": "%1$@ a(c) %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, a(c) {1}", + "2": "{0} a(c) {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ neu %2$@", - "2": "%1$@ neu %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} neu {1}", + "2": "{0} neu {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ neu %2$@", - "2": "%1$@ neu %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} neu {1}", + "2": "{0} neu {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ neu %2$@", - "2": "%1$@ neu %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} neu {1}", + "2": "{0} neu {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, a(c) %2$@", - "2": "%1$@ a(c) %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, a(c) {1}", + "2": "{0} a(c) {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/da.dataset/da.json b/Source/Resources.xcassets/da.dataset/da.json index e593645..6b09e1e 100644 --- a/Source/Resources.xcassets/da.dataset/da.json +++ b/Source/Resources.xcassets/da.dataset/da.json @@ -2,58 +2,58 @@ "localeIdentifier": "da", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/dav.dataset/dav.json b/Source/Resources.xcassets/dav.dataset/dav.json index c398aa3..431e1b3 100644 --- a/Source/Resources.xcassets/dav.dataset/dav.json +++ b/Source/Resources.xcassets/dav.dataset/dav.json @@ -2,58 +2,58 @@ "localeIdentifier": "dav", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/de.dataset/de.json b/Source/Resources.xcassets/de.dataset/de.json index 675661e..340f4cc 100644 --- a/Source/Resources.xcassets/de.dataset/de.json +++ b/Source/Resources.xcassets/de.dataset/de.json @@ -2,58 +2,58 @@ "localeIdentifier": "de", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ oder %2$@", - "2": "%1$@ oder %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} oder {1}", + "2": "{0} oder {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ oder %2$@", - "2": "%1$@ oder %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} oder {1}", + "2": "{0} oder {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ oder %2$@", - "2": "%1$@ oder %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} oder {1}", + "2": "{0} oder {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/dje.dataset/dje.json b/Source/Resources.xcassets/dje.dataset/dje.json index 124a562..bbd0233 100644 --- a/Source/Resources.xcassets/dje.dataset/dje.json +++ b/Source/Resources.xcassets/dje.dataset/dje.json @@ -2,58 +2,58 @@ "localeIdentifier": "dje", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/dsb.dataset/dsb.json b/Source/Resources.xcassets/dsb.dataset/dsb.json index adbf39d..b221ae5 100644 --- a/Source/Resources.xcassets/dsb.dataset/dsb.json +++ b/Source/Resources.xcassets/dsb.dataset/dsb.json @@ -2,58 +2,58 @@ "localeIdentifier": "dsb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/dua.dataset/dua.json b/Source/Resources.xcassets/dua.dataset/dua.json index c30f171..d5083de 100644 --- a/Source/Resources.xcassets/dua.dataset/dua.json +++ b/Source/Resources.xcassets/dua.dataset/dua.json @@ -2,58 +2,58 @@ "localeIdentifier": "dua", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/dyo.dataset/dyo.json b/Source/Resources.xcassets/dyo.dataset/dyo.json index fff332d..e40e276 100644 --- a/Source/Resources.xcassets/dyo.dataset/dyo.json +++ b/Source/Resources.xcassets/dyo.dataset/dyo.json @@ -2,58 +2,58 @@ "localeIdentifier": "dyo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/dz.dataset/dz.json b/Source/Resources.xcassets/dz.dataset/dz.json index d262ec2..5c8dc01 100644 --- a/Source/Resources.xcassets/dz.dataset/dz.json +++ b/Source/Resources.xcassets/dz.dataset/dz.json @@ -2,58 +2,58 @@ "localeIdentifier": "dz", "listPatterns": { "standard": { - "start": "%1$@ དང་ %2$@", - "middle": "%1$@ དང་ %2$@", - "end": "%1$@ དང་ %2$@", - "2": "%1$@ དང་ %2$@" + "start": "{0} དང་ {1}", + "middle": "{0} དང་ {1}", + "end": "{0} དང་ {1}", + "2": "{0} དང་ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@ དང་ %2$@", - "middle": "%1$@ དང་ %2$@", - "end": "%1$@ དང་ %2$@", - "2": "%1$@ དང་ %2$@" + "start": "{0} དང་ {1}", + "middle": "{0} དང་ {1}", + "end": "{0} དང་ {1}", + "2": "{0} དང་ {1}" }, "standardShort": { - "start": "%1$@ དང་ %2$@", - "middle": "%1$@ དང་ %2$@", - "end": "%1$@ དང་ %2$@", - "2": "%1$@ དང་ %2$@" + "start": "{0} དང་ {1}", + "middle": "{0} དང་ {1}", + "end": "{0} དང་ {1}", + "2": "{0} དང་ {1}" }, "unit": { - "start": "%1$@ དང་ %2$@", - "middle": "%1$@ དང་ %2$@", - "end": "%1$@ དང་ %2$@", - "2": "%1$@ དང་ %2$@" + "start": "{0} དང་ {1}", + "middle": "{0} དང་ {1}", + "end": "{0} དང་ {1}", + "2": "{0} དང་ {1}" }, "unitNarrow": { - "start": "%1$@ དང་ %2$@", - "middle": "%1$@ དང་ %2$@", - "end": "%1$@ དང་ %2$@", - "2": "%1$@ དང་ %2$@" + "start": "{0} དང་ {1}", + "middle": "{0} དང་ {1}", + "end": "{0} དང་ {1}", + "2": "{0} དང་ {1}" }, "unitShort": { - "start": "%1$@ དང་ %2$@", - "middle": "%1$@ དང་ %2$@", - "end": "%1$@ དང་ %2$@", - "2": "%1$@ དང་ %2$@" + "start": "{0} དང་ {1}", + "middle": "{0} དང་ {1}", + "end": "{0} དང་ {1}", + "2": "{0} དང་ {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ebu.dataset/ebu.json b/Source/Resources.xcassets/ebu.dataset/ebu.json index e0c9ccf..21c9e97 100644 --- a/Source/Resources.xcassets/ebu.dataset/ebu.json +++ b/Source/Resources.xcassets/ebu.dataset/ebu.json @@ -2,58 +2,58 @@ "localeIdentifier": "ebu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ee.dataset/ee.json b/Source/Resources.xcassets/ee.dataset/ee.json index 47002d8..f7e435d 100644 --- a/Source/Resources.xcassets/ee.dataset/ee.json +++ b/Source/Resources.xcassets/ee.dataset/ee.json @@ -2,58 +2,58 @@ "localeIdentifier": "ee", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, kple %2$@", - "2": "%1$@ kple %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, kple {1}", + "2": "{0} kple {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, kple %2$@", - "2": "%1$@ kple %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, kple {1}", + "2": "{0} kple {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, kple %2$@", - "2": "%1$@ kple %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, kple {1}", + "2": "{0} kple {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, kple %2$@", - "2": "%1$@ kple %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, kple {1}", + "2": "{0} kple {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, kple %2$@", - "2": "%1$@ kple %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, kple {1}", + "2": "{0} kple {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, kple %2$@", - "2": "%1$@ kple %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, kple {1}", + "2": "{0} kple {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/el.dataset/el.json b/Source/Resources.xcassets/el.dataset/el.json index 08102f1..4a0a2c7 100644 --- a/Source/Resources.xcassets/el.dataset/el.json +++ b/Source/Resources.xcassets/el.dataset/el.json @@ -2,58 +2,58 @@ "localeIdentifier": "el", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ και %2$@", - "2": "%1$@ και %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} και {1}", + "2": "{0} και {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ή %2$@", - "2": "%1$@ ή %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ή {1}", + "2": "{0} ή {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ή %2$@", - "2": "%1$@ ή %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ή {1}", + "2": "{0} ή {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ή %2$@", - "2": "%1$@ ή %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ή {1}", + "2": "{0} ή {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ και %2$@", - "2": "%1$@ και %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} και {1}", + "2": "{0} και {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/en.dataset/en.json b/Source/Resources.xcassets/en.dataset/en.json index 0770935..f95fa0c 100644 --- a/Source/Resources.xcassets/en.dataset/en.json +++ b/Source/Resources.xcassets/en.dataset/en.json @@ -2,58 +2,58 @@ "localeIdentifier": "en", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, & %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/en_AU.dataset/en_AU.json b/Source/Resources.xcassets/en_AU.dataset/en_AU.json index b279e82..b23c7b6 100644 --- a/Source/Resources.xcassets/en_AU.dataset/en_AU.json +++ b/Source/Resources.xcassets/en_AU.dataset/en_AU.json @@ -2,58 +2,58 @@ "localeIdentifier": "en_AU", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ and %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/en_CA.dataset/en_CA.json b/Source/Resources.xcassets/en_CA.dataset/en_CA.json index 30b91cb..02b8b4b 100644 --- a/Source/Resources.xcassets/en_CA.dataset/en_CA.json +++ b/Source/Resources.xcassets/en_CA.dataset/en_CA.json @@ -2,58 +2,58 @@ "localeIdentifier": "en_CA", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/en_GB.dataset/en_GB.json b/Source/Resources.xcassets/en_GB.dataset/en_GB.json index 98ec01e..24f7c7e 100644 --- a/Source/Resources.xcassets/en_GB.dataset/en_GB.json +++ b/Source/Resources.xcassets/en_GB.dataset/en_GB.json @@ -2,58 +2,58 @@ "localeIdentifier": "en_GB", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}", + "2": "{0} and {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/en_IN.dataset/en_IN.json b/Source/Resources.xcassets/en_IN.dataset/en_IN.json index f17d4e5..c436903 100644 --- a/Source/Resources.xcassets/en_IN.dataset/en_IN.json +++ b/Source/Resources.xcassets/en_IN.dataset/en_IN.json @@ -2,58 +2,58 @@ "localeIdentifier": "en_IN", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, & %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/en_US_POSIX.dataset/en_US_POSIX.json b/Source/Resources.xcassets/en_US_POSIX.dataset/en_US_POSIX.json index 2416cd6..dccd388 100644 --- a/Source/Resources.xcassets/en_US_POSIX.dataset/en_US_POSIX.json +++ b/Source/Resources.xcassets/en_US_POSIX.dataset/en_US_POSIX.json @@ -2,58 +2,58 @@ "localeIdentifier": "en_US_POSIX", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, & %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/eo.dataset/eo.json b/Source/Resources.xcassets/eo.dataset/eo.json index c1ce00d..180ddf4 100644 --- a/Source/Resources.xcassets/eo.dataset/eo.json +++ b/Source/Resources.xcassets/eo.dataset/eo.json @@ -2,58 +2,58 @@ "localeIdentifier": "eo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/es.dataset/es.json b/Source/Resources.xcassets/es.dataset/es.json index 3cdb529..4f15e46 100644 --- a/Source/Resources.xcassets/es.dataset/es.json +++ b/Source/Resources.xcassets/es.dataset/es.json @@ -2,58 +2,58 @@ "localeIdentifier": "es", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} y {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/es_DO.dataset/es_DO.json b/Source/Resources.xcassets/es_DO.dataset/es_DO.json index 47d7e56..ab9c6b6 100644 --- a/Source/Resources.xcassets/es_DO.dataset/es_DO.json +++ b/Source/Resources.xcassets/es_DO.dataset/es_DO.json @@ -2,58 +2,58 @@ "localeIdentifier": "es_DO", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} y {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/es_PY.dataset/es_PY.json b/Source/Resources.xcassets/es_PY.dataset/es_PY.json index 409aada..0e49ec8 100644 --- a/Source/Resources.xcassets/es_PY.dataset/es_PY.json +++ b/Source/Resources.xcassets/es_PY.dataset/es_PY.json @@ -2,58 +2,58 @@ "localeIdentifier": "es_PY", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ y %2$@", - "2": "%1$@ y %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} y {1}", + "2": "{0} y {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/et.dataset/et.json b/Source/Resources.xcassets/et.dataset/et.json index bee0b88..823676d 100644 --- a/Source/Resources.xcassets/et.dataset/et.json +++ b/Source/Resources.xcassets/et.dataset/et.json @@ -2,58 +2,58 @@ "localeIdentifier": "et", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ või %2$@", - "2": "%1$@ või %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} või {1}", + "2": "{0} või {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ või %2$@", - "2": "%1$@ või %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} või {1}", + "2": "{0} või {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ või %2$@", - "2": "%1$@ või %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} või {1}", + "2": "{0} või {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/eu.dataset/eu.json b/Source/Resources.xcassets/eu.dataset/eu.json index dae1ec9..5d7ab07 100644 --- a/Source/Resources.xcassets/eu.dataset/eu.json +++ b/Source/Resources.xcassets/eu.dataset/eu.json @@ -2,58 +2,58 @@ "localeIdentifier": "eu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eta %2$@", - "2": "%1$@ eta %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}", + "2": "{0} eta {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ edo %2$@", - "2": "%1$@ edo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} edo {1}", + "2": "{0} edo {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ edo %2$@", - "2": "%1$@ edo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} edo {1}", + "2": "{0} edo {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ edo %2$@", - "2": "%1$@ edo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} edo {1}", + "2": "{0} edo {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eta %2$@", - "2": "%1$@ eta %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}", + "2": "{0} eta {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eta %2$@", - "2": "%1$@ eta %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}", + "2": "{0} eta {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eta %2$@", - "2": "%1$@ eta %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}", + "2": "{0} eta {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eta %2$@", - "2": "%1$@ eta %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}", + "2": "{0} eta {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eta %2$@", - "2": "%1$@ eta %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}", + "2": "{0} eta {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ewo.dataset/ewo.json b/Source/Resources.xcassets/ewo.dataset/ewo.json index d0437af..fb3e464 100644 --- a/Source/Resources.xcassets/ewo.dataset/ewo.json +++ b/Source/Resources.xcassets/ewo.dataset/ewo.json @@ -2,58 +2,58 @@ "localeIdentifier": "ewo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fa.dataset/fa.json b/Source/Resources.xcassets/fa.dataset/fa.json index 3d701d2..6ab2d66 100644 --- a/Source/Resources.xcassets/fa.dataset/fa.json +++ b/Source/Resources.xcassets/fa.dataset/fa.json @@ -2,58 +2,58 @@ "localeIdentifier": "fa", "listPatterns": { "standard": { - "start": "%1$@،‏ %2$@", - "middle": "%1$@،‏ %2$@", - "end": "%1$@، و %2$@", - "2": "%1$@ و %2$@" + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}", + "2": "{0} و {1}" }, "or": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "orNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "orShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "standardNarrow": { - "start": "%1$@،‏ %2$@", - "middle": "%1$@،‏ %2$@", - "end": "%1$@، و %2$@", - "2": "%1$@، %2$@" + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}", + "2": "{0}، {1}" }, "standardShort": { - "start": "%1$@،‏ %2$@", - "middle": "%1$@،‏ %2$@", - "end": "%1$@، و %2$@", - "2": "%1$@ و %2$@" + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}", + "2": "{0} و {1}" }, "unit": { - "start": "%1$@،‏ %2$@", - "middle": "%1$@،‏ %2$@", - "end": "%1$@، و %2$@", - "2": "%1$@ و %2$@" + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}", + "2": "{0} و {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@،‏ %2$@", - "middle": "%1$@،‏ %2$@", - "end": "%1$@،‏ %2$@", - "2": "%1$@،‏ %2$@" + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}،‏ {1}", + "2": "{0}،‏ {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ff.dataset/ff.json b/Source/Resources.xcassets/ff.dataset/ff.json index ce21a0f..972c8c3 100644 --- a/Source/Resources.xcassets/ff.dataset/ff.json +++ b/Source/Resources.xcassets/ff.dataset/ff.json @@ -2,58 +2,58 @@ "localeIdentifier": "ff", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fi.dataset/fi.json b/Source/Resources.xcassets/fi.dataset/fi.json index 65bd434..4a6ca32 100644 --- a/Source/Resources.xcassets/fi.dataset/fi.json +++ b/Source/Resources.xcassets/fi.dataset/fi.json @@ -2,58 +2,58 @@ "localeIdentifier": "fi", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ tai %2$@", - "2": "%1$@ tai %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} tai {1}", + "2": "{0} tai {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ tai %2$@", - "2": "%1$@ tai %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} tai {1}", + "2": "{0} tai {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ tai %2$@", - "2": "%1$@ tai %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} tai {1}", + "2": "{0} tai {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fil.dataset/fil.json b/Source/Resources.xcassets/fil.dataset/fil.json index 084a5f7..545dbfd 100644 --- a/Source/Resources.xcassets/fil.dataset/fil.json +++ b/Source/Resources.xcassets/fil.dataset/fil.json @@ -2,58 +2,58 @@ "localeIdentifier": "fil", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, at %2$@", - "2": "%1$@ at %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}", + "2": "{0} at {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fo.dataset/fo.json b/Source/Resources.xcassets/fo.dataset/fo.json index 2197ed7..9da4ebd 100644 --- a/Source/Resources.xcassets/fo.dataset/fo.json +++ b/Source/Resources.xcassets/fo.dataset/fo.json @@ -2,58 +2,58 @@ "localeIdentifier": "fo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ella %2$@", - "2": "%1$@ ella %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ella {1}", + "2": "{0} ella {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ella %2$@", - "2": "%1$@ ella %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ella {1}", + "2": "{0} ella {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ella %2$@", - "2": "%1$@ ella %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ella {1}", + "2": "{0} ella {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fr.dataset/fr.json b/Source/Resources.xcassets/fr.dataset/fr.json index efcc6a2..31e0e1b 100644 --- a/Source/Resources.xcassets/fr.dataset/fr.json +++ b/Source/Resources.xcassets/fr.dataset/fr.json @@ -2,58 +2,58 @@ "localeIdentifier": "fr", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ et %2$@", - "2": "%1$@ et %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}", + "2": "{0} et {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ et %2$@", - "2": "%1$@ et %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}", + "2": "{0} et {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ et %2$@", - "2": "%1$@ et %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}", + "2": "{0} et {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ et %2$@", - "2": "%1$@ et %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}", + "2": "{0} et {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fur.dataset/fur.json b/Source/Resources.xcassets/fur.dataset/fur.json index 96e72f8..9636d6d 100644 --- a/Source/Resources.xcassets/fur.dataset/fur.json +++ b/Source/Resources.xcassets/fur.dataset/fur.json @@ -2,58 +2,58 @@ "localeIdentifier": "fur", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/fy.dataset/fy.json b/Source/Resources.xcassets/fy.dataset/fy.json index c264a8a..43ade35 100644 --- a/Source/Resources.xcassets/fy.dataset/fy.json +++ b/Source/Resources.xcassets/fy.dataset/fy.json @@ -2,58 +2,58 @@ "localeIdentifier": "fy", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} en {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ga.dataset/ga.json b/Source/Resources.xcassets/ga.dataset/ga.json index 2b26f97..04c1239 100644 --- a/Source/Resources.xcassets/ga.dataset/ga.json +++ b/Source/Resources.xcassets/ga.dataset/ga.json @@ -2,58 +2,58 @@ "localeIdentifier": "ga", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, agus %2$@", - "2": "%1$@ agus %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, agus {1}", + "2": "{0} agus {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, nó %2$@", - "2": "%1$@ nó %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, nó {1}", + "2": "{0} nó {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, nó %2$@", - "2": "%1$@ nó %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, nó {1}", + "2": "{0} nó {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, nó %2$@", - "2": "%1$@ nó %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, nó {1}", + "2": "{0} nó {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, agus %2$@", - "2": "%1$@ agus %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, agus {1}", + "2": "{0} agus {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, agus %2$@", - "2": "%1$@ agus %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, agus {1}", + "2": "{0} agus {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/gd.dataset/gd.json b/Source/Resources.xcassets/gd.dataset/gd.json index f3bd060..8132c23 100644 --- a/Source/Resources.xcassets/gd.dataset/gd.json +++ b/Source/Resources.xcassets/gd.dataset/gd.json @@ -2,58 +2,58 @@ "localeIdentifier": "gd", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ agus %2$@", - "2": "%1$@ agus %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} agus {1}", + "2": "{0} agus {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ no %2$@", - "2": "%1$@ no %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} no {1}", + "2": "{0} no {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ no %2$@", - "2": "%1$@ no %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} no {1}", + "2": "{0} no {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ no %2$@", - "2": "%1$@ no %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} no {1}", + "2": "{0} no {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ⁊ %2$@", - "2": "%1$@ ⁊ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ⁊ {1}", + "2": "{0} ⁊ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ agus %2$@", - "2": "%1$@ agus %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} agus {1}", + "2": "{0} agus {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ’s %2$@", - "2": "%1$@ ’s %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ’s {1}", + "2": "{0} ’s {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/gl.dataset/gl.json b/Source/Resources.xcassets/gl.dataset/gl.json index 9c6a1cb..7407b29 100644 --- a/Source/Resources.xcassets/gl.dataset/gl.json +++ b/Source/Resources.xcassets/gl.dataset/gl.json @@ -2,58 +2,58 @@ "localeIdentifier": "gl", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/gsw.dataset/gsw.json b/Source/Resources.xcassets/gsw.dataset/gsw.json index 8274eb4..1a46467 100644 --- a/Source/Resources.xcassets/gsw.dataset/gsw.json +++ b/Source/Resources.xcassets/gsw.dataset/gsw.json @@ -2,58 +2,58 @@ "localeIdentifier": "gsw", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/gu.dataset/gu.json b/Source/Resources.xcassets/gu.dataset/gu.json index 4c521f5..096a095 100644 --- a/Source/Resources.xcassets/gu.dataset/gu.json +++ b/Source/Resources.xcassets/gu.dataset/gu.json @@ -2,58 +2,58 @@ "localeIdentifier": "gu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ અને %2$@", - "2": "%1$@ અને %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અને {1}", + "2": "{0} અને {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, અથવા %2$@", - "2": "%1$@ અથવા %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, અથવા {1}", + "2": "{0} અથવા {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, અથવા %2$@", - "2": "%1$@ અથવા %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, અથવા {1}", + "2": "{0} અથવા {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, અથવા %2$@", - "2": "%1$@ અથવા %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, અથવા {1}", + "2": "{0} અથવા {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ અને %2$@", - "2": "%1$@ અને %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અને {1}", + "2": "{0} અને {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ અને %2$@", - "2": "%1$@ અને %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અને {1}", + "2": "{0} અને {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ અને %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} અને {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/guz.dataset/guz.json b/Source/Resources.xcassets/guz.dataset/guz.json index 7abed88..cc93ea1 100644 --- a/Source/Resources.xcassets/guz.dataset/guz.json +++ b/Source/Resources.xcassets/guz.dataset/guz.json @@ -2,58 +2,58 @@ "localeIdentifier": "guz", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/gv.dataset/gv.json b/Source/Resources.xcassets/gv.dataset/gv.json index a53cde2..3551372 100644 --- a/Source/Resources.xcassets/gv.dataset/gv.json +++ b/Source/Resources.xcassets/gv.dataset/gv.json @@ -2,58 +2,58 @@ "localeIdentifier": "gv", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ha.dataset/ha.json b/Source/Resources.xcassets/ha.dataset/ha.json index 7ab7adc..0bf3490 100644 --- a/Source/Resources.xcassets/ha.dataset/ha.json +++ b/Source/Resources.xcassets/ha.dataset/ha.json @@ -2,58 +2,58 @@ "localeIdentifier": "ha", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ da %2$@", - "2": "%1$@ da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} da {1}", + "2": "{0} da {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ da %2$@", - "2": "%1$@ da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} da {1}", + "2": "{0} da {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ da %2$@", - "2": "%1$@ da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} da {1}", + "2": "{0} da {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ da %2$@", - "2": "%1$@ da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} da {1}", + "2": "{0} da {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ da %2$@", - "2": "%1$@ da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} da {1}", + "2": "{0} da {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ da %2$@", - "2": "%1$@ da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} da {1}", + "2": "{0} da {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/haw.dataset/haw.json b/Source/Resources.xcassets/haw.dataset/haw.json index 9a656b7..a599b3f 100644 --- a/Source/Resources.xcassets/haw.dataset/haw.json +++ b/Source/Resources.xcassets/haw.dataset/haw.json @@ -2,58 +2,58 @@ "localeIdentifier": "haw", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/he.dataset/he.json b/Source/Resources.xcassets/he.dataset/he.json index bda417b..3cfa0de 100644 --- a/Source/Resources.xcassets/he.dataset/he.json +++ b/Source/Resources.xcassets/he.dataset/he.json @@ -2,58 +2,58 @@ "localeIdentifier": "he", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ו%2$@", - "2": "%1$@ ו%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ו{1}", + "2": "{0} ו{1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, או %2$@", - "2": "%1$@ או %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, או {1}", + "2": "{0} או {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, או %2$@", - "2": "%1$@ או %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, או {1}", + "2": "{0} או {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, או %2$@", - "2": "%1$@ או %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, או {1}", + "2": "{0} או {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ו%2$@", - "2": "%1$@ ו%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ו{1}", + "2": "{0} ו{1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ו%2$@", - "2": "%1$@ ו%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ו{1}", + "2": "{0} ו{1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ו%2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ו{1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/hi.dataset/hi.json b/Source/Resources.xcassets/hi.dataset/hi.json index d063fa9..bac46ea 100644 --- a/Source/Resources.xcassets/hi.dataset/hi.json +++ b/Source/Resources.xcassets/hi.dataset/hi.json @@ -2,58 +2,58 @@ "localeIdentifier": "hi", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, और %2$@", - "2": "%1$@ और %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, और {1}", + "2": "{0} और {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ या %2$@", - "2": "%1$@ या %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} या {1}", + "2": "{0} या {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ या %2$@", - "2": "%1$@ या %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} या {1}", + "2": "{0} या {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ या %2$@", - "2": "%1$@ या %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} या {1}", + "2": "{0} या {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ और %2$@", - "2": "%1$@ और %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} और {1}", + "2": "{0} और {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ और %2$@", - "2": "%1$@ और %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} और {1}", + "2": "{0} और {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, और %2$@", - "2": "%1$@ और %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, और {1}", + "2": "{0} और {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, और %2$@", - "2": "%1$@ और %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, और {1}", + "2": "{0} और {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, और %2$@", - "2": "%1$@ और %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, और {1}", + "2": "{0} और {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/hr.dataset/hr.json b/Source/Resources.xcassets/hr.dataset/hr.json index 18a0150..e2420f9 100644 --- a/Source/Resources.xcassets/hr.dataset/hr.json +++ b/Source/Resources.xcassets/hr.dataset/hr.json @@ -2,58 +2,58 @@ "localeIdentifier": "hr", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/hsb.dataset/hsb.json b/Source/Resources.xcassets/hsb.dataset/hsb.json index d8529fc..eb63967 100644 --- a/Source/Resources.xcassets/hsb.dataset/hsb.json +++ b/Source/Resources.xcassets/hsb.dataset/hsb.json @@ -2,58 +2,58 @@ "localeIdentifier": "hsb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/hu.dataset/hu.json b/Source/Resources.xcassets/hu.dataset/hu.json index 8305e19..b6db9bf 100644 --- a/Source/Resources.xcassets/hu.dataset/hu.json +++ b/Source/Resources.xcassets/hu.dataset/hu.json @@ -2,58 +2,58 @@ "localeIdentifier": "hu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ és %2$@", - "2": "%1$@ és %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} és {1}", + "2": "{0} és {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ vagy %2$@", - "2": "%1$@ vagy %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} vagy {1}", + "2": "{0} vagy {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ vagy %2$@", - "2": "%1$@ vagy %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} vagy {1}", + "2": "{0} vagy {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ vagy %2$@", - "2": "%1$@ vagy %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} vagy {1}", + "2": "{0} vagy {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ és %2$@", - "2": "%1$@ és %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} és {1}", + "2": "{0} és {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ és %2$@", - "2": "%1$@ és %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} és {1}", + "2": "{0} és {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ és %2$@", - "2": "%1$@ és %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} és {1}", + "2": "{0} és {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ és %2$@", - "2": "%1$@ és %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} és {1}", + "2": "{0} és {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ és %2$@", - "2": "%1$@ és %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} és {1}", + "2": "{0} és {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/hy.dataset/hy.json b/Source/Resources.xcassets/hy.dataset/hy.json index 48a78cf..acc141e 100644 --- a/Source/Resources.xcassets/hy.dataset/hy.json +++ b/Source/Resources.xcassets/hy.dataset/hy.json @@ -2,58 +2,58 @@ "localeIdentifier": "hy", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ և %2$@", - "2": "%1$@ և %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}", + "2": "{0} և {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ կամ %2$@", - "2": "%1$@ կամ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} կամ {1}", + "2": "{0} կամ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ կամ %2$@", - "2": "%1$@ կամ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} կամ {1}", + "2": "{0} կամ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ կամ %2$@", - "2": "%1$@ կամ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} կամ {1}", + "2": "{0} կամ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ և %2$@", - "2": "%1$@ և %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}", + "2": "{0} և {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ և %2$@", - "2": "%1$@ և %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}", + "2": "{0} և {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ և %2$@", - "2": "%1$@ և %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}", + "2": "{0} և {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ և %2$@", - "2": "%1$@ և %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} և {1}", + "2": "{0} և {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ia.dataset/ia.json b/Source/Resources.xcassets/ia.dataset/ia.json index 75f4d11..c309d14 100644 --- a/Source/Resources.xcassets/ia.dataset/ia.json +++ b/Source/Resources.xcassets/ia.dataset/ia.json @@ -2,58 +2,58 @@ "localeIdentifier": "ia", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/id.dataset/id.json b/Source/Resources.xcassets/id.dataset/id.json index 77d7263..010ac1d 100644 --- a/Source/Resources.xcassets/id.dataset/id.json +++ b/Source/Resources.xcassets/id.dataset/id.json @@ -2,58 +2,58 @@ "localeIdentifier": "id", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, dan %2$@", - "2": "%1$@ dan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, dan {1}", + "2": "{0} dan {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, atau %2$@", - "2": "%1$@ atau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, atau {1}", + "2": "{0} atau {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, atau %2$@", - "2": "%1$@ atau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, atau {1}", + "2": "{0} atau {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, atau %2$@", - "2": "%1$@ atau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, atau {1}", + "2": "{0} atau {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, dan %2$@", - "2": "%1$@ dan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, dan {1}", + "2": "{0} dan {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ig.dataset/ig.json b/Source/Resources.xcassets/ig.dataset/ig.json index b99de71..bc1f5fe 100644 --- a/Source/Resources.xcassets/ig.dataset/ig.json +++ b/Source/Resources.xcassets/ig.dataset/ig.json @@ -2,58 +2,58 @@ "localeIdentifier": "ig", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}", + "2": "{0} na {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}", + "2": "{0} na {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}", + "2": "{0} na {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}", + "2": "{0} na {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}", + "2": "{0} na {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}", + "2": "{0} na {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ii.dataset/ii.json b/Source/Resources.xcassets/ii.dataset/ii.json index 985e5bd..f8e60f0 100644 --- a/Source/Resources.xcassets/ii.dataset/ii.json +++ b/Source/Resources.xcassets/ii.dataset/ii.json @@ -2,58 +2,58 @@ "localeIdentifier": "ii", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/is.dataset/is.json b/Source/Resources.xcassets/is.dataset/is.json index 874d4bb..60b4ade 100644 --- a/Source/Resources.xcassets/is.dataset/is.json +++ b/Source/Resources.xcassets/is.dataset/is.json @@ -2,58 +2,58 @@ "localeIdentifier": "is", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eða %2$@", - "2": "%1$@ eða %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eða {1}", + "2": "{0} eða {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eða %2$@", - "2": "%1$@ eða %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eða {1}", + "2": "{0} eða {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eða %2$@", - "2": "%1$@ eða %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eða {1}", + "2": "{0} eða {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/it.dataset/it.json b/Source/Resources.xcassets/it.dataset/it.json index 00d8c63..6e8961e 100644 --- a/Source/Resources.xcassets/it.dataset/it.json +++ b/Source/Resources.xcassets/it.dataset/it.json @@ -2,58 +2,58 @@ "localeIdentifier": "it", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ o %2$@", - "2": "%1$@ o %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} o {1}", + "2": "{0} o {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ja.dataset/ja.json b/Source/Resources.xcassets/ja.dataset/ja.json index 1d20b96..abe5928 100644 --- a/Source/Resources.xcassets/ja.dataset/ja.json +++ b/Source/Resources.xcassets/ja.dataset/ja.json @@ -2,58 +2,58 @@ "localeIdentifier": "ja", "listPatterns": { "standard": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@、%2$@", - "2": "%1$@、%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}、{1}", + "2": "{0}、{1}" }, "or": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@、または%2$@", - "2": "%1$@または%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}、または{1}", + "2": "{0}または{1}" }, "orNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@、または%2$@", - "2": "%1$@または%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}、または{1}", + "2": "{0}または{1}" }, "orShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@、または%2$@", - "2": "%1$@または%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}、または{1}", + "2": "{0}または{1}" }, "standardNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@、%2$@", - "2": "%1$@、%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}、{1}", + "2": "{0}、{1}" }, "standardShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@、%2$@", - "2": "%1$@、%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}、{1}", + "2": "{0}、{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/jgo.dataset/jgo.json b/Source/Resources.xcassets/jgo.dataset/jgo.json index 312e805..0acd49c 100644 --- a/Source/Resources.xcassets/jgo.dataset/jgo.json +++ b/Source/Resources.xcassets/jgo.dataset/jgo.json @@ -2,58 +2,58 @@ "localeIdentifier": "jgo", "listPatterns": { "standard": { - "start": "%1$@, ŋ́gɛ %2$@", - "middle": "%1$@, ŋ́gɛ %2$@", - "end": "%1$@, ḿbɛn ŋ́gɛ %2$@", - "2": "%1$@ pɔp %2$@" + "start": "{0}, ŋ́gɛ {1}", + "middle": "{0}, ŋ́gɛ {1}", + "end": "{0}, ḿbɛn ŋ́gɛ {1}", + "2": "{0} pɔp {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, ŋ́gɛ %2$@", - "middle": "%1$@, ŋ́gɛ %2$@", - "end": "%1$@, ḿbɛn ŋ́gɛ %2$@", - "2": "%1$@ pɔp %2$@" + "start": "{0}, ŋ́gɛ {1}", + "middle": "{0}, ŋ́gɛ {1}", + "end": "{0}, ḿbɛn ŋ́gɛ {1}", + "2": "{0} pɔp {1}" }, "standardShort": { - "start": "%1$@, ŋ́gɛ %2$@", - "middle": "%1$@, ŋ́gɛ %2$@", - "end": "%1$@, ḿbɛn ŋ́gɛ %2$@", - "2": "%1$@ pɔp %2$@" + "start": "{0}, ŋ́gɛ {1}", + "middle": "{0}, ŋ́gɛ {1}", + "end": "{0}, ḿbɛn ŋ́gɛ {1}", + "2": "{0} pɔp {1}" }, "unit": { - "start": "%1$@, ŋ́gɛ %2$@", - "middle": "%1$@, ŋ́gɛ %2$@", - "end": "%1$@, ḿbɛn ŋ́gɛ %2$@", - "2": "%1$@ pɔp %2$@" + "start": "{0}, ŋ́gɛ {1}", + "middle": "{0}, ŋ́gɛ {1}", + "end": "{0}, ḿbɛn ŋ́gɛ {1}", + "2": "{0} pɔp {1}" }, "unitNarrow": { - "start": "%1$@, ŋ́gɛ %2$@", - "middle": "%1$@, ŋ́gɛ %2$@", - "end": "%1$@, ḿbɛn ŋ́gɛ %2$@", - "2": "%1$@ pɔp %2$@" + "start": "{0}, ŋ́gɛ {1}", + "middle": "{0}, ŋ́gɛ {1}", + "end": "{0}, ḿbɛn ŋ́gɛ {1}", + "2": "{0} pɔp {1}" }, "unitShort": { - "start": "%1$@, ŋ́gɛ %2$@", - "middle": "%1$@, ŋ́gɛ %2$@", - "end": "%1$@, ḿbɛn ŋ́gɛ %2$@", - "2": "%1$@ pɔp %2$@" + "start": "{0}, ŋ́gɛ {1}", + "middle": "{0}, ŋ́gɛ {1}", + "end": "{0}, ḿbɛn ŋ́gɛ {1}", + "2": "{0} pɔp {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/jmc.dataset/jmc.json b/Source/Resources.xcassets/jmc.dataset/jmc.json index e2cbc32..98a6c95 100644 --- a/Source/Resources.xcassets/jmc.dataset/jmc.json +++ b/Source/Resources.xcassets/jmc.dataset/jmc.json @@ -2,58 +2,58 @@ "localeIdentifier": "jmc", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/jv.dataset/jv.json b/Source/Resources.xcassets/jv.dataset/jv.json index 0214770..91577e2 100644 --- a/Source/Resources.xcassets/jv.dataset/jv.json +++ b/Source/Resources.xcassets/jv.dataset/jv.json @@ -2,58 +2,58 @@ "localeIdentifier": "jv", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, lan %2$@", - "2": "%1$@ lan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, lan {1}", + "2": "{0} lan {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, utowo %2$@", - "2": "%1$@ utowo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, utowo {1}", + "2": "{0} utowo {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, utowo %2$@", - "2": "%1$@ utowo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, utowo {1}", + "2": "{0} utowo {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, utowo %2$@", - "2": "%1$@ utowo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, utowo {1}", + "2": "{0} utowo {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, lan %2$@", - "2": "%1$@ lan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, lan {1}", + "2": "{0} lan {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, lan %2$@", - "2": "%1$@ lan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, lan {1}", + "2": "{0} lan {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ka.dataset/ka.json b/Source/Resources.xcassets/ka.dataset/ka.json index 95f86f6..e3af615 100644 --- a/Source/Resources.xcassets/ka.dataset/ka.json +++ b/Source/Resources.xcassets/ka.dataset/ka.json @@ -2,58 +2,58 @@ "localeIdentifier": "ka", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ და %2$@", - "2": "%1$@ და %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} და {1}", + "2": "{0} და {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ან %2$@", - "2": "%1$@ ან %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ან {1}", + "2": "{0} ან {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ან %2$@", - "2": "%1$@ ან %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ან {1}", + "2": "{0} ან {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ან %2$@", - "2": "%1$@ ან %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ან {1}", + "2": "{0} ან {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ და %2$@", - "2": "%1$@ და %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} და {1}", + "2": "{0} და {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ და %2$@", - "2": "%1$@ და %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} და {1}", + "2": "{0} და {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kab.dataset/kab.json b/Source/Resources.xcassets/kab.dataset/kab.json index 5553239..fdc8339 100644 --- a/Source/Resources.xcassets/kab.dataset/kab.json +++ b/Source/Resources.xcassets/kab.dataset/kab.json @@ -2,58 +2,58 @@ "localeIdentifier": "kab", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kam.dataset/kam.json b/Source/Resources.xcassets/kam.dataset/kam.json index 2b2f13f..65ca2da 100644 --- a/Source/Resources.xcassets/kam.dataset/kam.json +++ b/Source/Resources.xcassets/kam.dataset/kam.json @@ -2,58 +2,58 @@ "localeIdentifier": "kam", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kde.dataset/kde.json b/Source/Resources.xcassets/kde.dataset/kde.json index d7955ff..de3fc63 100644 --- a/Source/Resources.xcassets/kde.dataset/kde.json +++ b/Source/Resources.xcassets/kde.dataset/kde.json @@ -2,58 +2,58 @@ "localeIdentifier": "kde", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kea.dataset/kea.json b/Source/Resources.xcassets/kea.dataset/kea.json index 58b10a6..623cc69 100644 --- a/Source/Resources.xcassets/kea.dataset/kea.json +++ b/Source/Resources.xcassets/kea.dataset/kea.json @@ -2,58 +2,58 @@ "localeIdentifier": "kea", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/khq.dataset/khq.json b/Source/Resources.xcassets/khq.dataset/khq.json index 4810c98..0052772 100644 --- a/Source/Resources.xcassets/khq.dataset/khq.json +++ b/Source/Resources.xcassets/khq.dataset/khq.json @@ -2,58 +2,58 @@ "localeIdentifier": "khq", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ki.dataset/ki.json b/Source/Resources.xcassets/ki.dataset/ki.json index 85ed4ce..5105ba3 100644 --- a/Source/Resources.xcassets/ki.dataset/ki.json +++ b/Source/Resources.xcassets/ki.dataset/ki.json @@ -2,58 +2,58 @@ "localeIdentifier": "ki", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kk.dataset/kk.json b/Source/Resources.xcassets/kk.dataset/kk.json index 5770b51..2a788b3 100644 --- a/Source/Resources.xcassets/kk.dataset/kk.json +++ b/Source/Resources.xcassets/kk.dataset/kk.json @@ -2,58 +2,58 @@ "localeIdentifier": "kk", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ және %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} және {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, не болмаса %2$@", - "2": "%1$@ не %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, не болмаса {1}", + "2": "{0} не {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, не болмаса %2$@", - "2": "%1$@ не %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, не болмаса {1}", + "2": "{0} не {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, не болмаса %2$@", - "2": "%1$@ не %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, не болмаса {1}", + "2": "{0} не {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ және %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} және {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ және %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} және {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kkj.dataset/kkj.json b/Source/Resources.xcassets/kkj.dataset/kkj.json index 877ae50..6122baf 100644 --- a/Source/Resources.xcassets/kkj.dataset/kkj.json +++ b/Source/Resources.xcassets/kkj.dataset/kkj.json @@ -2,58 +2,58 @@ "localeIdentifier": "kkj", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kl.dataset/kl.json b/Source/Resources.xcassets/kl.dataset/kl.json index 40b9ddb..26709c6 100644 --- a/Source/Resources.xcassets/kl.dataset/kl.json +++ b/Source/Resources.xcassets/kl.dataset/kl.json @@ -2,58 +2,58 @@ "localeIdentifier": "kl", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kln.dataset/kln.json b/Source/Resources.xcassets/kln.dataset/kln.json index 33ed7c4..657ee41 100644 --- a/Source/Resources.xcassets/kln.dataset/kln.json +++ b/Source/Resources.xcassets/kln.dataset/kln.json @@ -2,58 +2,58 @@ "localeIdentifier": "kln", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/km.dataset/km.json b/Source/Resources.xcassets/km.dataset/km.json index 5932460..5d3f074 100644 --- a/Source/Resources.xcassets/km.dataset/km.json +++ b/Source/Resources.xcassets/km.dataset/km.json @@ -2,58 +2,58 @@ "localeIdentifier": "km", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ និង %2$@", - "2": "%1$@ និង​%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} និង {1}", + "2": "{0} និង​{1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ឬ %2$@", - "2": "%1$@ ឬ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ឬ {1}", + "2": "{0} ឬ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ឬ %2$@", - "2": "%1$@ ឬ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ឬ {1}", + "2": "{0} ឬ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ឬ %2$@", - "2": "%1$@ ឬ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ឬ {1}", + "2": "{0} ឬ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ និង %2$@", - "2": "%1$@ និង​%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} និង {1}", + "2": "{0} និង​{1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ និង %2$@", - "2": "%1$@ និង​%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} និង {1}", + "2": "{0} និង​{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kn.dataset/kn.json b/Source/Resources.xcassets/kn.dataset/kn.json index 9fa60a5..82990d5 100644 --- a/Source/Resources.xcassets/kn.dataset/kn.json +++ b/Source/Resources.xcassets/kn.dataset/kn.json @@ -2,58 +2,58 @@ "localeIdentifier": "kn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ಮತ್ತು %2$@", - "2": "%1$@ ಮತ್ತು %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಮತ್ತು {1}", + "2": "{0} ಮತ್ತು {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ಅಥವಾ %2$@", - "2": "%1$@ ಅಥವಾ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಅಥವಾ {1}", + "2": "{0} ಅಥವಾ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ಅಥವಾ %2$@", - "2": "%1$@ ಅಥವಾ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಅಥವಾ {1}", + "2": "{0} ಅಥವಾ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ಅಥವಾ %2$@", - "2": "%1$@ ಅಥವಾ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಅಥವಾ {1}", + "2": "{0} ಅಥವಾ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ಮತ್ತು %2$@", - "2": "%1$@ ಮತ್ತು %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಮತ್ತು {1}", + "2": "{0} ಮತ್ತು {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ಮತ್ತು %2$@", - "2": "%1$@ ಮತ್ತು %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಮತ್ತು {1}", + "2": "{0} ಮತ್ತು {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ko.dataset/ko.json b/Source/Resources.xcassets/ko.dataset/ko.json index 6c46144..33f0f16 100644 --- a/Source/Resources.xcassets/ko.dataset/ko.json +++ b/Source/Resources.xcassets/ko.dataset/ko.json @@ -2,58 +2,58 @@ "localeIdentifier": "ko", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 및 %2$@", - "2": "%1$@ 및 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 및 {1}", + "2": "{0} 및 {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 또는 %2$@", - "2": "%1$@ 또는 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 또는 {1}", + "2": "{0} 또는 {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 또는 %2$@", - "2": "%1$@ 또는 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 또는 {1}", + "2": "{0} 또는 {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 또는 %2$@", - "2": "%1$@ 또는 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 또는 {1}", + "2": "{0} 또는 {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 및 %2$@", - "2": "%1$@ 및 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 및 {1}", + "2": "{0} 및 {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ 및 %2$@", - "2": "%1$@ 및 %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} 및 {1}", + "2": "{0} 및 {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kok.dataset/kok.json b/Source/Resources.xcassets/kok.dataset/kok.json index 9680401..bdaf074 100644 --- a/Source/Resources.xcassets/kok.dataset/kok.json +++ b/Source/Resources.xcassets/kok.dataset/kok.json @@ -2,58 +2,58 @@ "localeIdentifier": "kok", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ks.dataset/ks.json b/Source/Resources.xcassets/ks.dataset/ks.json index 1678160..b1d7b10 100644 --- a/Source/Resources.xcassets/ks.dataset/ks.json +++ b/Source/Resources.xcassets/ks.dataset/ks.json @@ -2,58 +2,58 @@ "localeIdentifier": "ks", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ksb.dataset/ksb.json b/Source/Resources.xcassets/ksb.dataset/ksb.json index d7ba95a..782a8b7 100644 --- a/Source/Resources.xcassets/ksb.dataset/ksb.json +++ b/Source/Resources.xcassets/ksb.dataset/ksb.json @@ -2,58 +2,58 @@ "localeIdentifier": "ksb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ksf.dataset/ksf.json b/Source/Resources.xcassets/ksf.dataset/ksf.json index 75899d9..eb6c6bc 100644 --- a/Source/Resources.xcassets/ksf.dataset/ksf.json +++ b/Source/Resources.xcassets/ksf.dataset/ksf.json @@ -2,58 +2,58 @@ "localeIdentifier": "ksf", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ksh.dataset/ksh.json b/Source/Resources.xcassets/ksh.dataset/ksh.json index 5d0bca1..56de490 100644 --- a/Source/Resources.xcassets/ksh.dataset/ksh.json +++ b/Source/Resources.xcassets/ksh.dataset/ksh.json @@ -2,58 +2,58 @@ "localeIdentifier": "ksh", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ku.dataset/ku.json b/Source/Resources.xcassets/ku.dataset/ku.json index 5024a6c..126e7af 100644 --- a/Source/Resources.xcassets/ku.dataset/ku.json +++ b/Source/Resources.xcassets/ku.dataset/ku.json @@ -2,58 +2,58 @@ "localeIdentifier": "ku", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ û %2$@", - "2": "%1$@ û %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} û {1}", + "2": "{0} û {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ an %2$@", - "2": "%1$@ an %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} an {1}", + "2": "{0} an {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ an %2$@", - "2": "%1$@ an %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} an {1}", + "2": "{0} an {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ an %2$@", - "2": "%1$@ an %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} an {1}", + "2": "{0} an {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ û %2$@", - "2": "%1$@ û %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} û {1}", + "2": "{0} û {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ û %2$@", - "2": "%1$@ û %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} û {1}", + "2": "{0} û {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ û %2$@", - "2": "%1$@ û %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} û {1}", + "2": "{0} û {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ û %2$@", - "2": "%1$@ û %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} û {1}", + "2": "{0} û {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/kw.dataset/kw.json b/Source/Resources.xcassets/kw.dataset/kw.json index 91fe24d..f6dd22f 100644 --- a/Source/Resources.xcassets/kw.dataset/kw.json +++ b/Source/Resources.xcassets/kw.dataset/kw.json @@ -2,58 +2,58 @@ "localeIdentifier": "kw", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ky.dataset/ky.json b/Source/Resources.xcassets/ky.dataset/ky.json index 47d1039..6a907a1 100644 --- a/Source/Resources.xcassets/ky.dataset/ky.json +++ b/Source/Resources.xcassets/ky.dataset/ky.json @@ -2,58 +2,58 @@ "localeIdentifier": "ky", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ жана %2$@", - "2": "%1$@ жана %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} жана {1}", + "2": "{0} жана {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, же %2$@", - "2": "%1$@ же %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, же {1}", + "2": "{0} же {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, же %2$@", - "2": "%1$@ же %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, же {1}", + "2": "{0} же {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, же %2$@", - "2": "%1$@ же %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, же {1}", + "2": "{0} же {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ жана %2$@", - "2": "%1$@ жана %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} жана {1}", + "2": "{0} жана {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ жана %2$@", - "2": "%1$@ жана %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} жана {1}", + "2": "{0} жана {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lag.dataset/lag.json b/Source/Resources.xcassets/lag.dataset/lag.json index 8479524..0742e32 100644 --- a/Source/Resources.xcassets/lag.dataset/lag.json +++ b/Source/Resources.xcassets/lag.dataset/lag.json @@ -2,58 +2,58 @@ "localeIdentifier": "lag", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lb.dataset/lb.json b/Source/Resources.xcassets/lb.dataset/lb.json index 013510f..e3f627b 100644 --- a/Source/Resources.xcassets/lb.dataset/lb.json +++ b/Source/Resources.xcassets/lb.dataset/lb.json @@ -2,58 +2,58 @@ "localeIdentifier": "lb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a(n) %2$@", - "2": "%1$@ a(n) %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a(n) {1}", + "2": "{0} a(n) {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a(n) %2$@", - "2": "%1$@ a(n) %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a(n) {1}", + "2": "{0} a(n) {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a(n) %2$@", - "2": "%1$@ a(n) %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a(n) {1}", + "2": "{0} a(n) {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lg.dataset/lg.json b/Source/Resources.xcassets/lg.dataset/lg.json index a916433..d44aa0e 100644 --- a/Source/Resources.xcassets/lg.dataset/lg.json +++ b/Source/Resources.xcassets/lg.dataset/lg.json @@ -2,58 +2,58 @@ "localeIdentifier": "lg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lkt.dataset/lkt.json b/Source/Resources.xcassets/lkt.dataset/lkt.json index 8fb0cb5..7d8a1ac 100644 --- a/Source/Resources.xcassets/lkt.dataset/lkt.json +++ b/Source/Resources.xcassets/lkt.dataset/lkt.json @@ -2,58 +2,58 @@ "localeIdentifier": "lkt", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ln.dataset/ln.json b/Source/Resources.xcassets/ln.dataset/ln.json index 188c610..5e6c4c6 100644 --- a/Source/Resources.xcassets/ln.dataset/ln.json +++ b/Source/Resources.xcassets/ln.dataset/ln.json @@ -2,58 +2,58 @@ "localeIdentifier": "ln", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lo.dataset/lo.json b/Source/Resources.xcassets/lo.dataset/lo.json index e6a933a..4b26425 100644 --- a/Source/Resources.xcassets/lo.dataset/lo.json +++ b/Source/Resources.xcassets/lo.dataset/lo.json @@ -2,58 +2,58 @@ "localeIdentifier": "lo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ ແລະ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} ແລະ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ຫຼື %2$@", - "2": "%1$@ ຫຼື %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ຫຼື {1}", + "2": "{0} ຫຼື {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ຫຼື %2$@", - "2": "%1$@ ຫຼື %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ຫຼື {1}", + "2": "{0} ຫຼື {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ຫຼື %2$@", - "2": "%1$@ ຫຼື %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ຫຼື {1}", + "2": "{0} ຫຼື {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ ແລະ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} ແລະ {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ ແລະ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} ແລະ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lrc.dataset/lrc.json b/Source/Resources.xcassets/lrc.dataset/lrc.json index 4630ce0..533a1ff 100644 --- a/Source/Resources.xcassets/lrc.dataset/lrc.json +++ b/Source/Resources.xcassets/lrc.dataset/lrc.json @@ -2,58 +2,58 @@ "localeIdentifier": "lrc", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lt.dataset/lt.json b/Source/Resources.xcassets/lt.dataset/lt.json index b4dd201..154e720 100644 --- a/Source/Resources.xcassets/lt.dataset/lt.json +++ b/Source/Resources.xcassets/lt.dataset/lt.json @@ -2,58 +2,58 @@ "localeIdentifier": "lt", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ir %2$@", - "2": "%1$@ ir %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ir {1}", + "2": "{0} ir {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ar %2$@", - "2": "%1$@ ar %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ar {1}", + "2": "{0} ar {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ar %2$@", - "2": "%1$@ ar %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ar {1}", + "2": "{0} ar {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ar %2$@", - "2": "%1$@ ar %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ar {1}", + "2": "{0} ar {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ir %2$@", - "2": "%1$@ ir %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ir {1}", + "2": "{0} ir {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ir %2$@", - "2": "%1$@ ir %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ir {1}", + "2": "{0} ir {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ ir %2$@", - "2": "%1$@ ir %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} ir {1}", + "2": "{0} ir {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lu.dataset/lu.json b/Source/Resources.xcassets/lu.dataset/lu.json index a4b2dd3..259a165 100644 --- a/Source/Resources.xcassets/lu.dataset/lu.json +++ b/Source/Resources.xcassets/lu.dataset/lu.json @@ -2,58 +2,58 @@ "localeIdentifier": "lu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/luo.dataset/luo.json b/Source/Resources.xcassets/luo.dataset/luo.json index 357d035..06aeb26 100644 --- a/Source/Resources.xcassets/luo.dataset/luo.json +++ b/Source/Resources.xcassets/luo.dataset/luo.json @@ -2,58 +2,58 @@ "localeIdentifier": "luo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/luy.dataset/luy.json b/Source/Resources.xcassets/luy.dataset/luy.json index 071d2b6..91339ca 100644 --- a/Source/Resources.xcassets/luy.dataset/luy.json +++ b/Source/Resources.xcassets/luy.dataset/luy.json @@ -2,58 +2,58 @@ "localeIdentifier": "luy", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/lv.dataset/lv.json b/Source/Resources.xcassets/lv.dataset/lv.json index 5d2c935..192c918 100644 --- a/Source/Resources.xcassets/lv.dataset/lv.json +++ b/Source/Resources.xcassets/lv.dataset/lv.json @@ -2,58 +2,58 @@ "localeIdentifier": "lv", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ vai %2$@", - "2": "%1$@ vai %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} vai {1}", + "2": "{0} vai {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ vai %2$@", - "2": "%1$@ vai %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} vai {1}", + "2": "{0} vai {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ vai %2$@", - "2": "%1$@ vai %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} vai {1}", + "2": "{0} vai {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ un %2$@", - "2": "%1$@ un %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} un {1}", + "2": "{0} un {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mas.dataset/mas.json b/Source/Resources.xcassets/mas.dataset/mas.json index 9cd37e5..8cfaf16 100644 --- a/Source/Resources.xcassets/mas.dataset/mas.json +++ b/Source/Resources.xcassets/mas.dataset/mas.json @@ -2,58 +2,58 @@ "localeIdentifier": "mas", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mer.dataset/mer.json b/Source/Resources.xcassets/mer.dataset/mer.json index bd51b53..fa343f2 100644 --- a/Source/Resources.xcassets/mer.dataset/mer.json +++ b/Source/Resources.xcassets/mer.dataset/mer.json @@ -2,58 +2,58 @@ "localeIdentifier": "mer", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mfe.dataset/mfe.json b/Source/Resources.xcassets/mfe.dataset/mfe.json index c47506b..c671d47 100644 --- a/Source/Resources.xcassets/mfe.dataset/mfe.json +++ b/Source/Resources.xcassets/mfe.dataset/mfe.json @@ -2,58 +2,58 @@ "localeIdentifier": "mfe", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mg.dataset/mg.json b/Source/Resources.xcassets/mg.dataset/mg.json index ca5d56c..f09af3b 100644 --- a/Source/Resources.xcassets/mg.dataset/mg.json +++ b/Source/Resources.xcassets/mg.dataset/mg.json @@ -2,58 +2,58 @@ "localeIdentifier": "mg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mgh.dataset/mgh.json b/Source/Resources.xcassets/mgh.dataset/mgh.json index c2eab9f..41313c3 100644 --- a/Source/Resources.xcassets/mgh.dataset/mgh.json +++ b/Source/Resources.xcassets/mgh.dataset/mgh.json @@ -2,58 +2,58 @@ "localeIdentifier": "mgh", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mgo.dataset/mgo.json b/Source/Resources.xcassets/mgo.dataset/mgo.json index 14cb229..aa75855 100644 --- a/Source/Resources.xcassets/mgo.dataset/mgo.json +++ b/Source/Resources.xcassets/mgo.dataset/mgo.json @@ -2,58 +2,58 @@ "localeIdentifier": "mgo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mi.dataset/mi.json b/Source/Resources.xcassets/mi.dataset/mi.json index e53019e..237d6d2 100644 --- a/Source/Resources.xcassets/mi.dataset/mi.json +++ b/Source/Resources.xcassets/mi.dataset/mi.json @@ -2,58 +2,58 @@ "localeIdentifier": "mi", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mk.dataset/mk.json b/Source/Resources.xcassets/mk.dataset/mk.json index fb414f9..0695878 100644 --- a/Source/Resources.xcassets/mk.dataset/mk.json +++ b/Source/Resources.xcassets/mk.dataset/mk.json @@ -2,58 +2,58 @@ "localeIdentifier": "mk", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ml.dataset/ml.json b/Source/Resources.xcassets/ml.dataset/ml.json index 572e87b..6685d9a 100644 --- a/Source/Resources.xcassets/ml.dataset/ml.json +++ b/Source/Resources.xcassets/ml.dataset/ml.json @@ -2,58 +2,58 @@ "localeIdentifier": "ml", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@ എന്നിവ", - "2": "%1$@ കൂടാതെ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1} എന്നിവ", + "2": "{0} കൂടാതെ {1}" }, "or": { - "start": "%1$@, %2$@ എന്നിവ", - "middle": "%1$@, %2$@ എന്നിവ", - "end": "%1$@, അല്ലെങ്കിൽ %2$@", - "2": "%1$@ അല്ലെങ്കിൽ %2$@" + "start": "{0}, {1} എന്നിവ", + "middle": "{0}, {1} എന്നിവ", + "end": "{0}, അല്ലെങ്കിൽ {1}", + "2": "{0} അല്ലെങ്കിൽ {1}" }, "orNarrow": { - "start": "%1$@, %2$@ എന്നിവ", - "middle": "%1$@, %2$@ എന്നിവ", - "end": "%1$@, അല്ലെങ്കിൽ %2$@", - "2": "%1$@ അല്ലെങ്കിൽ %2$@" + "start": "{0}, {1} എന്നിവ", + "middle": "{0}, {1} എന്നിവ", + "end": "{0}, അല്ലെങ്കിൽ {1}", + "2": "{0} അല്ലെങ്കിൽ {1}" }, "orShort": { - "start": "%1$@, %2$@ എന്നിവ", - "middle": "%1$@, %2$@ എന്നിവ", - "end": "%1$@, അല്ലെങ്കിൽ %2$@", - "2": "%1$@ അല്ലെങ്കിൽ %2$@" + "start": "{0}, {1} എന്നിവ", + "middle": "{0}, {1} എന്നിവ", + "end": "{0}, അല്ലെങ്കിൽ {1}", + "2": "{0} അല്ലെങ്കിൽ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@ എന്നിവ", - "2": "%1$@ കൂടാതെ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1} എന്നിവ", + "2": "{0} കൂടാതെ {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@ എന്നിവ", - "2": "%1$@ കൂടാതെ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1} എന്നിവ", + "2": "{0} കൂടാതെ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ കൂടാതെ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} കൂടാതെ {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ കൂടാതെ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} കൂടാതെ {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ കൂടാതെ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} കൂടാതെ {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mn.dataset/mn.json b/Source/Resources.xcassets/mn.dataset/mn.json index b617785..908e773 100644 --- a/Source/Resources.xcassets/mn.dataset/mn.json +++ b/Source/Resources.xcassets/mn.dataset/mn.json @@ -2,58 +2,58 @@ "localeIdentifier": "mn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, эсвэл %2$@", - "2": "%1$@ эсвэл %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, эсвэл {1}", + "2": "{0} эсвэл {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, эсвэл %2$@", - "2": "%1$@ эсвэл %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, эсвэл {1}", + "2": "{0} эсвэл {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, эсвэл %2$@", - "2": "%1$@ эсвэл %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, эсвэл {1}", + "2": "{0} эсвэл {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, & %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mr.dataset/mr.json b/Source/Resources.xcassets/mr.dataset/mr.json index c02c877..7e17fd6 100644 --- a/Source/Resources.xcassets/mr.dataset/mr.json +++ b/Source/Resources.xcassets/mr.dataset/mr.json @@ -2,58 +2,58 @@ "localeIdentifier": "mr", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ आणि %2$@", - "2": "%1$@ आणि %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} आणि {1}", + "2": "{0} आणि {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, किंवा %2$@", - "2": "%1$@ किंवा %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, किंवा {1}", + "2": "{0} किंवा {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, किंवा %2$@", - "2": "%1$@ किंवा %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, किंवा {1}", + "2": "{0} किंवा {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, किंवा %2$@", - "2": "%1$@ किंवा %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, किंवा {1}", + "2": "{0} किंवा {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ आणि %2$@", - "2": "%1$@ आणि %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} आणि {1}", + "2": "{0} आणि {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ आणि %2$@", - "2": "%1$@ आणि %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} आणि {1}", + "2": "{0} आणि {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ms.dataset/ms.json b/Source/Resources.xcassets/ms.dataset/ms.json index 606af6a..4594c44 100644 --- a/Source/Resources.xcassets/ms.dataset/ms.json +++ b/Source/Resources.xcassets/ms.dataset/ms.json @@ -2,58 +2,58 @@ "localeIdentifier": "ms", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ dan %2$@", - "2": "%1$@ dan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dan {1}", + "2": "{0} dan {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, atau %2$@", - "2": "%1$@ atau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, atau {1}", + "2": "{0} atau {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, atau %2$@", - "2": "%1$@ atau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, atau {1}", + "2": "{0} atau {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, atau %2$@", - "2": "%1$@ atau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, atau {1}", + "2": "{0} atau {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ dan %2$@", - "2": "%1$@ dan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dan {1}", + "2": "{0} dan {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ dan %2$@", - "2": "%1$@ dan %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dan {1}", + "2": "{0} dan {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mt.dataset/mt.json b/Source/Resources.xcassets/mt.dataset/mt.json index fe9627a..bd1ccb3 100644 --- a/Source/Resources.xcassets/mt.dataset/mt.json +++ b/Source/Resources.xcassets/mt.dataset/mt.json @@ -2,58 +2,58 @@ "localeIdentifier": "mt", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, u %2$@", - "2": "%1$@ u %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, u {1}", + "2": "{0} u {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, u %2$@", - "2": "%1$@ u %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, u {1}", + "2": "{0} u {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, u %2$@", - "2": "%1$@ u %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, u {1}", + "2": "{0} u {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, u %2$@", - "2": "%1$@ u %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, u {1}", + "2": "{0} u {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, u %2$@", - "2": "%1$@ u %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, u {1}", + "2": "{0} u {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mua.dataset/mua.json b/Source/Resources.xcassets/mua.dataset/mua.json index 30ae146..58a2ab2 100644 --- a/Source/Resources.xcassets/mua.dataset/mua.json +++ b/Source/Resources.xcassets/mua.dataset/mua.json @@ -2,58 +2,58 @@ "localeIdentifier": "mua", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/my.dataset/my.json b/Source/Resources.xcassets/my.dataset/my.json index bccfe88..5f2c03e 100644 --- a/Source/Resources.xcassets/my.dataset/my.json +++ b/Source/Resources.xcassets/my.dataset/my.json @@ -2,58 +2,58 @@ "localeIdentifier": "my", "listPatterns": { "standard": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@နှင့် %2$@", - "2": "%1$@နှင့် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0}နှင့် {1}", + "2": "{0}နှင့် {1}" }, "or": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ သို့မဟုတ် %2$@", - "2": "%1$@ သို့မဟုတ် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}", + "2": "{0} သို့မဟုတ် {1}" }, "orNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ သို့မဟုတ် %2$@", - "2": "%1$@ သို့မဟုတ် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}", + "2": "{0} သို့မဟုတ် {1}" }, "orShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ သို့မဟုတ် %2$@", - "2": "%1$@ သို့မဟုတ် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}", + "2": "{0} သို့မဟုတ် {1}" }, "standardNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@နှင့် %2$@", - "2": "%1$@နှင့် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0}နှင့် {1}", + "2": "{0}နှင့် {1}" }, "standardShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@နှင့် %2$@", - "2": "%1$@နှင့် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0}နှင့် {1}", + "2": "{0}နှင့် {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@နှင့် %2$@", - "2": "%1$@နှင့်%2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0}နှင့် {1}", + "2": "{0}နှင့်{1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@နှင့် %2$@", - "2": "%1$@နှင့် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0}နှင့် {1}", + "2": "{0}နှင့် {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@နှင့် %2$@", - "2": "%1$@နှင့် %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0}နှင့် {1}", + "2": "{0}နှင့် {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/mzn.dataset/mzn.json b/Source/Resources.xcassets/mzn.dataset/mzn.json index bc3444a..2f81d8a 100644 --- a/Source/Resources.xcassets/mzn.dataset/mzn.json +++ b/Source/Resources.xcassets/mzn.dataset/mzn.json @@ -2,58 +2,58 @@ "localeIdentifier": "mzn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/naq.dataset/naq.json b/Source/Resources.xcassets/naq.dataset/naq.json index b1ade5a..0eba9c9 100644 --- a/Source/Resources.xcassets/naq.dataset/naq.json +++ b/Source/Resources.xcassets/naq.dataset/naq.json @@ -2,58 +2,58 @@ "localeIdentifier": "naq", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nb.dataset/nb.json b/Source/Resources.xcassets/nb.dataset/nb.json index e7f4740..f467802 100644 --- a/Source/Resources.xcassets/nb.dataset/nb.json +++ b/Source/Resources.xcassets/nb.dataset/nb.json @@ -2,58 +2,58 @@ "localeIdentifier": "nb", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nd.dataset/nd.json b/Source/Resources.xcassets/nd.dataset/nd.json index a566892..34d3553 100644 --- a/Source/Resources.xcassets/nd.dataset/nd.json +++ b/Source/Resources.xcassets/nd.dataset/nd.json @@ -2,58 +2,58 @@ "localeIdentifier": "nd", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nds.dataset/nds.json b/Source/Resources.xcassets/nds.dataset/nds.json index e0e015f..4187cb0 100644 --- a/Source/Resources.xcassets/nds.dataset/nds.json +++ b/Source/Resources.xcassets/nds.dataset/nds.json @@ -2,58 +2,58 @@ "localeIdentifier": "nds", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ne.dataset/ne.json b/Source/Resources.xcassets/ne.dataset/ne.json index 3577dc2..069def8 100644 --- a/Source/Resources.xcassets/ne.dataset/ne.json +++ b/Source/Resources.xcassets/ne.dataset/ne.json @@ -2,58 +2,58 @@ "localeIdentifier": "ne", "listPatterns": { "standard": { - "start": "%1$@,%2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ र %2$@", - "2": "%1$@ र %2$@" + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0} र {1}", + "2": "{0} र {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, वा %2$@", - "2": "%1$@ वा %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, वा {1}", + "2": "{0} वा {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, वा %2$@", - "2": "%1$@ वा %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, वा {1}", + "2": "{0} वा {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, वा %2$@", - "2": "%1$@ वा %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, वा {1}", + "2": "{0} वा {1}" }, "standardNarrow": { - "start": "%1$@,%2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ र %2$@", - "2": "%1$@ र %2$@" + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0} र {1}", + "2": "{0} र {1}" }, "standardShort": { - "start": "%1$@,%2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ र %2$@", - "2": "%1$@ र %2$@" + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0} र {1}", + "2": "{0} र {1}" }, "unit": { - "start": "%1$@,%2$@", - "middle": "%1$@, %2$@", - "end": "%1$@,%2$@", - "2": "%1$@,%2$@" + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0},{1}", + "2": "{0},{1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@%2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0}{1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@,%2$@", - "middle": "%1$@, %2$@", - "end": "%1$@,%2$@", - "2": "%1$@ %2$@" + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0},{1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nl.dataset/nl.json b/Source/Resources.xcassets/nl.dataset/nl.json index 137fc33..004daec 100644 --- a/Source/Resources.xcassets/nl.dataset/nl.json +++ b/Source/Resources.xcassets/nl.dataset/nl.json @@ -2,58 +2,58 @@ "localeIdentifier": "nl", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ of %2$@", - "2": "%1$@ of %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} of {1}", + "2": "{0} of {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ of %2$@", - "2": "%1$@ of %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} of {1}", + "2": "{0} of {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ of %2$@", - "2": "%1$@ of %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} of {1}", + "2": "{0} of {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ en %2$@", - "2": "%1$@ en %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} en {1}", + "2": "{0} en {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nmg.dataset/nmg.json b/Source/Resources.xcassets/nmg.dataset/nmg.json index d505200..152b55f 100644 --- a/Source/Resources.xcassets/nmg.dataset/nmg.json +++ b/Source/Resources.xcassets/nmg.dataset/nmg.json @@ -2,58 +2,58 @@ "localeIdentifier": "nmg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nn.dataset/nn.json b/Source/Resources.xcassets/nn.dataset/nn.json index bc20430..1b54346 100644 --- a/Source/Resources.xcassets/nn.dataset/nn.json +++ b/Source/Resources.xcassets/nn.dataset/nn.json @@ -2,58 +2,58 @@ "localeIdentifier": "nn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ og %2$@", - "2": "%1$@ og %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}", + "2": "{0} og {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nnh.dataset/nnh.json b/Source/Resources.xcassets/nnh.dataset/nnh.json index 2d44a78..665fdc1 100644 --- a/Source/Resources.xcassets/nnh.dataset/nnh.json +++ b/Source/Resources.xcassets/nnh.dataset/nnh.json @@ -2,58 +2,58 @@ "localeIdentifier": "nnh", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nus.dataset/nus.json b/Source/Resources.xcassets/nus.dataset/nus.json index 4202d89..92ff22f 100644 --- a/Source/Resources.xcassets/nus.dataset/nus.json +++ b/Source/Resources.xcassets/nus.dataset/nus.json @@ -2,58 +2,58 @@ "localeIdentifier": "nus", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/nyn.dataset/nyn.json b/Source/Resources.xcassets/nyn.dataset/nyn.json index 9828463..7104f25 100644 --- a/Source/Resources.xcassets/nyn.dataset/nyn.json +++ b/Source/Resources.xcassets/nyn.dataset/nyn.json @@ -2,58 +2,58 @@ "localeIdentifier": "nyn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/om.dataset/om.json b/Source/Resources.xcassets/om.dataset/om.json index ef9fdd8..04d1ad8 100644 --- a/Source/Resources.xcassets/om.dataset/om.json +++ b/Source/Resources.xcassets/om.dataset/om.json @@ -2,58 +2,58 @@ "localeIdentifier": "om", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/or.dataset/or.json b/Source/Resources.xcassets/or.dataset/or.json index b986fd2..3350ab3 100644 --- a/Source/Resources.xcassets/or.dataset/or.json +++ b/Source/Resources.xcassets/or.dataset/or.json @@ -2,58 +2,58 @@ "localeIdentifier": "or", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ଓ %2$@", - "2": "%1$@ ଓ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ଓ {1}", + "2": "{0} ଓ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ କିମ୍ବା %2$@", - "2": "%1$@ କିମ୍ବା %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} କିମ୍ବା {1}", + "2": "{0} କିମ୍ବା {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ କିମ୍ବା %2$@", - "2": "%1$@ କିମ୍ବା %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} କିମ୍ବା {1}", + "2": "{0} କିମ୍ବା {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ କିମ୍ବା %2$@", - "2": "%1$@ କିମ୍ବା %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} କିମ୍ବା {1}", + "2": "{0} କିମ୍ବା {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ଓ %2$@", - "2": "%1$@ ଓ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ଓ {1}", + "2": "{0} ଓ {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ଓ %2$@", - "2": "%1$@ ଓ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ଓ {1}", + "2": "{0} ଓ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/os.dataset/os.json b/Source/Resources.xcassets/os.dataset/os.json index 33c88eb..34aba99 100644 --- a/Source/Resources.xcassets/os.dataset/os.json +++ b/Source/Resources.xcassets/os.dataset/os.json @@ -2,58 +2,58 @@ "localeIdentifier": "os", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ӕмӕ %2$@", - "2": "%1$@ ӕмӕ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ӕмӕ {1}", + "2": "{0} ӕмӕ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ӕмӕ %2$@", - "2": "%1$@ ӕмӕ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ӕмӕ {1}", + "2": "{0} ӕмӕ {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ӕмӕ %2$@", - "2": "%1$@ ӕмӕ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ӕмӕ {1}", + "2": "{0} ӕмӕ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ӕмӕ %2$@", - "2": "%1$@ ӕмӕ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ӕмӕ {1}", + "2": "{0} ӕмӕ {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ӕмӕ %2$@", - "2": "%1$@ ӕмӕ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ӕмӕ {1}", + "2": "{0} ӕмӕ {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ӕмӕ %2$@", - "2": "%1$@ ӕмӕ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ӕмӕ {1}", + "2": "{0} ӕмӕ {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/pa.dataset/pa.json b/Source/Resources.xcassets/pa.dataset/pa.json index 73b7c4e..0f1bb9c 100644 --- a/Source/Resources.xcassets/pa.dataset/pa.json +++ b/Source/Resources.xcassets/pa.dataset/pa.json @@ -2,58 +2,58 @@ "localeIdentifier": "pa", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ਅਤੇ %2$@", - "2": "%1$@ ਅਤੇ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ਅਤੇ {1}", + "2": "{0} ਅਤੇ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ ਜਾਂ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} ਜਾਂ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ ਜਾਂ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} ਜਾਂ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ ਜਾਂ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} ਜਾਂ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ਅਤੇ %2$@", - "2": "%1$@ ਅਤੇ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ਅਤੇ {1}", + "2": "{0} ਅਤੇ {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ਅਤੇ %2$@", - "2": "%1$@ ਅਤੇ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ਅਤੇ {1}", + "2": "{0} ਅਤੇ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/pl.dataset/pl.json b/Source/Resources.xcassets/pl.dataset/pl.json index da89ecc..13d9544 100644 --- a/Source/Resources.xcassets/pl.dataset/pl.json +++ b/Source/Resources.xcassets/pl.dataset/pl.json @@ -2,58 +2,58 @@ "localeIdentifier": "pl", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ lub %2$@", - "2": "%1$@ lub %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} lub {1}", + "2": "{0} lub {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ lub %2$@", - "2": "%1$@ lub %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} lub {1}", + "2": "{0} lub {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ lub %2$@", - "2": "%1$@ lub %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} lub {1}", + "2": "{0} lub {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/prg.dataset/prg.json b/Source/Resources.xcassets/prg.dataset/prg.json index 2e71966..68dd367 100644 --- a/Source/Resources.xcassets/prg.dataset/prg.json +++ b/Source/Resources.xcassets/prg.dataset/prg.json @@ -2,58 +2,58 @@ "localeIdentifier": "prg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ps.dataset/ps.json b/Source/Resources.xcassets/ps.dataset/ps.json index 44f2c4b..d1e4838 100644 --- a/Source/Resources.xcassets/ps.dataset/ps.json +++ b/Source/Resources.xcassets/ps.dataset/ps.json @@ -2,58 +2,58 @@ "localeIdentifier": "ps", "listPatterns": { "standard": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، او %2$@", - "2": "%1$@ او %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، او {1}", + "2": "{0} او {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@, %2$@", - "2": "%1$@، %2$@" + "start": "{0}, {1}", + "middle": "{0}، {1}", + "end": "{0}, {1}", + "2": "{0}، {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، او %2$@", - "2": "%1$@ او %2$@" + "start": "{0}, {1}", + "middle": "{0}، {1}", + "end": "{0}، او {1}", + "2": "{0} او {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ او %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} او {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ و %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} و {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/pt.dataset/pt.json b/Source/Resources.xcassets/pt.dataset/pt.json index 800c405..d4f0304 100644 --- a/Source/Resources.xcassets/pt.dataset/pt.json +++ b/Source/Resources.xcassets/pt.dataset/pt.json @@ -2,58 +2,58 @@ "localeIdentifier": "pt", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ou %2$@", - "2": "%1$@ ou %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ou {1}", + "2": "{0} ou {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/qu.dataset/qu.json b/Source/Resources.xcassets/qu.dataset/qu.json index 776eb6a..c3491c3 100644 --- a/Source/Resources.xcassets/qu.dataset/qu.json +++ b/Source/Resources.xcassets/qu.dataset/qu.json @@ -2,58 +2,58 @@ "localeIdentifier": "qu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/rm.dataset/rm.json b/Source/Resources.xcassets/rm.dataset/rm.json index f413c9e..84d143a 100644 --- a/Source/Resources.xcassets/rm.dataset/rm.json +++ b/Source/Resources.xcassets/rm.dataset/rm.json @@ -2,58 +2,58 @@ "localeIdentifier": "rm", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/rn.dataset/rn.json b/Source/Resources.xcassets/rn.dataset/rn.json index 098179a..bab5f77 100644 --- a/Source/Resources.xcassets/rn.dataset/rn.json +++ b/Source/Resources.xcassets/rn.dataset/rn.json @@ -2,58 +2,58 @@ "localeIdentifier": "rn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ro.dataset/ro.json b/Source/Resources.xcassets/ro.dataset/ro.json index e308c73..f8b4c4c 100644 --- a/Source/Resources.xcassets/ro.dataset/ro.json +++ b/Source/Resources.xcassets/ro.dataset/ro.json @@ -2,58 +2,58 @@ "localeIdentifier": "ro", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ și %2$@", - "2": "%1$@ și %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} și {1}", + "2": "{0} și {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ sau %2$@", - "2": "%1$@ sau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} sau {1}", + "2": "{0} sau {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ sau %2$@", - "2": "%1$@ sau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} sau {1}", + "2": "{0} sau {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ sau %2$@", - "2": "%1$@ sau %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} sau {1}", + "2": "{0} sau {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ și %2$@", - "2": "%1$@ și %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} și {1}", + "2": "{0} și {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ și %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} și {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/rof.dataset/rof.json b/Source/Resources.xcassets/rof.dataset/rof.json index 26718da..419aa50 100644 --- a/Source/Resources.xcassets/rof.dataset/rof.json +++ b/Source/Resources.xcassets/rof.dataset/rof.json @@ -2,58 +2,58 @@ "localeIdentifier": "rof", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/root.dataset/root.json b/Source/Resources.xcassets/root.dataset/root.json index 542667d..53dc6fd 100644 --- a/Source/Resources.xcassets/root.dataset/root.json +++ b/Source/Resources.xcassets/root.dataset/root.json @@ -2,58 +2,58 @@ "localeIdentifier": "root", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ru.dataset/ru.json b/Source/Resources.xcassets/ru.dataset/ru.json index fed574c..967511f 100644 --- a/Source/Resources.xcassets/ru.dataset/ru.json +++ b/Source/Resources.xcassets/ru.dataset/ru.json @@ -2,58 +2,58 @@ "localeIdentifier": "ru", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/rw.dataset/rw.json b/Source/Resources.xcassets/rw.dataset/rw.json index 66e6eb1..ee8afeb 100644 --- a/Source/Resources.xcassets/rw.dataset/rw.json +++ b/Source/Resources.xcassets/rw.dataset/rw.json @@ -2,58 +2,58 @@ "localeIdentifier": "rw", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/rwk.dataset/rwk.json b/Source/Resources.xcassets/rwk.dataset/rwk.json index 755fe1e..37eff55 100644 --- a/Source/Resources.xcassets/rwk.dataset/rwk.json +++ b/Source/Resources.xcassets/rwk.dataset/rwk.json @@ -2,58 +2,58 @@ "localeIdentifier": "rwk", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sah.dataset/sah.json b/Source/Resources.xcassets/sah.dataset/sah.json index 8e4d33c..565acc6 100644 --- a/Source/Resources.xcassets/sah.dataset/sah.json +++ b/Source/Resources.xcassets/sah.dataset/sah.json @@ -2,58 +2,58 @@ "localeIdentifier": "sah", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ уонна %2$@", - "2": "%1$@ уонна %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} уонна {1}", + "2": "{0} уонна {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ уонна %2$@", - "2": "%1$@ уонна %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} уонна {1}", + "2": "{0} уонна {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ уонна %2$@", - "2": "%1$@ уонна %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} уонна {1}", + "2": "{0} уонна {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ уонна %2$@", - "2": "%1$@ уонна %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} уонна {1}", + "2": "{0} уонна {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ уонна %2$@", - "2": "%1$@ уонна %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} уонна {1}", + "2": "{0} уонна {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ уонна %2$@", - "2": "%1$@ уонна %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} уонна {1}", + "2": "{0} уонна {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/saq.dataset/saq.json b/Source/Resources.xcassets/saq.dataset/saq.json index 5441aa2..aa2bab5 100644 --- a/Source/Resources.xcassets/saq.dataset/saq.json +++ b/Source/Resources.xcassets/saq.dataset/saq.json @@ -2,58 +2,58 @@ "localeIdentifier": "saq", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sbp.dataset/sbp.json b/Source/Resources.xcassets/sbp.dataset/sbp.json index 5170d3a..ba5fe25 100644 --- a/Source/Resources.xcassets/sbp.dataset/sbp.json +++ b/Source/Resources.xcassets/sbp.dataset/sbp.json @@ -2,58 +2,58 @@ "localeIdentifier": "sbp", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sd.dataset/sd.json b/Source/Resources.xcassets/sd.dataset/sd.json index 7562bb4..a86da63 100644 --- a/Source/Resources.xcassets/sd.dataset/sd.json +++ b/Source/Resources.xcassets/sd.dataset/sd.json @@ -2,58 +2,58 @@ "localeIdentifier": "sd", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@، ۽ %2$@", - "2": "%1$@ ۽ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}، ۽ {1}", + "2": "{0} ۽ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, يا %2$@", - "2": "%1$@ يا %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, يا {1}", + "2": "{0} يا {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, يا %2$@", - "2": "%1$@ يا %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, يا {1}", + "2": "{0} يا {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, يا %2$@", - "2": "%1$@ يا %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, يا {1}", + "2": "{0} يا {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@، ۽ %2$@", - "2": "%1$@ ۽ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}، ۽ {1}", + "2": "{0} ۽ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/se.dataset/se.json b/Source/Resources.xcassets/se.dataset/se.json index 0f87332..fb19d63 100644 --- a/Source/Resources.xcassets/se.dataset/se.json +++ b/Source/Resources.xcassets/se.dataset/se.json @@ -2,58 +2,58 @@ "localeIdentifier": "se", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ja %2$@", - "2": "%1$@ ja %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}", + "2": "{0} ja {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/seh.dataset/seh.json b/Source/Resources.xcassets/seh.dataset/seh.json index a2f290c..192e744 100644 --- a/Source/Resources.xcassets/seh.dataset/seh.json +++ b/Source/Resources.xcassets/seh.dataset/seh.json @@ -2,58 +2,58 @@ "localeIdentifier": "seh", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ses.dataset/ses.json b/Source/Resources.xcassets/ses.dataset/ses.json index f193a26..da01bc6 100644 --- a/Source/Resources.xcassets/ses.dataset/ses.json +++ b/Source/Resources.xcassets/ses.dataset/ses.json @@ -2,58 +2,58 @@ "localeIdentifier": "ses", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sg.dataset/sg.json b/Source/Resources.xcassets/sg.dataset/sg.json index 98ae823..f07a9f6 100644 --- a/Source/Resources.xcassets/sg.dataset/sg.json +++ b/Source/Resources.xcassets/sg.dataset/sg.json @@ -2,58 +2,58 @@ "localeIdentifier": "sg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/shi.dataset/shi.json b/Source/Resources.xcassets/shi.dataset/shi.json index 7af9069..d95ad16 100644 --- a/Source/Resources.xcassets/shi.dataset/shi.json +++ b/Source/Resources.xcassets/shi.dataset/shi.json @@ -2,58 +2,58 @@ "localeIdentifier": "shi", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/si.dataset/si.json b/Source/Resources.xcassets/si.dataset/si.json index 1e896cf..4d7b7a3 100644 --- a/Source/Resources.xcassets/si.dataset/si.json +++ b/Source/Resources.xcassets/si.dataset/si.json @@ -2,58 +2,58 @@ "localeIdentifier": "si", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, සහ %2$@", - "2": "%1$@ සහ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, සහ {1}", + "2": "{0} සහ {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, හෝ %2$@", - "2": "%1$@ හෝ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, හෝ {1}", + "2": "{0} හෝ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, හෝ %2$@", - "2": "%1$@ හෝ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, හෝ {1}", + "2": "{0} හෝ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, හෝ %2$@", - "2": "%1$@ හෝ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, හෝ {1}", + "2": "{0} හෝ {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, සහ %2$@", - "2": "%1$@ සහ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, සහ {1}", + "2": "{0} සහ {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, සහ %2$@", - "2": "%1$@ සහ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, සහ {1}", + "2": "{0} සහ {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, සහ %2$@", - "2": "%1$@ සහ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, සහ {1}", + "2": "{0} සහ {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, සහ %2$@", - "2": "%1$@ සහ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, සහ {1}", + "2": "{0} සහ {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, සහ %2$@", - "2": "%1$@ සහ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, සහ {1}", + "2": "{0} සහ {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sk.dataset/sk.json b/Source/Resources.xcassets/sk.dataset/sk.json index afc185e..762f56f 100644 --- a/Source/Resources.xcassets/sk.dataset/sk.json +++ b/Source/Resources.xcassets/sk.dataset/sk.json @@ -2,58 +2,58 @@ "localeIdentifier": "sk", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ alebo %2$@", - "2": "%1$@ alebo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} alebo {1}", + "2": "{0} alebo {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ alebo %2$@", - "2": "%1$@ alebo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} alebo {1}", + "2": "{0} alebo {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ alebo %2$@", - "2": "%1$@ alebo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} alebo {1}", + "2": "{0} alebo {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ a %2$@", - "2": "%1$@ a %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}", + "2": "{0} a {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sl.dataset/sl.json b/Source/Resources.xcassets/sl.dataset/sl.json index 956a8ab..af44e62 100644 --- a/Source/Resources.xcassets/sl.dataset/sl.json +++ b/Source/Resources.xcassets/sl.dataset/sl.json @@ -2,58 +2,58 @@ "localeIdentifier": "sl", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ in %2$@", - "2": "%1$@ in %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} in {1}", + "2": "{0} in {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ali %2$@", - "2": "%1$@ ali %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ali {1}", + "2": "{0} ali {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ali %2$@", - "2": "%1$@ ali %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ali {1}", + "2": "{0} ali {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ali %2$@", - "2": "%1$@ ali %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ali {1}", + "2": "{0} ali {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ in %2$@", - "2": "%1$@ in %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} in {1}", + "2": "{0} in {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ in %2$@", - "2": "%1$@ in %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} in {1}", + "2": "{0} in {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ in %2$@", - "2": "%1$@ in %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} in {1}", + "2": "{0} in {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ in %2$@", - "2": "%1$@ in %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} in {1}", + "2": "{0} in {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ in %2$@", - "2": "%1$@ in %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} in {1}", + "2": "{0} in {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/smn.dataset/smn.json b/Source/Resources.xcassets/smn.dataset/smn.json index ca0b8bf..15a8e47 100644 --- a/Source/Resources.xcassets/smn.dataset/smn.json +++ b/Source/Resources.xcassets/smn.dataset/smn.json @@ -2,58 +2,58 @@ "localeIdentifier": "smn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sn.dataset/sn.json b/Source/Resources.xcassets/sn.dataset/sn.json index 131ce38..5a39af2 100644 --- a/Source/Resources.xcassets/sn.dataset/sn.json +++ b/Source/Resources.xcassets/sn.dataset/sn.json @@ -2,58 +2,58 @@ "localeIdentifier": "sn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/so.dataset/so.json b/Source/Resources.xcassets/so.dataset/so.json index 9ff6a14..994c46a 100644 --- a/Source/Resources.xcassets/so.dataset/so.json +++ b/Source/Resources.xcassets/so.dataset/so.json @@ -2,58 +2,58 @@ "localeIdentifier": "so", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ iyo %2$@", - "2": "%1$@ iyo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} iyo {1}", + "2": "{0} iyo {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ama %2$@", - "2": "%1$@ ama %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ama {1}", + "2": "{0} ama {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ama %2$@", - "2": "%1$@ ama %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ama {1}", + "2": "{0} ama {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ama %2$@", - "2": "%1$@ ama %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ama {1}", + "2": "{0} ama {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ & %2$@", - "2": "%1$@ & %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} & {1}", + "2": "{0} & {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ iyo %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} iyo {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sq.dataset/sq.json b/Source/Resources.xcassets/sq.dataset/sq.json index 29b1f9f..ff09e43 100644 --- a/Source/Resources.xcassets/sq.dataset/sq.json +++ b/Source/Resources.xcassets/sq.dataset/sq.json @@ -2,58 +2,58 @@ "localeIdentifier": "sq", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ dhe %2$@", - "2": "%1$@ dhe %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dhe {1}", + "2": "{0} dhe {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ose %2$@", - "2": "%1$@ ose %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ose {1}", + "2": "{0} ose {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ose %2$@", - "2": "%1$@ ose %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ose {1}", + "2": "{0} ose {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ose %2$@", - "2": "%1$@ ose %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ose {1}", + "2": "{0} ose {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ dhe %2$@", - "2": "%1$@ dhe %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dhe {1}", + "2": "{0} dhe {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ dhe %2$@", - "2": "%1$@ dhe %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dhe {1}", + "2": "{0} dhe {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ e %2$@", - "2": "%1$@ e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}", + "2": "{0} e {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sr.dataset/sr.json b/Source/Resources.xcassets/sr.dataset/sr.json index 2e8aa96..6808cd5 100644 --- a/Source/Resources.xcassets/sr.dataset/sr.json +++ b/Source/Resources.xcassets/sr.dataset/sr.json @@ -2,58 +2,58 @@ "localeIdentifier": "sr", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ или %2$@", - "2": "%1$@ или %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} или {1}", + "2": "{0} или {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ и %2$@", - "2": "%1$@ и %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}", + "2": "{0} и {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sr_Latn.dataset/sr_Latn.json b/Source/Resources.xcassets/sr_Latn.dataset/sr_Latn.json index dda73d2..4480004 100644 --- a/Source/Resources.xcassets/sr_Latn.dataset/sr_Latn.json +++ b/Source/Resources.xcassets/sr_Latn.dataset/sr_Latn.json @@ -2,58 +2,58 @@ "localeIdentifier": "sr_Latn", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ili %2$@", - "2": "%1$@ ili %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ili {1}", + "2": "{0} ili {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ i %2$@", - "2": "%1$@ i %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}", + "2": "{0} i {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sv.dataset/sv.json b/Source/Resources.xcassets/sv.dataset/sv.json index 6f65804..b19d67b 100644 --- a/Source/Resources.xcassets/sv.dataset/sv.json +++ b/Source/Resources.xcassets/sv.dataset/sv.json @@ -2,58 +2,58 @@ "localeIdentifier": "sv", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ och %2$@", - "2": "%1$@ och %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} och {1}", + "2": "{0} och {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ eller %2$@", - "2": "%1$@ eller %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}", + "2": "{0} eller {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ och %2$@", - "2": "%1$@ och %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} och {1}", + "2": "{0} och {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ och %2$@", - "2": "%1$@ och %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} och {1}", + "2": "{0} och {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/sw.dataset/sw.json b/Source/Resources.xcassets/sw.dataset/sw.json index f4978f3..0bc377b 100644 --- a/Source/Resources.xcassets/sw.dataset/sw.json +++ b/Source/Resources.xcassets/sw.dataset/sw.json @@ -2,58 +2,58 @@ "localeIdentifier": "sw", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}", + "2": "{0} na {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ au %2$@", - "2": "%1$@ au %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} au {1}", + "2": "{0} au {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ au %2$@", - "2": "%1$@ au %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} au {1}", + "2": "{0} au {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ au %2$@", - "2": "%1$@ au %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} au {1}", + "2": "{0} au {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ na %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}", + "2": "{0} na {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}", + "2": "{0} na {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}", + "2": "{0} na {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ na %2$@", - "2": "%1$@ na %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}", + "2": "{0} na {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ta.dataset/ta.json b/Source/Resources.xcassets/ta.dataset/ta.json index 92f38f7..f8fc823 100644 --- a/Source/Resources.xcassets/ta.dataset/ta.json +++ b/Source/Resources.xcassets/ta.dataset/ta.json @@ -2,58 +2,58 @@ "localeIdentifier": "ta", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ மற்றும் %2$@", - "2": "%1$@ மற்றும் %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} மற்றும் {1}", + "2": "{0} மற்றும் {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ அல்லது %2$@", - "2": "%1$@ அல்லது %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} அல்லது {1}", + "2": "{0} அல்லது {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ அல்லது %2$@", - "2": "%1$@ அல்லது %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} அல்லது {1}", + "2": "{0} அல்லது {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ அல்லது %2$@", - "2": "%1$@ அல்லது %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} அல்லது {1}", + "2": "{0} அல்லது {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ மற்றும் %2$@", - "2": "%1$@ மற்றும் %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} மற்றும் {1}", + "2": "{0} மற்றும் {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ மற்றும் %2$@", - "2": "%1$@ மற்றும் %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} மற்றும் {1}", + "2": "{0} மற்றும் {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ மற்றும் %2$@", - "2": "%1$@ மற்றும் %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} மற்றும் {1}", + "2": "{0} மற்றும் {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ மற்றும் %2$@", - "2": "%1$@ மற்றும் %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} மற்றும் {1}", + "2": "{0} மற்றும் {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/te.dataset/te.json b/Source/Resources.xcassets/te.dataset/te.json index f1e4bf3..ff6eba5 100644 --- a/Source/Resources.xcassets/te.dataset/te.json +++ b/Source/Resources.xcassets/te.dataset/te.json @@ -2,58 +2,58 @@ "localeIdentifier": "te", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ మరియు %2$@", - "2": "%1$@ మరియు %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} మరియు {1}", + "2": "{0} మరియు {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ లేదా %2$@", - "2": "%1$@ లేదా %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} లేదా {1}", + "2": "{0} లేదా {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ లేదా %2$@", - "2": "%1$@ లేదా %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} లేదా {1}", + "2": "{0} లేదా {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ లేదా %2$@", - "2": "%1$@ లేదా %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} లేదా {1}", + "2": "{0} లేదా {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ మరియు %2$@", - "2": "%1$@ మరియు %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} మరియు {1}", + "2": "{0} మరియు {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/teo.dataset/teo.json b/Source/Resources.xcassets/teo.dataset/teo.json index fdb8f05..0ad1ffa 100644 --- a/Source/Resources.xcassets/teo.dataset/teo.json +++ b/Source/Resources.xcassets/teo.dataset/teo.json @@ -2,58 +2,58 @@ "localeIdentifier": "teo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/tg.dataset/tg.json b/Source/Resources.xcassets/tg.dataset/tg.json index 56ae588..e79fbcb 100644 --- a/Source/Resources.xcassets/tg.dataset/tg.json +++ b/Source/Resources.xcassets/tg.dataset/tg.json @@ -2,58 +2,58 @@ "localeIdentifier": "tg", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/th.dataset/th.json b/Source/Resources.xcassets/th.dataset/th.json index 8d38cdd..54a88c8 100644 --- a/Source/Resources.xcassets/th.dataset/th.json +++ b/Source/Resources.xcassets/th.dataset/th.json @@ -2,58 +2,58 @@ "localeIdentifier": "th", "listPatterns": { "standard": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ และ%2$@", - "2": "%1$@และ%2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} และ{1}", + "2": "{0}และ{1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ หรือ %2$@", - "2": "%1$@ หรือ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}", + "2": "{0} หรือ {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ หรือ %2$@", - "2": "%1$@ หรือ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}", + "2": "{0} หรือ {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ หรือ %2$@", - "2": "%1$@ หรือ %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}", + "2": "{0} หรือ {1}" }, "standardNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ และ%2$@", - "2": "%1$@และ%2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} และ{1}", + "2": "{0}และ{1}" }, "standardShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ และ%2$@", - "2": "%1$@และ%2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} และ{1}", + "2": "{0}และ{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ และ %2$@", - "2": "%1$@ และ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} และ {1}", + "2": "{0} และ {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ และ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} และ {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ti.dataset/ti.json b/Source/Resources.xcassets/ti.dataset/ti.json index e75afe4..9e03fb2 100644 --- a/Source/Resources.xcassets/ti.dataset/ti.json +++ b/Source/Resources.xcassets/ti.dataset/ti.json @@ -2,58 +2,58 @@ "localeIdentifier": "ti", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/tk.dataset/tk.json b/Source/Resources.xcassets/tk.dataset/tk.json index 65dc441..6278d35 100644 --- a/Source/Resources.xcassets/tk.dataset/tk.json +++ b/Source/Resources.xcassets/tk.dataset/tk.json @@ -2,58 +2,58 @@ "localeIdentifier": "tk", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ we %2$@", - "2": "%1$@ we %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} we {1}", + "2": "{0} we {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ýa-da %2$@", - "2": "%1$@ ýa-da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ýa-da {1}", + "2": "{0} ýa-da {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ýa-da %2$@", - "2": "%1$@ ýa-da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ýa-da {1}", + "2": "{0} ýa-da {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ýa-da %2$@", - "2": "%1$@ ýa-da %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ýa-da {1}", + "2": "{0} ýa-da {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ we %2$@", - "2": "%1$@ we %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} we {1}", + "2": "{0} we {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@ we %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0} we {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/to.dataset/to.json b/Source/Resources.xcassets/to.dataset/to.json index 46cb6d1..05b3010 100644 --- a/Source/Resources.xcassets/to.dataset/to.json +++ b/Source/Resources.xcassets/to.dataset/to.json @@ -2,58 +2,58 @@ "localeIdentifier": "to", "listPatterns": { "standard": { - "start": "%1$@ mo %2$@", - "middle": "%1$@ mo %2$@", - "end": "%1$@ mo %2$@", - "2": "%1$@ mo %2$@" + "start": "{0} mo {1}", + "middle": "{0} mo {1}", + "end": "{0} mo {1}", + "2": "{0} mo {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, pē %2$@", - "2": "%1$@ pē %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, pē {1}", + "2": "{0} pē {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, pē %2$@", - "2": "%1$@ pē %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, pē {1}", + "2": "{0} pē {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, pē %2$@", - "2": "%1$@ pē %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, pē {1}", + "2": "{0} pē {1}" }, "standardNarrow": { - "start": "%1$@ mo %2$@", - "middle": "%1$@ mo %2$@", - "end": "%1$@ mo %2$@", - "2": "%1$@ mo %2$@" + "start": "{0} mo {1}", + "middle": "{0} mo {1}", + "end": "{0} mo {1}", + "2": "{0} mo {1}" }, "standardShort": { - "start": "%1$@ mo %2$@", - "middle": "%1$@ mo %2$@", - "end": "%1$@ mo %2$@", - "2": "%1$@ mo %2$@" + "start": "{0} mo {1}", + "middle": "{0} mo {1}", + "end": "{0} mo {1}", + "2": "{0} mo {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ mo e %2$@", - "2": "%1$@ mo e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} mo e {1}", + "2": "{0} mo e {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ mo e %2$@", - "2": "%1$@ mo e %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} mo e {1}", + "2": "{0} mo e {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ mo e %2$@", - "2": "%1$@ mo e %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} mo e {1}", + "2": "{0} mo e {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/tr.dataset/tr.json b/Source/Resources.xcassets/tr.dataset/tr.json index 2e6f80a..7e1d532 100644 --- a/Source/Resources.xcassets/tr.dataset/tr.json +++ b/Source/Resources.xcassets/tr.dataset/tr.json @@ -2,58 +2,58 @@ "localeIdentifier": "tr", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ve %2$@", - "2": "%1$@ ve %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ve {1}", + "2": "{0} ve {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ veya %2$@", - "2": "%1$@ veya %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} veya {1}", + "2": "{0} veya {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ veya %2$@", - "2": "%1$@ veya %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} veya {1}", + "2": "{0} veya {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ veya %2$@", - "2": "%1$@ veya %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} veya {1}", + "2": "{0} veya {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ ve %2$@", - "2": "%1$@ ve %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ve {1}", + "2": "{0} ve {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/tt.dataset/tt.json b/Source/Resources.xcassets/tt.dataset/tt.json index 0cbc818..4d047b0 100644 --- a/Source/Resources.xcassets/tt.dataset/tt.json +++ b/Source/Resources.xcassets/tt.dataset/tt.json @@ -2,58 +2,58 @@ "localeIdentifier": "tt", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ һәм %2$@", - "2": "%1$@ һәм %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} һәм {1}", + "2": "{0} һәм {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ һәм %2$@", - "2": "%1$@ һәм %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} һәм {1}", + "2": "{0} һәм {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ һәм %2$@", - "2": "%1$@ һәм %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} һәм {1}", + "2": "{0} һәм {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ һәм %2$@", - "2": "%1$@ һәм %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} һәм {1}", + "2": "{0} һәм {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ һәм %2$@", - "2": "%1$@ һәм %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} һәм {1}", + "2": "{0} һәм {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ һәм %2$@", - "2": "%1$@ һәм %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} һәм {1}", + "2": "{0} һәм {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/twq.dataset/twq.json b/Source/Resources.xcassets/twq.dataset/twq.json index 115843c..d2c364f 100644 --- a/Source/Resources.xcassets/twq.dataset/twq.json +++ b/Source/Resources.xcassets/twq.dataset/twq.json @@ -2,58 +2,58 @@ "localeIdentifier": "twq", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/tzm.dataset/tzm.json b/Source/Resources.xcassets/tzm.dataset/tzm.json index dfc1a75..b04eb33 100644 --- a/Source/Resources.xcassets/tzm.dataset/tzm.json +++ b/Source/Resources.xcassets/tzm.dataset/tzm.json @@ -2,58 +2,58 @@ "localeIdentifier": "tzm", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ug.dataset/ug.json b/Source/Resources.xcassets/ug.dataset/ug.json index f5cb426..9eed78f 100644 --- a/Source/Resources.xcassets/ug.dataset/ug.json +++ b/Source/Resources.xcassets/ug.dataset/ug.json @@ -2,58 +2,58 @@ "localeIdentifier": "ug", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, and %2$@", - "2": "%1$@ and %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, and {1}", + "2": "{0} and {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/uk.dataset/uk.json b/Source/Resources.xcassets/uk.dataset/uk.json index 17844a5..cfbab48 100644 --- a/Source/Resources.xcassets/uk.dataset/uk.json +++ b/Source/Resources.xcassets/uk.dataset/uk.json @@ -2,58 +2,58 @@ "localeIdentifier": "uk", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ або %2$@", - "2": "%1$@ або %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} або {1}", + "2": "{0} або {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ або %2$@", - "2": "%1$@ або %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} або {1}", + "2": "{0} або {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ або %2$@", - "2": "%1$@ або %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} або {1}", + "2": "{0} або {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ і %2$@", - "2": "%1$@ і %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} і {1}", + "2": "{0} і {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ur.dataset/ur.json b/Source/Resources.xcassets/ur.dataset/ur.json index ad36793..50b2c8b 100644 --- a/Source/Resources.xcassets/ur.dataset/ur.json +++ b/Source/Resources.xcassets/ur.dataset/ur.json @@ -2,58 +2,58 @@ "localeIdentifier": "ur", "listPatterns": { "standard": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "or": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "orNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "orShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "standardNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "standardShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "unitNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "unitShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/ur_IN.dataset/ur_IN.json b/Source/Resources.xcassets/ur_IN.dataset/ur_IN.json index 9222ad1..37a6c13 100644 --- a/Source/Resources.xcassets/ur_IN.dataset/ur_IN.json +++ b/Source/Resources.xcassets/ur_IN.dataset/ur_IN.json @@ -2,58 +2,58 @@ "localeIdentifier": "ur_IN", "listPatterns": { "standard": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "or": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "orNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "orShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، یا %2$@", - "2": "%1$@ یا %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، یا {1}", + "2": "{0} یا {1}" }, "standardNarrow": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "standardShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%1$@، اور %2$@", - "2": "%1$@ اور %2$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}", + "2": "{0} اور {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%2$@، %1$@", - "2": "%2$@، %1$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{1}، {0}", + "2": "{1}، {0}" }, "unitNarrow": { - "start": "%2$@ %1$@", - "middle": "%2$@ %1$@", - "end": "%2$@ %1$@", - "2": "%2$@ %1$@" + "start": "{1} {0}", + "middle": "{1} {0}", + "end": "{1} {0}", + "2": "{1} {0}" }, "unitShort": { - "start": "%1$@، %2$@", - "middle": "%1$@، %2$@", - "end": "%2$@، %1$@", - "2": "%2$@، %1$@" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{1}، {0}", + "2": "{1}، {0}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/uz.dataset/uz.json b/Source/Resources.xcassets/uz.dataset/uz.json index 358f219..7c8eb29 100644 --- a/Source/Resources.xcassets/uz.dataset/uz.json +++ b/Source/Resources.xcassets/uz.dataset/uz.json @@ -2,58 +2,58 @@ "localeIdentifier": "uz", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ va %2$@", - "2": "%1$@ va %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} va {1}", + "2": "{0} va {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ yoki %2$@", - "2": "%1$@ yoki %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} yoki {1}", + "2": "{0} yoki {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ yoki %2$@", - "2": "%1$@ yoki %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} yoki {1}", + "2": "{0} yoki {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ yoki %2$@", - "2": "%1$@ yoki %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} yoki {1}", + "2": "{0} yoki {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ va %2$@", - "2": "%1$@ va %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} va {1}", + "2": "{0} va {1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/vai.dataset/vai.json b/Source/Resources.xcassets/vai.dataset/vai.json index 5cf964e..495a076 100644 --- a/Source/Resources.xcassets/vai.dataset/vai.json +++ b/Source/Resources.xcassets/vai.dataset/vai.json @@ -2,58 +2,58 @@ "localeIdentifier": "vai", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/vi.dataset/vi.json b/Source/Resources.xcassets/vi.dataset/vi.json index f619289..e1b7354 100644 --- a/Source/Resources.xcassets/vi.dataset/vi.json +++ b/Source/Resources.xcassets/vi.dataset/vi.json @@ -2,58 +2,58 @@ "localeIdentifier": "vi", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ và %2$@", - "2": "%1$@ và %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}", + "2": "{0} và {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ hoặc %2$@", - "2": "%1$@ hoặc %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} hoặc {1}", + "2": "{0} hoặc {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ hoặc %2$@", - "2": "%1$@ hoặc %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} hoặc {1}", + "2": "{0} hoặc {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ hoặc %2$@", - "2": "%1$@ hoặc %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} hoặc {1}", + "2": "{0} hoặc {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ và %2$@", - "2": "%1$@ và %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}", + "2": "{0} và {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ và %2$@", - "2": "%1$@ và %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}", + "2": "{0} và {1}" }, "unitNarrow": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ và %2$@", - "2": "%1$@ và %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}", + "2": "{0} và {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/vo.dataset/vo.json b/Source/Resources.xcassets/vo.dataset/vo.json index 4160ca5..46c47d2 100644 --- a/Source/Resources.xcassets/vo.dataset/vo.json +++ b/Source/Resources.xcassets/vo.dataset/vo.json @@ -2,58 +2,58 @@ "localeIdentifier": "vo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/vun.dataset/vun.json b/Source/Resources.xcassets/vun.dataset/vun.json index 061c23e..96a2d99 100644 --- a/Source/Resources.xcassets/vun.dataset/vun.json +++ b/Source/Resources.xcassets/vun.dataset/vun.json @@ -2,58 +2,58 @@ "localeIdentifier": "vun", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/wae.dataset/wae.json b/Source/Resources.xcassets/wae.dataset/wae.json index c852fae..97702d4 100644 --- a/Source/Resources.xcassets/wae.dataset/wae.json +++ b/Source/Resources.xcassets/wae.dataset/wae.json @@ -2,58 +2,58 @@ "localeIdentifier": "wae", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ und %2$@", - "2": "%1$@ und %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} und {1}", + "2": "{0} und {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/wo.dataset/wo.json b/Source/Resources.xcassets/wo.dataset/wo.json index c3926b4..0aa3901 100644 --- a/Source/Resources.xcassets/wo.dataset/wo.json +++ b/Source/Resources.xcassets/wo.dataset/wo.json @@ -2,58 +2,58 @@ "localeIdentifier": "wo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/xh.dataset/xh.json b/Source/Resources.xcassets/xh.dataset/xh.json index 3d3a462..8dc896f 100644 --- a/Source/Resources.xcassets/xh.dataset/xh.json +++ b/Source/Resources.xcassets/xh.dataset/xh.json @@ -2,58 +2,58 @@ "localeIdentifier": "xh", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/xog.dataset/xog.json b/Source/Resources.xcassets/xog.dataset/xog.json index 4c52f76..64e2aaa 100644 --- a/Source/Resources.xcassets/xog.dataset/xog.json +++ b/Source/Resources.xcassets/xog.dataset/xog.json @@ -2,58 +2,58 @@ "localeIdentifier": "xog", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/yav.dataset/yav.json b/Source/Resources.xcassets/yav.dataset/yav.json index c84e742..ad48543 100644 --- a/Source/Resources.xcassets/yav.dataset/yav.json +++ b/Source/Resources.xcassets/yav.dataset/yav.json @@ -2,58 +2,58 @@ "localeIdentifier": "yav", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/yi.dataset/yi.json b/Source/Resources.xcassets/yi.dataset/yi.json index 2eff07a..5cb043d 100644 --- a/Source/Resources.xcassets/yi.dataset/yi.json +++ b/Source/Resources.xcassets/yi.dataset/yi.json @@ -2,58 +2,58 @@ "localeIdentifier": "yi", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ און %2$@", - "2": "%1$@ און %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} און {1}", + "2": "{0} און {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ און %2$@", - "2": "%1$@ און %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} און {1}", + "2": "{0} און {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ און %2$@", - "2": "%1$@ און %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} און {1}", + "2": "{0} און {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ און %2$@", - "2": "%1$@ און %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} און {1}", + "2": "{0} און {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ און %2$@", - "2": "%1$@ און %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} און {1}", + "2": "{0} און {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ און %2$@", - "2": "%1$@ און %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} און {1}", + "2": "{0} און {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/yo.dataset/yo.json b/Source/Resources.xcassets/yo.dataset/yo.json index aacbbff..e0ced14 100644 --- a/Source/Resources.xcassets/yo.dataset/yo.json +++ b/Source/Resources.xcassets/yo.dataset/yo.json @@ -2,58 +2,58 @@ "localeIdentifier": "yo", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/yue.dataset/yue.json b/Source/Resources.xcassets/yue.dataset/yue.json index 40b7fd2..9bb20da 100644 --- a/Source/Resources.xcassets/yue.dataset/yue.json +++ b/Source/Resources.xcassets/yue.dataset/yue.json @@ -2,58 +2,58 @@ "localeIdentifier": "yue", "listPatterns": { "standard": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@同%2$@", - "2": "%1$@同%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}同{1}", + "2": "{0}同{1}" }, "or": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@ 或 %2$@", - "2": "%1$@ 或 %2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0} 或 {1}", + "2": "{0} 或 {1}" }, "orNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@ 或 %2$@", - "2": "%1$@ 或 %2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0} 或 {1}", + "2": "{0} 或 {1}" }, "orShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@ 或 %2$@", - "2": "%1$@ 或 %2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0} 或 {1}", + "2": "{0} 或 {1}" }, "standardNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@同%2$@", - "2": "%1$@同%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}同{1}", + "2": "{0}同{1}" }, "standardShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@同%2$@", - "2": "%1$@同%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}同{1}", + "2": "{0}同{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/yue_Hans.dataset/yue_Hans.json b/Source/Resources.xcassets/yue_Hans.dataset/yue_Hans.json index cbc6dca..c7db418 100644 --- a/Source/Resources.xcassets/yue_Hans.dataset/yue_Hans.json +++ b/Source/Resources.xcassets/yue_Hans.dataset/yue_Hans.json @@ -2,58 +2,58 @@ "localeIdentifier": "yue_Hans", "listPatterns": { "standard": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@同%2$@", - "2": "%1$@同%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}同{1}", + "2": "{0}同{1}" }, "or": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@ 或 %2$@", - "2": "%1$@ 或 %2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0} 或 {1}", + "2": "{0} 或 {1}" }, "orNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@ 或 %2$@", - "2": "%1$@ 或 %2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0} 或 {1}", + "2": "{0} 或 {1}" }, "orShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@ 或 %2$@", - "2": "%1$@ 或 %2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0} 或 {1}", + "2": "{0} 或 {1}" }, "standardNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@同%2$@", - "2": "%1$@同%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}同{1}", + "2": "{0}同{1}" }, "standardShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@同%2$@", - "2": "%1$@同%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}同{1}", + "2": "{0}同{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/zgh.dataset/zgh.json b/Source/Resources.xcassets/zgh.dataset/zgh.json index 553fcd7..c55e5a7 100644 --- a/Source/Resources.xcassets/zgh.dataset/zgh.json +++ b/Source/Resources.xcassets/zgh.dataset/zgh.json @@ -2,58 +2,58 @@ "localeIdentifier": "zgh", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/zh.dataset/zh.json b/Source/Resources.xcassets/zh.dataset/zh.json index f8c77d1..440ed48 100644 --- a/Source/Resources.xcassets/zh.dataset/zh.json +++ b/Source/Resources.xcassets/zh.dataset/zh.json @@ -2,58 +2,58 @@ "localeIdentifier": "zh", "listPatterns": { "standard": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "or": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "orNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "orShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "standardNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "standardShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "unit": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitNarrow": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitShort": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/zh_Hant.dataset/zh_Hant.json b/Source/Resources.xcassets/zh_Hant.dataset/zh_Hant.json index 1f10f8f..6ee511a 100644 --- a/Source/Resources.xcassets/zh_Hant.dataset/zh_Hant.json +++ b/Source/Resources.xcassets/zh_Hant.dataset/zh_Hant.json @@ -2,58 +2,58 @@ "localeIdentifier": "zh_Hant", "listPatterns": { "standard": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "or": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "orNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "orShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "standardNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "standardShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/zh_Hant_HK.dataset/zh_Hant_HK.json b/Source/Resources.xcassets/zh_Hant_HK.dataset/zh_Hant_HK.json index 05eb0de..04c8292 100644 --- a/Source/Resources.xcassets/zh_Hant_HK.dataset/zh_Hant_HK.json +++ b/Source/Resources.xcassets/zh_Hant_HK.dataset/zh_Hant_HK.json @@ -2,58 +2,58 @@ "localeIdentifier": "zh_Hant_HK", "listPatterns": { "standard": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@及%2$@", - "2": "%1$@及%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}及{1}", + "2": "{0}及{1}" }, "or": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "orNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "orShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@或%2$@", - "2": "%1$@或%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}或{1}", + "2": "{0}或{1}" }, "standardNarrow": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@和%2$@", - "2": "%1$@和%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}和{1}", + "2": "{0}和{1}" }, "standardShort": { - "start": "%1$@、%2$@", - "middle": "%1$@、%2$@", - "end": "%1$@及%2$@", - "2": "%1$@及%2$@" + "start": "{0}、{1}", + "middle": "{0}、{1}", + "end": "{0}及{1}", + "2": "{0}及{1}" }, "unit": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" }, "unitNarrow": { - "start": "%1$@%2$@", - "middle": "%1$@%2$@", - "end": "%1$@%2$@", - "2": "%1$@%2$@" + "start": "{0}{1}", + "middle": "{0}{1}", + "end": "{0}{1}", + "2": "{0}{1}" }, "unitShort": { - "start": "%1$@ %2$@", - "middle": "%1$@ %2$@", - "end": "%1$@ %2$@", - "2": "%1$@ %2$@" + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}", + "2": "{0} {1}" } } } \ No newline at end of file diff --git a/Source/Resources.xcassets/zu.dataset/zu.json b/Source/Resources.xcassets/zu.dataset/zu.json index cbe2503..d5907ec 100644 --- a/Source/Resources.xcassets/zu.dataset/zu.json +++ b/Source/Resources.xcassets/zu.dataset/zu.json @@ -2,58 +2,58 @@ "localeIdentifier": "zu", "listPatterns": { "standard": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ne-%2$@", - "2": "%1$@ ne-%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ne-{1}", + "2": "{0} ne-{1}" }, "or": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "orShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, or %2$@", - "2": "%1$@ or %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}", + "2": "{0} or {1}" }, "standardNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ne-%2$@", - "2": "%1$@ ne-%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ne-{1}", + "2": "{0} ne-{1}" }, "standardShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, ne-%2$@", - "2": "%1$@ ne-%2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ne-{1}", + "2": "{0} ne-{1}" }, "unit": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" }, "unitNarrow": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@ %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} {1}", + "2": "{0}, {1}" }, "unitShort": { - "start": "%1$@, %2$@", - "middle": "%1$@, %2$@", - "end": "%1$@, %2$@", - "2": "%1$@, %2$@" + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}", + "2": "{0}, {1}" } } } \ No newline at end of file From 317f09129148b339974977f90deed73537a974c6 Mon Sep 17 00:00:00 2001 From: Liam Nichols Date: Wed, 26 Aug 2020 12:32:07 +0100 Subject: [PATCH 4/6] Upadate tests to expect new formats --- Tests/ArgumentRangesTests.swift | 100 +++++++--------------------- Tests/FormatTests.swift | 39 +++++------ Tests/ListPatternBuilderTests.swift | 12 ++-- 3 files changed, 47 insertions(+), 104 deletions(-) diff --git a/Tests/ArgumentRangesTests.swift b/Tests/ArgumentRangesTests.swift index 4a89bd9..62a2ea0 100644 --- a/Tests/ArgumentRangesTests.swift +++ b/Tests/ArgumentRangesTests.swift @@ -28,7 +28,7 @@ class ArgumentRangesTests: XCTestCase { func testBasicString() throws { var ranges: [Range] = [] - let output = String(format: "My name is %@.", ranges: &ranges, "Liam") + let output = String(format: "My name is {0}.", ranges: &ranges, "Liam") XCTAssertEqual(output, "My name is Liam.") XCTAssertEqual(ranges.map({ output[$0] }), ["Liam"]) @@ -37,7 +37,7 @@ class ArgumentRangesTests: XCTestCase { func testArgumentPositionSpecifiers() throws { var ranges: [Range] = [] - let output = String(format: "Today, %2$@ and %1$@ present to you:", ranges: &ranges, "Liam", "Linda") + let output = String(format: "Today, {1} and {0} present to you:", ranges: &ranges, "Liam", "Linda") XCTAssertEqual(output, "Today, Linda and Liam present to you:") XCTAssertEqual(ranges.map({ output[$0] }), ["Linda", "Liam"]) @@ -46,109 +46,46 @@ class ArgumentRangesTests: XCTestCase { func testDuplicatesArguments() throws { var ranges: [Range] = [] - let output = String(format: "Hi %1$@! Your name is %1$@.", ranges: &ranges, "Liam") + let output = String(format: "Hi {0}! Your name is {0}.", ranges: &ranges, "Liam") XCTAssertEqual(output, "Hi Liam! Your name is Liam.") XCTAssertEqual(ranges.map({ output[$0] }), ["Liam", "Liam"]) } - func testMixedArgumentPositionSpecifiers() throws { - - var ranges: [Range] = [] - let output = String(format: "Hello %1$@ %@.", ranges: &ranges, "Liam", "Nichols") - - XCTAssertEqual(output, "Hello Liam Liam.") - XCTAssertEqual(ranges.map({ output[$0] }), ["Liam", "Liam"]) - } - func testSwiftStringIndexWeirdness() throws { var ranges: [Range] = [] - let output = String(format: "%@ and %@ - %@", ranges: &ranges, "👸🏼", "👨🏾‍💻", "Test") + let output = String(format: "{0} and {1} - {2}", ranges: &ranges, "👸🏼", "👨🏾‍💻", "Test") XCTAssertEqual(output, "👸🏼 and 👨🏾‍💻 - Test") XCTAssertEqual(ranges.map({ output[$0] }), ["👸🏼", "👨🏾‍💻", "Test"]) } - // These tests will be hard to fix since the way we enumerate the format string needs to change. - // They only apply to invalid formats so its not that high priority. - -// func testInvalidArgumentPlaceholder() throws { -// -// var ranges: [Range] = [] -// let output = String(format: "Hello %$ %@.", ranges: &ranges, "Liam", "Nichols") -// -// XCTAssertEqual(output, "Hello $ Liam.") -// XCTAssertEqual(ranges.map({ output[$0] }), ["Liam"]) -// } -// -// func testInvalidPercentInFormatString() throws { -// -// var ranges: [Range] = [] -// let output = String(format: "Hello % %@.", ranges: &ranges, "Liam", "Nichols") -// -// XCTAssertEqual(output, "Hello @.") -// XCTAssertEqual(ranges.map({ output[$0] }), []) -// } - - func testValidPercentInFormatString() throws { - - var ranges: [Range] = [] - let output = String(format: "Progress: %d%%", ranges: &ranges, 50) - - XCTAssertEqual(output, "Progress: 50%") - XCTAssertEqual(ranges.map({ output[$0] }), ["50"]) - } - - func testLocalizedArguments() throws { - - var ranges: [Range] = [] - let locale = Locale(identifier: "en_GB") - let output = String(format: "Item Count: %d", locale: locale, ranges: &ranges, 1234) - - XCTAssertEqual(output, "Item Count: 1,234") - XCTAssertEqual(ranges.map({ output[$0] }), ["1,234"]) - } - - func testPrecisionSpecifier() throws { - - var ranges: [Range] = [] - let output = String(format: "Unit: %.4d", ranges: &ranges, 2) - - XCTAssertEqual(output, "Unit: 0002") - XCTAssertEqual(ranges.map({ output[$0] }), ["0002"]) - } - func testArgumentRanges() throws { let input = """ - First String: %@ - Third String: %3$@ - Second String: %2$@ - - Integer: %4$d - Float With Precision: %5$.2f + First String: {0} + Third String: {2} + Second String: {1} """ var ranges: [Range] = [] - let output = String(format: input, ranges: &ranges, "ONE", "TWO", "THREE", 100, 100.1) + let output = String(format: input, ranges: &ranges, "ONE", "TWO", "THREE") XCTAssertFalse(output.isEmpty) XCTAssertEqual(ranges.map({ NSRange($0, in: output) }), [ NSRange(location: 14, length: 3), NSRange(location: 32, length: 5), - NSRange(location: 53, length: 3), - NSRange(location: 67, length: 3), - NSRange(location: 93, length: 6), + NSRange(location: 53, length: 3) ]) } func testMoreComplicatedArgumentRanges() throws { let input = """ - First String: %@ - Third String: %3$@ - Second String: %2$@ + First String: {0} + Third String: {2} + Second String: {1} """ var ranges: [Range] = [] @@ -174,4 +111,17 @@ class ArgumentRangesTests: XCTestCase { ["👍", "👍👍👍", "👍🏽"] ) } + + func testBug() throws { + let json = #"["roro(همسات المستقبل)","َمنار منار، Alwahabi Alwahabi، و10 آخرين"]"# + let data = try XCTUnwrap(json.data(using: .utf8)) + let array = try JSONDecoder().decode([String].self, from: data) + XCTAssertEqual(array.count, 2) + + var ranges: [Range] = [] + let output = String(format: "{0}، {1}", ranges: &ranges, array.first!, array.last!) + + XCTAssertEqual(output, "roro(همسات المستقبل)، منار منار، Alwahabi Alwahabi، و10 آخرين") + XCTAssertEqual(ranges.count, 2) + } } diff --git a/Tests/FormatTests.swift b/Tests/FormatTests.swift index 158a376..687d6a5 100644 --- a/Tests/FormatTests.swift +++ b/Tests/FormatTests.swift @@ -33,38 +33,31 @@ class FormatTests: XCTestCase { func testPatternArgumentCounts() { XCTAssertNotNil(Format.Patterns(listPatterns: [ - "2": "%@ and %@", - "3": "%@ and %@ and %@", - "start": "%@, %@", - "middle": "%@, %@", - "end": "%1$@ and %2$@" + "2": "{0} and {1}", + "3": "{0} and {1} and {2}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}" ])) XCTAssertNil(Format.Patterns(listPatterns: [ - "3": "%@", - "start": "%@, %@", - "middle": "%@, %@", - "end": "%@ and %@" + "3": "{0}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}" ])) XCTAssertNil(Format.Patterns(listPatterns: [ - "3": "%@ and %@ and %@", - "start": "%@", - "middle": "%@, %@", - "end": "%@ and %@" + "3": "{0} and {1} and {2}", + "start": "{0}", + "middle": "{0}, {1}", + "end": "{0} and {1}" ])) XCTAssertNil(Format.Patterns(listPatterns: [ - "3": "%@ and %@ and %@", - "start": "%@, %@", - "middle": "%@, %d", - "end": "%@ and %@" - ])) - - XCTAssertNil(Format.Patterns(listPatterns: [ - "3": "%@ and %@ and %@", - "start": "%@, %@", - "middle": "%@, %@", + "3": "{0} and {1} and {2}", + "start": "{0}, {1}", + "middle": "{0}, {1}", "end": "" ])) } diff --git a/Tests/ListPatternBuilderTests.swift b/Tests/ListPatternBuilderTests.swift index b6c1c46..eb3fc16 100644 --- a/Tests/ListPatternBuilderTests.swift +++ b/Tests/ListPatternBuilderTests.swift @@ -26,12 +26,12 @@ import XCTest class ListPatternBuilderTests: XCTestCase { let patterns = Format.Patterns(listPatterns: [ - "2": "%1$@ [2] %2$@", - "6": "%6$@ %5$@ %4$@ %3$@ %2$@ %1$@", - "7": "%@ %@ %@ %@ %@ %@ %@", - "start": "%1$@ [START] %2$@", - "middle": "%1$@ [MIDDLE] %2$@", - "end": "%1$@ [END] %2$@" + "2": "{0} [2] {1}", + "6": "{5} {4} {3} {2} {1} {0}", + "7": "{0} {1} {2} {3} {4} {5} {6}", + "start": "{0} [START] {1}", + "middle": "{0} [MIDDLE] {1}", + "end": "{0} [END] {1}" ])! func testNoItemsItems() { From 5e9cb75913bb0c27abc76b9b5a8d7840c452b570 Mon Sep 17 00:00:00 2001 From: Liam Nichols Date: Wed, 26 Aug 2020 12:32:24 +0100 Subject: [PATCH 5/6] Rewrite format parsing --- .../Extensions/String+ListItemFormatter.swift | 65 +++++++------------ Source/Models/Format.swift | 2 +- 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/Source/Extensions/String+ListItemFormatter.swift b/Source/Extensions/String+ListItemFormatter.swift index 76ae9f4..9c61608 100644 --- a/Source/Extensions/String+ListItemFormatter.swift +++ b/Source/Extensions/String+ListItemFormatter.swift @@ -24,58 +24,37 @@ import Foundation extension String { - init(format: String, ranges: inout [Range], _ args: CVarArg...) { + init(format: String, ranges: inout [Range], _ args: String...) { self.init(format: format, ranges: &ranges, arguments: args) } - init(format: String, ranges: inout [Range], arguments: [CVarArg]) { - self.init(format: format, locale: nil, ranges: &ranges, arguments: arguments) - } - - init(format: String, locale: Locale?, ranges: inout [Range], _ args: CVarArg...) { - self.init(format: format, locale: locale, ranges: &ranges, arguments: args) - } + init(format: String, ranges: inout [Range], arguments: [String]) { + var string = "" + var lowerBound: String.Index = format.startIndex - init(format _format: String, locale: Locale?, ranges: inout [Range], arguments: [CVarArg]) { - self.init(format: _format, locale: locale, arguments: arguments) + let regex = try! NSRegularExpression(pattern: "\\{([0-9]+)\\}") + regex.enumerateMatches(in: format, range: NSRange(format.startIndex ..< format.endIndex, in: format)) { result, _, _ in + let result = result! - let format = _format as NSString - var nextUnassignedIndex: Int = 0 - var locationOffset: String.IndexDistance = 0 + let resultRange = Range(result.range(at: 0), in: format)! + let indexRange = Range(result.range(at: 1), in: format)! + let index = Int(format[indexRange])! + let argument = arguments[index] - let pattern = "%(([0-9]+)\\$)?(\\.[0-9]+)?([@aAcCdDeEfFgGopsSuUxX]|ld|lu|lx|zx)" - let regex = try! NSRegularExpression(pattern: pattern, options: []) - let range = NSRange(location: 0, length: format.length) - regex.enumerateMatches(in: _format, options: [], range: range) { _match, _, stop in - let match = _match! - let range = match.range + let prefixRange = lowerBound ..< resultRange.lowerBound + string += format[prefixRange] - let argIndex: Int - let indexValueRange = match.range(at: 2) - if indexValueRange.location != NSNotFound, - let index = Int(format.substring(with: indexValueRange)) { - argIndex = index - 1 - } else { - argIndex = nextUnassignedIndex - nextUnassignedIndex += 1 - } + let argumentStartIndex = string.endIndex + string += argument + let argumentEndIndex = string.endIndex - let argValueFormat: NSString - let indexRange = match.range(at: 1) - if indexRange.location != NSNotFound { - let placeholder = format.substring(with: range) as NSString - let indexString = format.substring(with: indexRange) - argValueFormat = placeholder.replacingOccurrences(of: indexString, with: "") as NSString - } else { - argValueFormat = format.substring(with: range) as NSString - } + ranges.append(argumentStartIndex ..< argumentEndIndex) - let argValue = NSString(format: argValueFormat, locale: locale, arguments[argIndex]) - let argRange = NSRange(location: range.location + locationOffset, length: argValue.length) - - ranges.append(Range(argRange, in: self)!) - - locationOffset += (argValue.length - range.length) + lowerBound = resultRange.upperBound } + + // Close up + string += format[lowerBound ..< format.endIndex] + self = string } } diff --git a/Source/Models/Format.swift b/Source/Models/Format.swift index 475d044..5fb3a19 100644 --- a/Source/Models/Format.swift +++ b/Source/Models/Format.swift @@ -119,7 +119,7 @@ private extension ListItemFormatter.Style { private extension String { func argCount() -> Int { - let regex = try? NSRegularExpression(pattern: "%([0-9]+\\$)?@", options: []) + let regex = try? NSRegularExpression(pattern: "\\{[0-9]+\\}", options: []) return regex?.numberOfMatches(in: self, options: [], range: NSRange(startIndex ..< endIndex, in: self)) ?? 0 } } From e4df66152ec6f284dc1476022c1731bf428fed42 Mon Sep 17 00:00:00 2001 From: Liam Nichols Date: Thu, 27 Aug 2020 17:14:10 +0100 Subject: [PATCH 6/6] Fix issues by using UnicodeScalarView instead of String's view. Add tests to verify --- Source/ListPatternBuilder.swift | 6 +++--- Tests/ArgumentRangesTests.swift | 15 +++++++-------- Tests/ListPatternBuilderTests.swift | 9 +++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Source/ListPatternBuilder.swift b/Source/ListPatternBuilder.swift index a970315..e90d0d9 100644 --- a/Source/ListPatternBuilder.swift +++ b/Source/ListPatternBuilder.swift @@ -82,10 +82,10 @@ class ListPatternBuilder { let itemRange = ranges.first(where: { formatted[$0] == nextItem })! let stringRange = ranges.first(where: { formatted[$0] == string })! - let baseIndex = stringRange.lowerBound + let baseIndex = stringRange.lowerBound.samePosition(in: formatted.unicodeScalars)! itemRanges = itemRanges.map { - let startIndex = formatted.index(baseIndex, offsetBy: string.distance(from: string.startIndex, to: $0.lowerBound)) - let endIndex = formatted.index(baseIndex, offsetBy: string.distance(from: string.startIndex, to: $0.upperBound)) + let startIndex = formatted.unicodeScalars.index(baseIndex, offsetBy: string.unicodeScalars.distance(from: string.unicodeScalars.startIndex, to: $0.lowerBound)) + let endIndex = formatted.unicodeScalars.index(baseIndex, offsetBy: string.unicodeScalars.distance(from: string.unicodeScalars.startIndex, to: $0.upperBound)) return startIndex ..< endIndex } diff --git a/Tests/ArgumentRangesTests.swift b/Tests/ArgumentRangesTests.swift index 62a2ea0..1e34c5c 100644 --- a/Tests/ArgumentRangesTests.swift +++ b/Tests/ArgumentRangesTests.swift @@ -112,16 +112,15 @@ class ArgumentRangesTests: XCTestCase { ) } - func testBug() throws { - let json = #"["roro(همسات المستقبل)","َمنار منار، Alwahabi Alwahabi، و10 آخرين"]"# - let data = try XCTUnwrap(json.data(using: .utf8)) - let array = try JSONDecoder().decode([String].self, from: data) - XCTAssertEqual(array.count, 2) + func testCombiningCharacters() throws { var ranges: [Range] = [] - let output = String(format: "{0}، {1}", ranges: &ranges, array.first!, array.last!) + let output = String(format: "{0} {1}", ranges: &ranges, "A", "َB") // the Arabic fatha has not yet combined as no leading character - XCTAssertEqual(output, "roro(همسات المستقبل)، منار منار، Alwahabi Alwahabi، و10 آخرين") - XCTAssertEqual(ranges.count, 2) + XCTAssertEqual(output, "A َB") + + let expected = ["A", "َB"] // the Arabic fatha shhould be pulled back out without the space + XCTAssertTrue(expected.last!.unicodeScalars.count == 2) + XCTAssertEqual(ranges.map({ String(output[$0]) }), expected) // Range should incoporate the space(?) since it can't just be the fatha as it combined } } diff --git a/Tests/ListPatternBuilderTests.swift b/Tests/ListPatternBuilderTests.swift index eb3fc16..bcdb290 100644 --- a/Tests/ListPatternBuilderTests.swift +++ b/Tests/ListPatternBuilderTests.swift @@ -97,4 +97,13 @@ class ListPatternBuilderTests: XCTestCase { XCTAssertEqual(result.string, "👍🏽 [START] 👍 [MIDDLE] 👍👎🏼 [END] 👍👍🏽👍") XCTAssertEqual(result.itemRanges.map { result.string[$0] }, ["👍🏽", "👍", "👍👎🏼", "👍👍🏽👍"]) } + + func testWithCombiningCharacters() { + // https://en.wikipedia.org/wiki/Combining_character + + let builder = ListPatternBuilder(patterns: patterns) + let result = builder.build(from: ["A", "B", "َC", "َD"]) + XCTAssertEqual(result.string, "A [START] B [MIDDLE] َC [END] َD") + XCTAssertEqual(result.itemRanges.map { result.string[$0] }, ["A", "B", "َC", "َD"]) + } }