Skip to content

Commit d9db067

Browse files
committed
chore: resolve merge conflicts
2 parents 9c5902f + 865204a commit d9db067

File tree

1 file changed

+144
-0
lines changed

1 file changed

+144
-0
lines changed

IceCubesApp/Resources/Localization/Localizable.xcstrings

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,12 @@
908908
"state" : "translated",
909909
"value" : "%lld."
910910
}
911+
},
912+
"es" : {
913+
"stringUnit" : {
914+
"state" : "translated",
915+
"value" : "%lld"
916+
}
911917
}
912918
}
913919
},
@@ -20733,6 +20739,12 @@
2073320739
"state" : "translated",
2073420740
"value" : "첨부될 이미지에 대한 설명"
2073520741
}
20742+
},
20743+
"es" : {
20744+
"stringUnit" : {
20745+
"state" : "translated",
20746+
"value" : "Texto ALT para la imagen"
20747+
}
2073620748
}
2073720749
}
2073820750
},
@@ -20807,6 +20819,12 @@
2080720819
"state" : "translated",
2080820820
"value" : "API 버전"
2080920821
}
20822+
},
20823+
"es" : {
20824+
"stringUnit" : {
20825+
"state" : "translated",
20826+
"value" : "Versiones de la API"
20827+
}
2081020828
}
2081120829
}
2081220830
},
@@ -21087,6 +21105,12 @@
2108721105
"state" : "translated",
2108821106
"value" : "부스트"
2108921107
}
21108+
},
21109+
"es" : {
21110+
"stringUnit" : {
21111+
"state" : "translated",
21112+
"value" : "Comportamiento del Botón de Boost"
21113+
}
2109021114
}
2109121115
}
2109221116
},
@@ -21097,6 +21121,12 @@
2109721121
"state" : "translated",
2109821122
"value" : "본문"
2109921123
}
21124+
},
21125+
"es" : {
21126+
"stringUnit" : {
21127+
"state" : "translated",
21128+
"value" : "Leyenda"
21129+
}
2110021130
}
2110121131
}
2110221132
},
@@ -21107,6 +21137,12 @@
2110721137
"state" : "translated",
2110821138
"value" : "글 본문"
2110921139
}
21140+
},
21141+
"es" : {
21142+
"stringUnit" : {
21143+
"state" : "translated",
21144+
"value" : "Leyenda para tu publicación"
21145+
}
2111021146
}
2111121147
}
2111221148
},
@@ -22942,6 +22978,12 @@
2294222978
"state" : "translated",
2294322979
"value" : "게시될 이미지에 대한 설명 (순서대로)"
2294422980
}
22981+
},
22982+
"es" : {
22983+
"stringUnit" : {
22984+
"state" : "translated",
22985+
"value" : "Descripciones (ALT) para tus imágenes en orden"
22986+
}
2294522987
}
2294622988
}
2294722989
},
@@ -27327,6 +27369,12 @@
2732727369
"state" : "translated",
2732827370
"value" : "오류: %@"
2732927371
}
27372+
},
27373+
"es" : {
27374+
"stringUnit" : {
27375+
"state" : "translated",
27376+
"value" : "Error: %@"
27377+
}
2733027378
}
2733127379
}
2733227380
},
@@ -32128,6 +32176,12 @@
3212832176
"state" : "translated",
3212932177
"value" : "이미지 설명"
3213032178
}
32179+
},
32180+
"es" : {
32181+
"stringUnit" : {
32182+
"state" : "translated",
32183+
"value" : "Descripción de la imagen"
32184+
}
3213132185
}
3213232186
}
3213332187
},
@@ -32138,6 +32192,12 @@
3213832192
"state" : "translated",
3213932193
"value" : "이미지 설명"
3214032194
}
32195+
},
32196+
"es" : {
32197+
"stringUnit" : {
32198+
"state" : "translated",
32199+
"value" : "Descripciones de las imágenes"
32200+
}
3214132201
}
3214232202
}
3214332203
},
@@ -32206,6 +32266,12 @@
3220632266
"state" : "translated",
3220732267
"value" : "게시할 이미지"
3220832268
}
32269+
},
32270+
"es" : {
32271+
"stringUnit" : {
32272+
"state" : "translated",
32273+
"value" : "Imagen(es) para publicar en Mastodon"
32274+
}
3220932275
}
3221032276
}
3221132277
},
@@ -32216,6 +32282,12 @@
3221632282
"state" : "translated",
3221732283
"value" : "이미지"
3221832284
}
32285+
},
32286+
"es" : {
32287+
"stringUnit" : {
32288+
"state" : "translated",
32289+
"value" : "Imágenes"
32290+
}
3221932291
}
3222032292
}
3222132293
},
@@ -32291,6 +32363,12 @@
3229132363
"state" : "translated",
3229232364
"value" : "서버 관리자"
3229332365
}
32366+
},
32367+
"es" : {
32368+
"stringUnit" : {
32369+
"state" : "translated",
32370+
"value" : "Administrador de la Instancia"
32371+
}
3229432372
}
3229532373
}
3229632374
},
@@ -36596,6 +36674,12 @@
3659636674
"state" : "translated",
3659736675
"value" : "월간 활성 사용자 수"
3659836676
}
36677+
},
36678+
"es" : {
36679+
"stringUnit" : {
36680+
"state" : "translated",
36681+
"value" : "Usuarios Activos Mensuales"
36682+
}
3659936683
}
3660036684
}
3660136685
},
@@ -36670,6 +36754,12 @@
3667036754
"state" : "translated",
3667136755
"value" : "제공된 이미지가 없습니다."
3667236756
}
36757+
},
36758+
"es" : {
36759+
"stringUnit" : {
36760+
"state" : "translated",
36761+
"value" : "Ninguna imagen proporcionada para publicar."
36762+
}
3667336763
}
3667436764
}
3667536765
},
@@ -42510,6 +42600,12 @@
4251042600
"state" : "translated",
4251142601
"value" : "%lld개 이미지 게시됨"
4251242602
}
42603+
},
42604+
"es" : {
42605+
"stringUnit" : {
42606+
"state" : "translated",
42607+
"value" : "%lld imagen(es) publicada(s) en Mastodon"
42608+
}
4251342609
}
4251442610
}
4251542611
},
@@ -43603,6 +43699,12 @@
4360343699
"state" : "translated",
4360443700
"value" : "글과 이미지를 게시합니다."
4360543701
}
43702+
},
43703+
"es" : {
43704+
"stringUnit" : {
43705+
"state" : "translated",
43706+
"value" : "Envía una imagen o múltiples imágenes a Mastodon con Ice Cubes sin abrir la aplicación"
43707+
}
4360643708
}
4360743709
}
4360843710
},
@@ -43613,6 +43715,12 @@
4361343715
"state" : "translated",
4361443716
"value" : "글과 이미지 게시하기"
4361543717
}
43718+
},
43719+
"es" : {
43720+
"stringUnit" : {
43721+
"state" : "translated",
43722+
"value" : "Enviar imagen(es) (segundo plano)"
43723+
}
4361643724
}
4361743725
}
4361843726
},
@@ -43623,6 +43731,12 @@
4362343731
"state" : "translated",
4362443732
"value" : "글과 이미지 게시하기"
4362543733
}
43734+
},
43735+
"es" : {
43736+
"stringUnit" : {
43737+
"state" : "translated",
43738+
"value" : "Enviar imagen(es) a Mastodon"
43739+
}
4362643740
}
4362743741
}
4362843742
},
@@ -76775,6 +76889,24 @@
7677576889
"stringUnit" : {
7677676890
"state" : "translated",
7677776891
"value" : "인용 %lld회"
76892+
}
76893+
}
76894+
}
76895+
}
76896+
},
76897+
"es" : {
76898+
"variations" : {
76899+
"plural" : {
76900+
"one" : {
76901+
"stringUnit" : {
76902+
"state" : "translated",
76903+
"value" : "%lld cita"
76904+
}
76905+
},
76906+
"other" : {
76907+
"stringUnit" : {
76908+
"state" : "translated",
76909+
"value" : "%lld citas"
7677876910
}
7677976911
}
7678076912
}
@@ -77612,6 +77744,12 @@
7761277744
"state" : "translated",
7761377745
"value" : "홈에서 글 자동 새로고침"
7761477746
}
77747+
},
77748+
"es" : {
77749+
"stringUnit" : {
77750+
"state" : "translated",
77751+
"value" : "Actualizar cronología principal en tiempo real"
77752+
}
7761577753
}
7761677754
}
7761777755
},
@@ -84153,6 +84291,12 @@
8415384291
"state" : "translated",
8415484292
"value" : "긴 글 본문을 일부만 표시"
8415584293
}
84294+
},
84295+
"es" : {
84296+
"stringUnit" : {
84297+
"state" : "translated",
84298+
"value" : "Truncar contenido del estado"
84299+
}
8415684300
}
8415784301
}
8415884302
},

0 commit comments

Comments
 (0)