chore: resolve merge conflicts

Dimillian · Dimillian · commit d9db067294fe · 2025-12-16T16:48:49.000+01:00
diff --git a/IceCubesApp/Resources/Localization/Localizable.xcstrings b/IceCubesApp/Resources/Localization/Localizable.xcstrings
@@ -908,6 +908,12 @@
             "state" : "translated",
             "value" : "%lld."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%lld"
+          }
         }
       }
     },
@@ -20733,6 +20739,12 @@
             "state" : "translated",
             "value" : "첨부될 이미지에 대한 설명"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Texto ALT para la imagen"
+          }
         }
       }
     },
@@ -20807,6 +20819,12 @@
             "state" : "translated",
             "value" : "API 버전"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Versiones de la API"
+          }
         }
       }
     },
@@ -21087,6 +21105,12 @@
             "state" : "translated",
             "value" : "부스트"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Comportamiento del Botón de Boost"
+          }
         }
       }
     },
@@ -21097,6 +21121,12 @@
             "state" : "translated",
             "value" : "본문"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Leyenda"
+          }
         }
       }
     },
@@ -21107,6 +21137,12 @@
             "state" : "translated",
             "value" : "글 본문"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Leyenda para tu publicación"
+          }
         }
       }
     },
@@ -22942,6 +22978,12 @@
             "state" : "translated",
             "value" : "게시될 이미지에 대한 설명 (순서대로)"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Descripciones (ALT) para tus imágenes en orden"
+          }
         }
       }
     },
@@ -27327,6 +27369,12 @@
             "state" : "translated",
             "value" : "오류: %@"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Error: %@"
+          }
         }
       }
     },
@@ -32128,6 +32176,12 @@
             "state" : "translated",
             "value" : "이미지 설명"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Descripción de la imagen"
+          }
         }
       }
     },
@@ -32138,6 +32192,12 @@
             "state" : "translated",
             "value" : "이미지 설명"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Descripciones de las imágenes"
+          }
         }
       }
     },
@@ -32206,6 +32266,12 @@
             "state" : "translated",
             "value" : "게시할 이미지"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Imagen(es) para publicar en Mastodon"
+          }
         }
       }
     },
@@ -32216,6 +32282,12 @@
             "state" : "translated",
             "value" : "이미지"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Imágenes"
+          }
         }
       }
     },
@@ -32291,6 +32363,12 @@
             "state" : "translated",
             "value" : "서버 관리자"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Administrador de la Instancia"
+          }
         }
       }
     },
@@ -36596,6 +36674,12 @@
             "state" : "translated",
             "value" : "월간 활성 사용자 수"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Usuarios Activos Mensuales"
+          }
         }
       }
     },
@@ -36670,6 +36754,12 @@
             "state" : "translated",
             "value" : "제공된 이미지가 없습니다."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ninguna imagen proporcionada para publicar."
+          }
         }
       }
     },
@@ -42510,6 +42600,12 @@
             "state" : "translated",
             "value" : "%lld개 이미지 게시됨"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%lld imagen(es) publicada(s) en Mastodon"
+          }
         }
       }
     },
@@ -43603,6 +43699,12 @@
             "state" : "translated",
             "value" : "글과 이미지를 게시합니다."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Envía una imagen o múltiples imágenes a Mastodon con Ice Cubes sin abrir la aplicación"
+          }
         }
       }
     },
@@ -43613,6 +43715,12 @@
             "state" : "translated",
             "value" : "글과 이미지 게시하기"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enviar imagen(es) (segundo plano)"
+          }
         }
       }
     },
@@ -43623,6 +43731,12 @@
             "state" : "translated",
             "value" : "글과 이미지 게시하기"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enviar imagen(es) a Mastodon"
+          }
         }
       }
     },
@@ -76775,6 +76889,24 @@
                 "stringUnit" : {
                   "state" : "translated",
                   "value" : "인용 %lld회"
+          }
+          }
+          }
+          }
+        },
+        "es" : {
+          "variations" : {
+            "plural" : {
+              "one" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "%lld cita"
+                }
+              },
+              "other" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "%lld citas"
                 }
               }
             }
