Correcting merge conflit

This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-12 17:57:24 -04:00
1 parent 7a099cbd5e
commit ef26f3f443
17 files changed
+17 -34

No files matched your search

+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - de_DE # Iris - de_DE
# #
@@ -2075,7 +2074,7 @@ loading = "Nachrichten für {locale} werden geladen..."
"part.line" = "Zeile {line}" "part.line" = "Zeile {line}"
"value.none" = "Keine" "value.none" = "Keine"
"value.empty" = "(leer)" "value.empty" = "(leer)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Fehlende Berechtigung: {permission}" missing-permission = "Fehlende Berechtigung: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - es_ES # Iris - es_ES
# #
@@ -2075,7 +2074,7 @@ loading = "Cargando los mensajes de {locale}..."
"part.line" = "Línea {line}" "part.line" = "Línea {line}"
"value.none" = "Ninguno" "value.none" = "Ninguno"
"value.empty" = "(vacío)" "value.empty" = "(vacío)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Falta el permiso: {permission}" missing-permission = "Falta el permiso: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - fi_FI # Iris - fi_FI
# #
@@ -2080,7 +2079,7 @@ loading = "Ladataan kielen {locale} viestejä..."
"part.line" = "Rivi {line}" "part.line" = "Rivi {line}"
"value.none" = "Ei ole" "value.none" = "Ei ole"
"value.empty" = "(tyhjä)" "value.empty" = "(tyhjä)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Puuttuva käyttöoikeus: {permission}" missing-permission = "Puuttuva käyttöoikeus: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - fr_FR # Iris - fr_FR
# #
@@ -2075,7 +2074,7 @@ loading = "Chargement des messages en {locale}..."
"part.line" = "Ligne {line}" "part.line" = "Ligne {line}"
"value.none" = "Aucune" "value.none" = "Aucune"
"value.empty" = "(vide)" "value.empty" = "(vide)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Permission manquante : {permission}" missing-permission = "Permission manquante : {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - he_IL # Iris - he_IL
# #
@@ -2080,7 +2079,7 @@ loading = "טוען הודעות עבור {locale}..."
"part.line" = "שורה {line}" "part.line" = "שורה {line}"
"value.none" = "אין" "value.none" = "אין"
"value.empty" = "(ריק)" "value.empty" = "(ריק)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "חסרה הרשאה: {permission}" missing-permission = "חסרה הרשאה: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - it_IT # Iris - it_IT
# #
@@ -2075,7 +2074,7 @@ loading = "Caricamento dei messaggi in {locale}..."
"part.line" = "Riga {line}" "part.line" = "Riga {line}"
"value.none" = "Nessuno" "value.none" = "Nessuno"
"value.empty" = "(vuoto)" "value.empty" = "(vuoto)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Permesso mancante: {permission}" missing-permission = "Permesso mancante: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - ja-JP # Iris - ja-JP
# #
@@ -2078,7 +2077,7 @@ loading = "{locale}のメッセージを読み込んでいます..."
"part.line" = "行{line}" "part.line" = "行{line}"
"value.none" = "なし" "value.none" = "なし"
"value.empty" = "(空)" "value.empty" = "(空)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "権限がありません: {permission}" missing-permission = "権限がありません: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - ko_KR # Iris - ko_KR
# #
@@ -2078,7 +2077,7 @@ loading = "{locale} 메시지를 불러오는 중..."
"part.line" = "{line}번째 줄" "part.line" = "{line}번째 줄"
"value.none" = "없음" "value.none" = "없음"
"value.empty" = "(비어 있음)" "value.empty" = "(비어 있음)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "권한이 없습니다: {permission}" missing-permission = "권한이 없습니다: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - lt_LT # Iris - lt_LT
# #
@@ -2080,7 +2079,7 @@ loading = "Įkeliami kalbos {locale} pranešimai..."
"part.line" = "Eilutė {line}" "part.line" = "Eilutė {line}"
"value.none" = "Nėra" "value.none" = "Nėra"
"value.empty" = "(tuščia)" "value.empty" = "(tuščia)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Trūksta leidimo: {permission}" missing-permission = "Trūksta leidimo: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - nl_NL # Iris - nl_NL
# #
@@ -2075,7 +2074,7 @@ loading = "Berichten voor {locale} laden..."
"part.line" = "Regel {line}" "part.line" = "Regel {line}"
"value.none" = "Geen" "value.none" = "Geen"
"value.empty" = "(leeg)" "value.empty" = "(leeg)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Ontbrekende machtiging: {permission}" missing-permission = "Ontbrekende machtiging: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - pl_PL # Iris - pl_PL
# #
@@ -2080,7 +2079,7 @@ loading = "Wczytywanie wiadomości w języku {locale}..."
"part.line" = "Linia {line}" "part.line" = "Linia {line}"
"value.none" = "Brak" "value.none" = "Brak"
"value.empty" = "(pusty)" "value.empty" = "(pusty)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Brak uprawnienia: {permission}" missing-permission = "Brak uprawnienia: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - pt_PT # Iris - pt_PT
# #
@@ -2075,7 +2074,7 @@ loading = "A carregar as mensagens de {locale}..."
"part.line" = "Linha {line}" "part.line" = "Linha {line}"
"value.none" = "Nenhum" "value.none" = "Nenhum"
"value.empty" = "(vazio)" "value.empty" = "(vazio)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Permissão em falta: {permission}" missing-permission = "Permissão em falta: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - ru_RU # Iris - ru_RU
# #
@@ -2080,7 +2079,7 @@ loading = "Загрузка сообщений для {locale}..."
"part.line" = "Строка {line}" "part.line" = "Строка {line}"
"value.none" = "Нет" "value.none" = "Нет"
"value.empty" = "(пусто)" "value.empty" = "(пусто)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Нет разрешения: {permission}" missing-permission = "Нет разрешения: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - tr_TR # Iris - tr_TR
# #
@@ -2080,7 +2079,7 @@ loading = "{locale} mesajları yükleniyor..."
"part.line" = "Satır {line}" "part.line" = "Satır {line}"
"value.none" = "Yok" "value.none" = "Yok"
"value.empty" = "(boş)" "value.empty" = "(boş)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Eksik izin: {permission}" missing-permission = "Eksik izin: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - vi_VI # Iris - vi_VI
# #
@@ -2078,7 +2077,7 @@ loading = "Đang tải tin nhắn cho {locale}..."
"part.line" = "Dòng {line}" "part.line" = "Dòng {line}"
"value.none" = "Không có" "value.none" = "Không có"
"value.empty" = "(trống)" "value.empty" = "(trống)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "Thiếu quyền: {permission}" missing-permission = "Thiếu quyền: {permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - zh_CN # Iris - zh_CN
# #
@@ -2078,7 +2077,7 @@ loading = "正在加载 {locale} 的消息..."
"part.line" = "第 {line} 行" "part.line" = "第 {line} 行"
"value.none" = "无" "value.none" = "无"
"value.empty" = "(空)" "value.empty" = "(空)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "缺少权限:{permission}" missing-permission = "缺少权限:{permission}"
+1 -2
View File
@@ -1,4 +1,3 @@
"language.editor.title" = "{plugin} › {section}"
# === Iris language guide === # === Iris language guide ===
# Iris - zh_TW # Iris - zh_TW
# #
@@ -2078,7 +2077,7 @@ loading = "正在載入 {locale} 的訊息..."
"part.line" = "第 {line} 行" "part.line" = "第 {line} 行"
"value.none" = "無" "value.none" = "無"
"value.empty" = "(空)" "value.empty" = "(空)"
title = "{plugin} / {section}" title = "{plugin} › {section}"
[debug.error] [debug.error]
missing-permission = "缺少權限:{permission}" missing-permission = "缺少權限:{permission}"