Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences

Browse source 
* upstream/develop:
  i think it's due to my shitty js-to-json regex
This commit is contained in:
Henry Jameson 2018-09-25 14:48:02 +03:00
commit 6165b7366a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/i18n/en.json
View file

@ -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.",

2
src/i18n/fr.json
View file

@ -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.",