diff options
| author | Henry Jameson <me@hjkos.com> | 2018-09-25 14:48:02 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-09-25 14:48:02 +0300 |
| commit | 6165b7366a9f499fe83fd194f8e9f4742e37e9f1 (patch) | |
| tree | 484fc1e5fc989d58a912e84b02b209115d16f27b /src | |
| parent | 455cd0d0289c7633aca22ad6e8737d449e361fce (diff) | |
| parent | 9d0bbe37e668150e897d505134d4ac7686a59eea (diff) | |
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop:
i think it's due to my shitty js-to-json regex
Diffstat (limited to 'src')
| -rw-r--r-- | src/i18n/en.json | 2 | ||||
| -rw-r--r-- | src/i18n/fr.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index cd87240b..9d1ef57f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -115,7 +115,7 @@ "import_followers_from_a_csv_file": "Import follows from a csv file", "import_theme": "Load preset", "inputRadius": "Input fields", - "instance_default: (default": "{value})", + "instance_default": "(default: {value})", "instance_default_simple" : "(default)", "interfaceLanguage": "Interface language", "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index b76db32a..3f3550f8 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -114,7 +114,7 @@ "import_followers_from_a_csv_file": "Importer des abonnements depuis un fichier csv", "import_theme": "Charger le thème", "inputRadius": "Champs de texte", - "instance_default: (default": "{value})", + "instance_default": "(default: {value})", "instance_default_simple" : "(default)", "interfaceLanguage": "Langue de l'interface", "invalid_theme_imported": "Le fichier sélectionné n'est pas un thème Pleroma pris en charge. Aucun changement n'a été apporté à votre thème.", |