YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge resolved

Browse source
This commit is contained in:
Kay0u 2020-03-28 00:04:32 +01:00
parent 9b698e669d
commit 5ded6ecbe6
No known key found for this signature in database
GPG key ID: 7FF262C033518333
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
locales/oc.json
View file

@ -439,13 +439,8 @@
"log_service_regen_conf": "Regenerar la configuracion sistèma de « {} »", "log_service_regen_conf": "Regenerar la configuracion sistèma de « {} »",
"log_user_create": "Ajustar l’utilizaire « {} »", "log_user_create": "Ajustar l’utilizaire « {} »",
"log_user_delete": "Levar l’utilizaire « {} »", "log_user_delete": "Levar l’utilizaire « {} »",
<<<<<<< HEAD
"log_user_update": "Actualizar las informacions a l’utilizaire « {} »",
"log_tools_maindomain": "Far venir « {} » lo domeni màger",
=======
"log_user_update": "Actualizar las informacions de l’utilizaire « {} »", "log_user_update": "Actualizar las informacions de l’utilizaire « {} »",
"log_domain_main_domain": "Far venir « {} » lo domeni màger", "log_tools_maindomain": "Far venir « {} » lo domeni màger",
>>>>>>> b968dff2... Translated using Weblate (Occitan)
"log_tools_migrations_migrate_forward": "Migrar", "log_tools_migrations_migrate_forward": "Migrar",
"log_tools_migrations_migrate_backward": "Tornar en arrièr", "log_tools_migrations_migrate_backward": "Tornar en arrièr",
"log_tools_postinstall": "Realizar la post installacion del servidor YunoHost", "log_tools_postinstall": "Realizar la post installacion del servidor YunoHost",