@@ -77612,6 +77744,12 @@
             "state" : "translated",
             "value" : "홈에서 글 자동 새로고침"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Actualizar cronología principal en tiempo real"
+          }
         }
       }
     },
@@ -84153,6 +84291,12 @@
             "state" : "translated",
             "value" : "긴 글 본문을 일부만 표시"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Truncar contenido del estado"
+          }
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -908,6 +908,12 @@`
`908`	`908`	`"state" : "translated",`
`909`	`909`	`"value" : "%lld."`
`910`	`910`	`}`
	`911`	`+ },`
	`912`	`+ "es" : {`
	`913`	`+ "stringUnit" : {`
	`914`	`+ "state" : "translated",`
	`915`	`+ "value" : "%lld"`
	`916`	`+ }`
`911`	`917`	`}`
`912`	`918`	`}`
`913`	`919`	`},`
`@@ -20733,6 +20739,12 @@`
`20733`	`20739`	`"state" : "translated",`
`20734`	`20740`	`"value" : "첨부될 이미지에 대한 설명"`
`20735`	`20741`	`}`
	`20742`	`+ },`
	`20743`	`+ "es" : {`
	`20744`	`+ "stringUnit" : {`
	`20745`	`+ "state" : "translated",`
	`20746`	`+ "value" : "Texto ALT para la imagen"`
	`20747`	`+ }`
`20736`	`20748`	`}`
`20737`	`20749`	`}`
`20738`	`20750`	`},`
`@@ -20807,6 +20819,12 @@`
`20807`	`20819`	`"state" : "translated",`
`20808`	`20820`	`"value" : "API 버전"`
`20809`	`20821`	`}`
	`20822`	`+ },`
	`20823`	`+ "es" : {`
	`20824`	`+ "stringUnit" : {`
	`20825`	`+ "state" : "translated",`
	`20826`	`+ "value" : "Versiones de la API"`
	`20827`	`+ }`
`20810`	`20828`	`}`
`20811`	`20829`	`}`
`20812`	`20830`	`},`
`@@ -21087,6 +21105,12 @@`
`21087`	`21105`	`"state" : "translated",`
`21088`	`21106`	`"value" : "부스트"`
`21089`	`21107`	`}`
	`21108`	`+ },`
	`21109`	`+ "es" : {`
	`21110`	`+ "stringUnit" : {`
	`21111`	`+ "state" : "translated",`
	`21112`	`+ "value" : "Comportamiento del Botón de Boost"`
	`21113`	`+ }`
`21090`	`21114`	`}`
`21091`	`21115`	`}`
`21092`	`21116`	`},`
`@@ -21097,6 +21121,12 @@`
`21097`	`21121`	`"state" : "translated",`
`21098`	`21122`	`"value" : "본문"`
`21099`	`21123`	`}`
	`21124`	`+ },`
	`21125`	`+ "es" : {`
	`21126`	`+ "stringUnit" : {`
	`21127`	`+ "state" : "translated",`
	`21128`	`+ "value" : "Leyenda"`
	`21129`	`+ }`
`21100`	`21130`	`}`
`21101`	`21131`	`}`
`21102`	`21132`	`},`
`@@ -21107,6 +21137,12 @@`
`21107`	`21137`	`"state" : "translated",`
`21108`	`21138`	`"value" : "글 본문"`
`21109`	`21139`	`}`
	`21140`	`+ },`
	`21141`	`+ "es" : {`
	`21142`	`+ "stringUnit" : {`
	`21143`	`+ "state" : "translated",`
	`21144`	`+ "value" : "Leyenda para tu publicación"`
	`21145`	`+ }`
`21110`	`21146`	`}`
`21111`	`21147`	`}`
`21112`	`21148`	`},`
`@@ -22942,6 +22978,12 @@`
`22942`	`22978`	`"state" : "translated",`
`22943`	`22979`	`"value" : "게시될 이미지에 대한 설명 (순서대로)"`
`22944`	`22980`	`}`
	`22981`	`+ },`
	`22982`	`+ "es" : {`
	`22983`	`+ "stringUnit" : {`
	`22984`	`+ "state" : "translated",`
	`22985`	`+ "value" : "Descripciones (ALT) para tus imágenes en orden"`
	`22986`	`+ }`
`22945`	`22987`	`}`
`22946`	`22988`	`}`
`22947`	`22989`	`},`
`@@ -27327,6 +27369,12 @@`
`27327`	`27369`	`"state" : "translated",`
`27328`	`27370`	`"value" : "오류: %@"`
`27329`	`27371`	`}`
	`27372`	`+ },`
	`27373`	`+ "es" : {`
	`27374`	`+ "stringUnit" : {`
	`27375`	`+ "state" : "translated",`
	`27376`	`+ "value" : "Error: %@"`
	`27377`	`+ }`
`27330`	`27378`	`}`
`27331`	`27379`	`}`
`27332`	`27380`	`},`
`@@ -32128,6 +32176,12 @@`
`32128`	`32176`	`"state" : "translated",`
`32129`	`32177`	`"value" : "이미지 설명"`
`32130`	`32178`	`}`
	`32179`	`+ },`
	`32180`	`+ "es" : {`
	`32181`	`+ "stringUnit" : {`
	`32182`	`+ "state" : "translated",`
	`32183`	`+ "value" : "Descripción de la imagen"`
	`32184`	`+ }`
`32131`	`32185`	`}`
`32132`	`32186`	`}`
`32133`	`32187`	`},`
`@@ -32138,6 +32192,12 @@`
`32138`	`32192`	`"state" : "translated",`
`32139`	`32193`	`"value" : "이미지 설명"`
`32140`	`32194`	`}`
	`32195`	`+ },`
	`32196`	`+ "es" : {`
	`32197`	`+ "stringUnit" : {`
	`32198`	`+ "state" : "translated",`
	`32199`	`+ "value" : "Descripciones de las imágenes"`
	`32200`	`+ }`
`32141`	`32201`	`}`
`32142`	`32202`	`}`
`32143`	`32203`	`},`
`@@ -32206,6 +32266,12 @@`
`32206`	`32266`	`"state" : "translated",`
`32207`	`32267`	`"value" : "게시할 이미지"`
`32208`	`32268`	`}`
	`32269`	`+ },`
	`32270`	`+ "es" : {`
	`32271`	`+ "stringUnit" : {`
	`32272`	`+ "state" : "translated",`
	`32273`	`+ "value" : "Imagen(es) para publicar en Mastodon"`
	`32274`	`+ }`
`32209`	`32275`	`}`
`32210`	`32276`	`}`
`32211`	`32277`	`},`
`@@ -32216,6 +32282,12 @@`
`32216`	`32282`	`"state" : "translated",`
`32217`	`32283`	`"value" : "이미지"`
`32218`	`32284`	`}`
	`32285`	`+ },`
	`32286`	`+ "es" : {`
	`32287`	`+ "stringUnit" : {`
	`32288`	`+ "state" : "translated",`
	`32289`	`+ "value" : "Imágenes"`
	`32290`	`+ }`
`32219`	`32291`	`}`
`32220`	`32292`	`}`
`32221`	`32293`	`},`
`@@ -32291,6 +32363,12 @@`
`32291`	`32363`	`"state" : "translated",`
`32292`	`32364`	`"value" : "서버 관리자"`
`32293`	`32365`	`}`
	`32366`	`+ },`
	`32367`	`+ "es" : {`
	`32368`	`+ "stringUnit" : {`
	`32369`	`+ "state" : "translated",`
	`32370`	`+ "value" : "Administrador de la Instancia"`
	`32371`	`+ }`
`32294`	`32372`	`}`
`32295`	`32373`	`}`
`32296`	`32374`	`},`
`@@ -36596,6 +36674,12 @@`
`36596`	`36674`	`"state" : "translated",`
`36597`	`36675`	`"value" : "월간 활성 사용자 수"`
`36598`	`36676`	`}`
	`36677`	`+ },`
	`36678`	`+ "es" : {`
	`36679`	`+ "stringUnit" : {`
	`36680`	`+ "state" : "translated",`
	`36681`	`+ "value" : "Usuarios Activos Mensuales"`
	`36682`	`+ }`
`36599`	`36683`	`}`
`36600`	`36684`	`}`
`36601`	`36685`	`},`
`@@ -36670,6 +36754,12 @@`
`36670`	`36754`	`"state" : "translated",`
`36671`	`36755`	`"value" : "제공된 이미지가 없습니다."`
`36672`	`36756`	`}`
	`36757`	`+ },`
	`36758`	`+ "es" : {`
	`36759`	`+ "stringUnit" : {`
	`36760`	`+ "state" : "translated",`
	`36761`	`+ "value" : "Ninguna imagen proporcionada para publicar."`
	`36762`	`+ }`
`36673`	`36763`	`}`
`36674`	`36764`	`}`
`36675`	`36765`	`},`
`@@ -42510,6 +42600,12 @@`
`42510`	`42600`	`"state" : "translated",`
`42511`	`42601`	`"value" : "%lld개 이미지 게시됨"`
`42512`	`42602`	`}`
	`42603`	`+ },`
	`42604`	`+ "es" : {`
	`42605`	`+ "stringUnit" : {`
	`42606`	`+ "state" : "translated",`
	`42607`	`+ "value" : "%lld imagen(es) publicada(s) en Mastodon"`
	`42608`	`+ }`
`42513`	`42609`	`}`
`42514`	`42610`	`}`
`42515`	`42611`	`},`
`@@ -43603,6 +43699,12 @@`
`43603`	`43699`	`"state" : "translated",`
`43604`	`43700`	`"value" : "글과 이미지를 게시합니다."`
`43605`	`43701`	`}`
	`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`	`+ }`
`43606`	`43708`	`}`
`43607`	`43709`	`}`
`43608`	`43710`	`},`
`@@ -43613,6 +43715,12 @@`
`43613`	`43715`	`"state" : "translated",`
`43614`	`43716`	`"value" : "글과 이미지 게시하기"`
`43615`	`43717`	`}`
	`43718`	`+ },`
	`43719`	`+ "es" : {`
	`43720`	`+ "stringUnit" : {`
	`43721`	`+ "state" : "translated",`
	`43722`	`+ "value" : "Enviar imagen(es) (segundo plano)"`
	`43723`	`+ }`
`43616`	`43724`	`}`
`43617`	`43725`	`}`
`43618`	`43726`	`},`
`@@ -43623,6 +43731,12 @@`
`43623`	`43731`	`"state" : "translated",`
`43624`	`43732`	`"value" : "글과 이미지 게시하기"`
`43625`	`43733`	`}`
	`43734`	`+ },`
	`43735`	`+ "es" : {`
	`43736`	`+ "stringUnit" : {`
	`43737`	`+ "state" : "translated",`
	`43738`	`+ "value" : "Enviar imagen(es) a Mastodon"`
	`43739`	`+ }`
`43626`	`43740`	`}`
`43627`	`43741`	`}`
`43628`	`43742`	`},`
`@@ -76775,6 +76889,24 @@`
`76775`	`76889`	`"stringUnit" : {`
`76776`	`76890`	`"state" : "translated",`
`76777`	`76891`	`"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"`
`76778`	`76910`	`}`
`76779`	`76911`	`}`
`76780`	`76912`	`}`
`@@ -77612,6 +77744,12 @@`
`77612`	`77744`	`"state" : "translated",`
`77613`	`77745`	`"value" : "홈에서 글 자동 새로고침"`
`77614`	`77746`	`}`
	`77747`	`+ },`
	`77748`	`+ "es" : {`
	`77749`	`+ "stringUnit" : {`
	`77750`	`+ "state" : "translated",`
	`77751`	`+ "value" : "Actualizar cronología principal en tiempo real"`
	`77752`	`+ }`
`77615`	`77753`	`}`
`77616`	`77754`	`}`
`77617`	`77755`	`},`
`@@ -84153,6 +84291,12 @@`
`84153`	`84291`	`"state" : "translated",`
`84154`	`84292`	`"value" : "긴 글 본문을 일부만 표시"`
`84155`	`84293`	`}`
	`84294`	`+ },`
	`84295`	`+ "es" : {`
	`84296`	`+ "stringUnit" : {`
	`84297`	`+ "state" : "translated",`
	`84298`	`+ "value" : "Truncar contenido del estado"`
	`84299`	`+ }`
`84156`	`84300`	`}`
`84157`	`84301`	`}`
`84158`	`84302`	`},`