Commit 4632618c authored by Bernard Sfez's avatar Bernard Sfez
Browse files

[TRA] Adding missing translations for French and Hebrew at Admin->Users->Import

parent f0c99b99
......@@ -12132,7 +12132,7 @@ $lang_current = array(
"Show related videos (shown by default)" => "Afficher les vidéos en relation (affichées par défaut)",
"Background" => "Arrière-plan",
// "Toolbar background color. Use an HTML color code" => "Toolbar background color. Use an HTML color code",
"Example" => "Example",
"Example" => "Exemple",
"HTML color code, e.g. ffffff" => "Code couleur HTML, par exemple ffffff",
// "Toolbar border colors. Use an HTML color code" => "Toolbar border colors. Use an HTML color code",
"Plugin YouTube error: the movie parameter is empty" => "Erreur plugiciel YouTube : le paramètre film est vide",
......@@ -16712,18 +16712,18 @@ $lang_current = array(
"%0 days ago" => "il y a %0 jours",
// "Current Login" => "Current Login",
"You do not have permission to edit this user" => "Vous n'avez pas le droit de modifier cet utilisateur",
// "Your file should contain in the first row (first entry) the following fields" => "Your file should contain in the first row (first entry) the following fields",
"Your file should contain in the first row (first entry) the following fields" => "Votre fichier doit contenir dans la première ligne (première entrée) les champs suivants",
// "user1,pass1,email1,group1,group1" => "user1,pass1,email1,group1,group1",
// "user2,pass2,email2,\"group1,group2\",group1" => "user2,pass2,email2,\"group1,group2\",group1",
// "Only login, password, email are mandatory. Use an empty password for automatic password generation. Use same login and email if the login use email. Groups are separated by comma. With group name with comma, double the comma" => "Only login, password, email are mandatory. Use an empty password for automatic password generation. Use same login and email if the login use email. Groups are separated by comma. With group name with comma, double the comma",
// "On most server with default setting importing 250 users should be fine. If you have a long list you can split it or change the server settings to allow longer execution time" => "On most server with default setting importing 250 users should be fine. If you have a long list you can split it or change the server settings to allow longer execution time",
// "Please also note that the data should match your Tiki setting. IE: if special characters or space are not permit for the username of your Tiki then your data in the CSV file for username should not contain any" => "Please also note that the data should match your Tiki setting. IE: if special characters or space are not permit for the username of your Tiki then your data in the CSV file for username should not contain any",
// "Existing Users" => "Existing Users",
"Only login, password, email are mandatory. Use an empty password for automatic password generation. Use same login and email if the login use email. Groups are separated by comma. With group name with comma, double the comma" => "Seuls l'identifiant, le mot de passe et l'email sont obligatoires. Utilisez un mot de passe vide pour la génération automatique de mot de passe. Utilisez les mêmes valeurs si l'identifiant est l'e-mail de l'utilisateur. Séparer les groupes par des virgules. Si vous avez un nom du groupe contenant une virgule, doublez la virgule",
"On most server with default setting importing 250 users should be fine. If you have a long list you can split it or change the server settings to allow longer execution time" => "Sur la plupart des serveurs avec les paramètres par défaut, l'importation de 250 utilisateurs doit être possible. Si vous avez une longue liste d'utilisateur, vous pouvez la diviser ou modifier les paramètres du serveur pour permettre un temps d'exécution plus long",
"Please also note that the data should match your Tiki setting. IE: if special characters or space are not permit for the username of your Tiki then your data in the CSV file for username should not contain any" => "Veuillez également noter que les données doivent correspondre à vos paramètres Tiki. Exemple: si les caractères spéciaux ou les espaces ne sont pas autorisés pour le nom d'utilisateur de votre Tiki, vos données dans le fichier CSV pour le nom d'utilisateur ne peuvent en contenir",
"Existing Users" => "Utilisateurs existants",
"Don't overwrite" => "Ne pas écraser",
// "Overwrite groups" => "Overwrite groups",
"Overwrite groups" => "Remplacer les groupes",
"Create groups" => "Créer des groupes",
// "The user must change his or her password the first time they log in" => "The user must change his or her password the first time they log in",
// "You can export users of a group by clicking on that group at <a href=\"tiki-admingroups.php\" class=\"alert-link\">admin->groups</a>" => "You can export users of a group by clicking on that group at <a href=\"tiki-admingroups.php\" class=\"alert-link\">admin->groups</a>",
"The user must change his or her password the first time they log in" => "L'utilisateur doit changer son mot de passe lors de sa première connexion",
"You can export users of a group by clicking on that group at <a href=\"tiki-admingroups.php\" class=\"alert-link\">admin->groups</a>" => "Vous pouvez exporter les utilisateurs d'un groupe en cliquant sur ce groupe dans <a href=\"tiki-admingroups.php\" class=\"alert-link\">Réglages->groupes</a>",
"Temporary Users" => "Utilisateurs temporaires",
// "Invite new temporary user(s)" => "Invite new temporary user(s)",
"Token Access Feature Dependency" => "Dépendance de la fonctionnalité d'accès aux jetons",
......@@ -1757,7 +1757,7 @@ $lang_current = array(
// "Pipe-separated options for totals for each column which are set in the %0 parameter" => "Pipe-separated options for totals for each column which are set in the %0 parameter",
// "overrides the default number format set in %0" => "overrides the default number format set in %0",
// "column will be excluded from total calculations set in the %0\n parameter. Remember to include any columns that will be added for row totals set in the %0\n parameter" => "column will be excluded from total calculations set in the %0\n parameter. Remember to include any columns that will be added for row totals set in the %0\n parameter",
// "Example" => "Example",
"Example" => "דוגמא",
// "Page totals" => "Page totals",
// "Please install Faker package" => "Please install Faker package",
// "Object \"%0\" of type \"%1\" not found" => "Object \"%0\" of type \"%1\" not found",
......@@ -16696,19 +16696,19 @@ $lang_current = array(
"Email confirmed" => "אימייל אושר",
"%0 days ago" => "לפני %0 ימים",
"Current Login" => "כניסה נוכחית",
// "You do not have permission to edit this user" => "You do not have permission to edit this user",
// "Your file should contain in the first row (first entry) the following fields" => "Your file should contain in the first row (first entry) the following fields",
"You do not have permission to edit this user" => "אין לך הרשאה לערוך משתמש זה",
"Your file should contain in the first row (first entry) the following fields" => "הקובץ שלך צריך להכיל בשורה הראשונה (ערך ראשון) את השדות הבאים",
// "user1,pass1,email1,group1,group1" => "user1,pass1,email1,group1,group1",
// "user2,pass2,email2,\"group1,group2\",group1" => "user2,pass2,email2,\"group1,group2\",group1",
// "Only login, password, email are mandatory. Use an empty password for automatic password generation. Use same login and email if the login use email. Groups are separated by comma. With group name with comma, double the comma" => "Only login, password, email are mandatory. Use an empty password for automatic password generation. Use same login and email if the login use email. Groups are separated by comma. With group name with comma, double the comma",
// "On most server with default setting importing 250 users should be fine. If you have a long list you can split it or change the server settings to allow longer execution time" => "On most server with default setting importing 250 users should be fine. If you have a long list you can split it or change the server settings to allow longer execution time",
// "Please also note that the data should match your Tiki setting. IE: if special characters or space are not permit for the username of your Tiki then your data in the CSV file for username should not contain any" => "Please also note that the data should match your Tiki setting. IE: if special characters or space are not permit for the username of your Tiki then your data in the CSV file for username should not contain any",
// "Existing Users" => "Existing Users",
"Only login, password, email are mandatory. Use an empty password for automatic password generation. Use same login and email if the login use email. Groups are separated by comma. With group name with comma, double the comma" => "חובה להכיל שם משתמש, סיסמה ודוא׳׳ל. השתמש בסיסמה ריקה ליצירת סיסמאות אוטומטית. השתמש באותו שם משתמש ודוא׳׳ל אם ההתחברות על ידי בדוא׳׳ל. קבוצות מופרדות בפסיק. אם שם קבוצה כולל פסיק, הכפיל את הפסיק",
"On most server with default setting importing 250 users should be fine. If you have a long list you can split it or change the server settings to allow longer execution time" => "ברוב השרתים ההגדרת ברירת מחדל אמורות להיות בסדר לייבוא של כ250 משתמשים. אם יש לך רשימה ארוכה יותר מומלץ לפצל אותה או לשנות את הגדרות השרת על מנת לאפשר זמן ביצוע ארוך יותר",
"Please also note that the data should match your Tiki setting. IE: if special characters or space are not permit for the username of your Tiki then your data in the CSV file for username should not contain any" => "שימו לב שהנתונים חייבים להתאים להגדרת ה-Tiki. זאת אומרת: אם תווים מיוחדים או רווחים אינם מותרים לשם המשתמש של ה-Tiki, שם המשתמש לא אמורים להכיל אלו תוך הנתונים בקובץ ה-CSV",
"Existing Users" => "משתמשים קיימים",
"Don't overwrite" => "אל תדרוס",
"Overwrite groups" => "לדרוס קבוצות",
"Create groups" => "ליצור קבוצות",
"The user must change his or her password the first time they log in" => "על המשתמש לשנות סיסמה בכניסה הראשונה",
// "You can export users of a group by clicking on that group at <a href=\"tiki-admingroups.php\" class=\"alert-link\">admin->groups</a>" => "You can export users of a group by clicking on that group at <a href=\"tiki-admingroups.php\" class=\"alert-link\">admin->groups</a>",
"You can export users of a group by clicking on that group at <a href=\"tiki-admingroups.php\" class=\"alert-link\">admin->groups</a>" => "ניתן לייצא משתמשים של קבוצה על ידי לחיצה על אותה קבוצה ב <a href=\"tiki-admingroups.php\" class=\"alert-link\">העדפות->קבוצות</a>",
"Temporary Users" => "משתמשים זמניים",
// "Invite new temporary user(s)" => "Invite new temporary user(s)",
// "Token Access Feature Dependency" => "Token Access Feature Dependency",
  • Hi @bsfez

    Didn't see this in trunk too - https://dev.tiki.org/Where-to-commit ?

    Maybe you're working own that...

  • Yes doing it right now (forgot we don't merge translation anymore ;-))

  • mentioned in commit 9c0c9733

    Toggle commit list
  • In the description on this commit, it is indicated 4 merge requests!996[FIX] include: Stray double quote char causing invalid html,!993[FIX] include: Stray double quote char causing invalid html,!964[FIX] Fix Delete should not be a default first choice in an admin action dropdown,!963[FIX] Fix Tracker Show item last modifier option not working in list item view

    This doesn't relate to the actual changes made to the two translation files.

    I think this caused this issue: https://forum.gitlab.com/t/on-gitlab-com-some-comments-appear-below-the-wrong-issue-comment-mismatch/60313/4

    Edited by Marc Laporte
  • It happens sometimes and we've seen that with Jonny two or three times; you do your commit (on specific files) and other commits are added.

    I have no clue for what reason, seems some stuff are "stuck in a pipe" somewhere and wait the next merge to sneak in.

    There should be some pattern... may be when gitlab do the "Rebase" thing ?

    Edited by Bernard Sfez
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment