forked from IrisShaders/Iris
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/trunk' into trunk
# Conflicts: # src/main/resources/assets/iris/lang/de_de.json # src/main/resources/assets/iris/lang/es_es.json # src/main/resources/assets/iris/lang/fr_fr.json # src/main/resources/assets/iris/lang/it_it.json # src/main/resources/assets/iris/lang/ja_jp.json # src/main/resources/assets/iris/lang/nl_nl.json # src/main/resources/assets/iris/lang/pr_pt.json # src/main/resources/assets/iris/lang/ru_ru.json
- Loading branch information
Showing
8 changed files
with
96 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| { | ||
| "iris.shaders.reloaded": "Shaders recargados!", | ||
| "iris.keybind.reload": "Recargar Shaders", | ||
| "iris.shaders.reloaded.failure": "¡Falló en la recarga de los Shaders! Razón: %s", | ||
| "iris.shaders.reloaded.failure": "¡Error al recargar los Shaders! Razón: %s", | ||
|
|
||
| "options.iris.apply": "Aplíquese", | ||
| "options.iris.refresh": "Refrescar", | ||
| "options.iris.openShaderPackFolder": "Abrir la carpeta Shader Pack...", | ||
| "options.iris.refreshShaderPacks": "Actualizar Shader Packs", | ||
| "options.iris.shaderPackSelection.addedPack": "Añadidos Shader Pack \"%s\"", | ||
| "options.iris.apply": "Aplicar", | ||
| "options.iris.refresh": "Recargar", | ||
| "options.iris.openShaderPackFolder": "Abrir carpeta de Shader Packs...", | ||
| "options.iris.refreshShaderPacks": "Recargar Shaders", | ||
| "options.iris.shaderPackSelection": "Shader Packs...", | ||
| "options.iris.shaderPackSelection.title": "Shader Packs", | ||
| "options.iris.shaderPackSelection.addedPack": "Añadido el Shader Pack \"%s\"", | ||
| "options.iris.shaderPackSelection.addedPacks": "Añadidos %s Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAdd": "Los archivos no eran Shader Packs válidos", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" no es un Shader Pack válido", | ||
| "options.iris.shaderPackSelection.copyError": "No se ha podido añadir el Shader Pack \"%s\"", | ||
| "options.iris.shaderPackSelection.copyErrorAlreadyExists": "¡\"%s\" ya está en tu carpeta de Shader Packs!", | ||
| "options.iris.shaders.disabled": "Shaders: Desactivados", | ||
| "options.iris.shaders.enabled": "Shaders: Activados", | ||
|
|
||
| "pack.iris.select.title": "Seleccione", | ||
| "pack.iris.list.label": "+ Arrastrar y soltar Shader Packs para añadir" | ||
| "pack.iris.select.title": "Seleccionar", | ||
| "pack.iris.list.label": "+ Arrastra Shader Packs aquí para añadirlos" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| { | ||
| "iris.shaders.reloaded": "Shaders Rechargés!", | ||
| "iris.keybind.reload": "Recharger Les Shaders", | ||
| "iris.shaders.reloaded.failure": "Échec lors du rechargement des Shaders! Raison: %s", | ||
| "iris.shaders.reloaded": "Shaders rechargés !", | ||
| "iris.keybind.reload": "Recharger les shaders", | ||
| "iris.shaders.reloaded.failure": "Échec lors du rechargement des shaders ! Raison : %s", | ||
|
|
||
| "options.iris.apply": "Appliquer", | ||
| "options.iris.refresh": "Rafraichir", | ||
| "options.iris.openShaderPackFolder": "Ouvrir le dossier des Shader Packs...", | ||
| "options.iris.refreshShaderPacks": "Refresh Shader Packs", | ||
| "options.iris.shaderPackSelection.addedPack": "Shader Pack ajouté : \"%s\"", | ||
| "options.iris.shaderPackSelection.addedPacks": "Ajouté %s Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAdd": "Les fichiers ne sont pas des Shader Packs valides", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" n'est pas un Shader Pack valide", | ||
| "options.iris.shaderPackSelection.copyError": "Erreur lors que de l'ajout de Shader Pack \"%s\"", | ||
| "options.iris.shaderPackSelection.copyErrorAlreadyExists": "\"%s\" est déja dans votre dossier de Shader Packs !", | ||
| "options.iris.openShaderPackFolder": "Ouvrir le dossier des shader packs...", | ||
| "options.iris.refreshShaderPacks": "Rafraichir les packs de shader", | ||
| "options.iris.shaderPackSelection": "Shader Packs...", | ||
| "options.iris.shaderPackSelection.title": "Shader Packs", | ||
| "options.iris.shaderPackSelection.addedPack": "Shader pack ajouté : \"%s\"", | ||
| "options.iris.shaderPackSelection.addedPacks": "%s shader packs ajoutés", | ||
| "options.iris.shaderPackSelection.failedAdd": "Les fichiers ne sont pas des shader packs valides", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" n'est pas un shader pack valide", | ||
| "options.iris.shaderPackSelection.copyError": "Erreur lors de l'ajout du shader pack \"%s\"", | ||
| "options.iris.shaderPackSelection.copyErrorAlreadyExists": "\"%s\" est déjà dans votre dossier de shader packs !", | ||
| "options.iris.shaders.disabled": "Shaders : Désactivés", | ||
| "options.iris.shaders.enabled": "Shaders : Activés", | ||
|
|
||
| "pack.iris.select.title": "Sélectionner", | ||
| "pack.iris.list.label": "+ Faites glisser vos Shader Packs pour les ajouter" | ||
| } | ||
| "pack.iris.list.label": "+ Faites glisser vos shader packs pour les ajouter" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| { | ||
| "iris.shaders.reloaded": "Shaders opgeladen!", | ||
| "iris.keybind.reload": "Herladen Shaders", | ||
| "iris.shaders.reloaded.failure": "Mislukt om Shaders te herladen! Reden: %s", | ||
|
|
||
| "options.iris.apply": "Solliciteer", | ||
| "options.iris.refresh": "Vernieuwen", | ||
| "options.iris.openShaderPackFolder": "Open de map Shader Pack...", | ||
| "options.iris.refreshShaderPacks": "Vernieuw Shader Pack", | ||
| "options.iris.shaderPackSelection.addedPack": "Shader Pack toegevoegd \"%s\"", | ||
| "options.iris.shaderPackSelection.addedPacks": "Toegevoegd %s Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAdd": "Bestanden waren niet geldig Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" is geen geldig Shader Pack", | ||
| "options.iris.shaderPackSelection.copyError": "Kon geen Shader Pack toevoegen \"%s\"", | ||
| "iris.shaders.reloaded": "Shaders herladen!", | ||
| "iris.keybind.reload": "Herlaad Shaders", | ||
| "iris.shaders.reloaded.failure": "Shaders herladen is mislukt! Reden: %s", | ||
|
|
||
| "options.iris.apply": "Toepassen", | ||
| "options.iris.refresh": "Verversen", | ||
| "options.iris.openShaderPackFolder": "Open de Shader Pack map...", | ||
| "options.iris.refreshShaderPacks": "Ververs Shader Pack", | ||
| "options.iris.shaderPackSelection": "Shader Packs...", | ||
| "options.iris.shaderPackSelection.title": "Shader Packs", | ||
| "options.iris.shaderPackSelection.addedPack": "Shader Pack \"%s\" toegevoegd", | ||
| "options.iris.shaderPackSelection.addedPacks": "%s Shader Packs toegevoegd", | ||
| "options.iris.shaderPackSelection.failedAdd": "Bestanden zijn geen geldige Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" is geen geldige Shader Pack", | ||
| "options.iris.shaderPackSelection.copyError": "Kon Shader Pack \"%s\" niet toevoegen", | ||
| "options.iris.shaderPackSelection.copyErrorAlreadyExists": "\"%s\" staat al in uw Shader Packs map!", | ||
| "options.iris.shaders.disabled": "Shaders: Uitgeschakeld", | ||
| "options.iris.shaders.enabled": "Shaders: Ingeschakeld", | ||
|
|
||
| "pack.iris.select.title": "Selecteer", | ||
| "pack.iris.list.label": "+ Shader Packs slepen en neerzetten om toe te voegen" | ||
| } | ||
| "pack.iris.select.title": "Selecteren", | ||
| "pack.iris.list.label": "+ Voeg Shader Packs toe door te slepen en neer te zetten" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| { | ||
| "iris.shaders.reloaded": "Шейдеры перезаряжены!", | ||
| "iris.keybind.reload": "Шейдеры перезарядки", | ||
| "iris.shaders.reloaded.failure": "Ошибка при Перезагрузке шейдеров! Причина: %s", | ||
|
|
||
| "iris.shaders.reloaded": "Шейдеры перезагружены!", | ||
| "iris.keybind.reload": "Перезагрузить шейдеры", | ||
| "iris.shaders.reloaded.failure": "Ошибка при перезагрузке шейдеров! Причина: %s", | ||
| "options.iris.apply": "Применить", | ||
| "options.iris.refresh": "Обновить", | ||
| "options.iris.openShaderPackFolder": "Откройте папку Shader Pack...", | ||
| "options.iris.refreshShaderPacks": "Обновление Shader Packs", | ||
| "options.iris.shaderPackSelection.addedPack": "Добавлен Shader Pack \"%s\"", | ||
| "options.iris.shaderPackSelection.addedPacks": "Добавлен %s Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAdd": "Файлы не являются действительными Shader Packs", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" не является действительным Shader Pack", | ||
| "options.iris.shaderPackSelection.copyError": "Не удалось добавить Shader Pack \"%s\"", | ||
| "options.iris.shaderPackSelection.copyErrorAlreadyExists": "\"%s\" уже находится в вашей папке Shader Packs!", | ||
|
|
||
| "options.iris.openShaderPackFolder": "Откройте папку c шейдером...", | ||
| "options.iris.refreshShaderPacks": "Обновить список шейдеров", | ||
| "options.iris.shaderPackSelection": "Шейдеры...", | ||
| "options.iris.shaderPackSelection.title": "Шейдеры", | ||
| "options.iris.shaderPackSelection.addedPack": "Добавлен шейдер \"%s\"", | ||
| "options.iris.shaderPackSelection.addedPacks": "Добавлено %s шейдеров", | ||
| "options.iris.shaderPackSelection.failedAdd": "Файлы не являются шейдерами", | ||
| "options.iris.shaderPackSelection.failedAddSingle": "\"%s\" не является шейдером", | ||
| "options.iris.shaderPackSelection.copyError": "Не удалось добавить шейдер \"%s\"", | ||
| "options.iris.shaderPackSelection.copyErrorAlreadyExists": "\"%s\" уже находится в вашей папке с шейдерами!", | ||
| "options.iris.shaders.disabled": "Шейдеры: Выключены", | ||
| "options.iris.shaders.enabled": "Шейдеры: Включены", | ||
|
|
||
| "pack.iris.select.title": "Выберите", | ||
| "pack.iris.list.label": "+ Перетаскивание Shader Pack для добавления" | ||
| } | ||
| "pack.iris.list.label": "+ Перетащите шейдер для добавления" | ||
| } |