summaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-11-10 18:59:06 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-11-10 18:59:06 +0000
commit79c33bbc838fd837e516fd60569dbcf7917bd534 (patch)
tree20695e6f03f08925d6be3c96846668d979b4b3b3 /lang
parentf6b2be81b9cb09485a08e58fc73d9290fd544148 (diff)
downloadredmine-79c33bbc838fd837e516fd60569dbcf7917bd534.tar.gz
redmine-79c33bbc838fd837e516fd60569dbcf7917bd534.zip
Maps repository users to Redmine users (#1383).
Users with same username or email are automatically mapped. Mapping can be manually adjusted in repository settings. Multiple usernames can be mapped to the same Redmine user. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2006 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lang')
-rw-r--r--lang/bg.yml1
-rw-r--r--lang/ca.yml1
-rw-r--r--lang/cs.yml1
-rw-r--r--lang/da.yml1
-rw-r--r--lang/de.yml1
-rw-r--r--lang/en.yml1
-rw-r--r--lang/es.yml1
-rw-r--r--lang/fi.yml1
-rw-r--r--lang/fr.yml1
-rw-r--r--lang/he.yml1
-rw-r--r--lang/hu.yml1
-rw-r--r--lang/it.yml1
-rw-r--r--lang/ja.yml1
-rw-r--r--lang/ko.yml1
-rw-r--r--lang/lt.yml1
-rw-r--r--lang/nl.yml1
-rw-r--r--lang/no.yml1
-rw-r--r--lang/pl.yml1
-rw-r--r--lang/pt-br.yml1
-rw-r--r--lang/pt.yml1
-rw-r--r--lang/ro.yml1
-rw-r--r--lang/ru.yml1
-rw-r--r--lang/sk.yml1
-rw-r--r--lang/sr.yml1
-rw-r--r--lang/sv.yml1
-rw-r--r--lang/th.yml1
-rw-r--r--lang/tr.yml1
-rw-r--r--lang/uk.yml1
-rw-r--r--lang/vn.yml1
-rw-r--r--lang/zh-tw.yml1
-rw-r--r--lang/zh.yml1
31 files changed, 31 insertions, 0 deletions
diff --git a/lang/bg.yml b/lang/bg.yml
index bc8309845..000f0a977 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -689,3 +689,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/ca.yml b/lang/ca.yml
index 793128293..5db547ac5 100644
--- a/lang/ca.yml
+++ b/lang/ca.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/cs.yml b/lang/cs.yml
index 7e49482c2..09ed76ea9 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -694,3 +694,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/da.yml b/lang/da.yml
index a5b8ddfb5..b5081e9ee 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/de.yml b/lang/de.yml
index 7d4b7959f..3e59bcf9e 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/en.yml b/lang/en.yml
index a76c5d1a5..e9d7a1706 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -665,6 +665,7 @@ text_user_wrote: '%s wrote:'
text_enumeration_destroy_question: '%d objects are assigned to this value.'
text_enumeration_category_reassign_to: 'Reassign them to this value:'
text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
default_role_manager: Manager
default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index 74ca4119a..c3b9de2b6 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -692,3 +692,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/fi.yml b/lang/fi.yml
index 17423bf86..bdcefef9c 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -689,3 +689,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/fr.yml b/lang/fr.yml
index 556bb4548..ab34575b2 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -665,6 +665,7 @@ text_user_wrote: '%s a écrit:'
text_enumeration_destroy_question: 'Cette valeur est affectée à %d objets.'
text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/email.yml et redémarrez l'application pour les activer."
+text_repository_usernames_mapping: "Vous pouvez sélectionner ou modifier l'utilisateur Redmine associé à chaque nom d'utilisateur figurant dans l'historique du dépôt.\nLes utilisateurs avec le même identifiant ou la même adresse mail seront automatiquement associés."
default_role_manager: Manager
default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 59474f6ce..13eab75c5 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -689,3 +689,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/hu.yml b/lang/hu.yml
index 8a508a1e6..1c4afdcd3 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Időnaplók szerkesztése
permission_edit_own_issue_notes: Saját jegyzetek szerkesztése
setting_gravatar_enabled: Felhasználói fényképek engedélyezése
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/it.yml b/lang/it.yml
index e33e6b8a3..c6ae84a91 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -689,3 +689,4 @@ permission_edit_time_entries: Modifica time logs
permission_edit_own_issue_notes: Modifica proprie note
setting_gravatar_enabled: Usa icone utente Gravatar
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/ja.yml b/lang/ja.yml
index cd55ab896..4092584d7 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/ko.yml b/lang/ko.yml
index 8a1030da7..595acfa9e 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -689,3 +689,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/lt.yml b/lang/lt.yml
index f9e5bea14..544cb14f9 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -691,3 +691,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/nl.yml b/lang/nl.yml
index 229fb8e77..3434b1481 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -691,3 +691,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/no.yml b/lang/no.yml
index 5faa25fc1..ca056f809 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/pl.yml b/lang/pl.yml
index 246c147e4..df7d525dc 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -724,3 +724,4 @@ permission_edit_own_issue_notes: Edycja własnych notatek
setting_gravatar_enabled: Używaj ikon użytkowników Gravatar
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 3ead43b80..4e34231af 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Editar tempo gasto
permission_edit_own_issue_notes: Editar próprias notas
setting_gravatar_enabled: Usar ícones do Gravatar
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/pt.yml b/lang/pt.yml
index 878eae1fc..ce1e27a36 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -691,3 +691,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/ro.yml b/lang/ro.yml
index bde50a98d..8890f6e2d 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -689,3 +689,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/ru.yml b/lang/ru.yml
index f7ca8fc07..363386dc9 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -722,3 +722,4 @@ text_user_mail_option: "Для невыбранных проектов, Вы б
text_user_wrote: '%s написал(а):'
text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную Wiki и все ее содержимое?
text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/sk.yml b/lang/sk.yml
index 919f13d9a..5c53eda2f 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -694,3 +694,4 @@ permission_edit_time_entries: Editácia časových záznamov
permission_edit_own_issue_notes: Editácia vlastných poznámok úlohy
setting_gravatar_enabled: Použitie uživateľských Gravatar ikon
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/sr.yml b/lang/sr.yml
index 27466e14e..54b1e70c6 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/sv.yml b/lang/sv.yml
index 29789c124..76b6e6c38 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/th.yml b/lang/th.yml
index 1bb60eacc..fa471101f 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -692,3 +692,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/tr.yml b/lang/tr.yml
index 439303a70..90d4d5f65 100644
--- a/lang/tr.yml
+++ b/lang/tr.yml
@@ -690,3 +690,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/uk.yml b/lang/uk.yml
index 5f18b0e22..a7f3f7347 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -691,3 +691,4 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/vn.yml b/lang/vn.yml
index 8ddc77e47..81957a53c 100644
--- a/lang/vn.yml
+++ b/lang/vn.yml
@@ -690,3 +690,4 @@ permission_save_queries: Save queries
permission_edit_time_entries: Edit time logs
permission_edit_own_time_entries: Edit own time logs
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 2e4a5f02d..40dc47b8b 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -691,3 +691,4 @@ enumeration_issue_priorities: 項目優先權
enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤)
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/zh.yml b/lang/zh.yml
index 00f95dcae..10fd1ac01 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -691,3 +691,4 @@ enumeration_issue_priorities: 问题优先级
enumeration_doc_categories: 文档类别
enumeration_activities: 活动(时间跟踪)
label_example: Example
+text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."