Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vmapetr committed Aug 28, 2024
1 parent 074e536 commit 4689b18
Show file tree
Hide file tree
Showing 63 changed files with 4,608 additions and 4,608 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Conda-Authentifizierung (für Aufgabenausführungen)",
"loc.helpMarkDown": "",
"loc.description": "Authentifizierungsaufgabe für den Conda-Client",
"loc.instanceNameFormat": "Conda-Authentifizierung",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Fehler beim Hinzufügen der Authentifizierung.",
"loc.messages.AddingAuthChannel": "Die Authentifizierung für das Token „%s“ wird hinzugefügt",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Conda-Authentifizierung (für Aufgabenausführungen)",
"loc.helpMarkDown": "",
"loc.description": "Authentifizierungsaufgabe für den Conda-Client",
"loc.instanceNameFormat": "Conda-Authentifizierung",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Fehler beim Hinzufügen der Authentifizierung.",
"loc.messages.AddingAuthChannel": "Die Authentifizierung für das Token „%s“ wird hinzugefügt",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Autenticación de Conda (para ejecutores de tareas)",
"loc.helpMarkDown": "",
"loc.description": "Tarea de autenticación para el cliente de Conda",
"loc.instanceNameFormat": "Autenticación de Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "No se pudo agregar la autenticación",
"loc.messages.AddingAuthChannel": "Agregando autenticación para el token %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Autenticación de Conda (para ejecutores de tareas)",
"loc.helpMarkDown": "",
"loc.description": "Tarea de autenticación para el cliente de Conda",
"loc.instanceNameFormat": "Autenticación de Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "No se pudo agregar la autenticación",
"loc.messages.AddingAuthChannel": "Agregando autenticación para el token %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Authentification de Conda (pour les exécuteurs de tâches)",
"loc.helpMarkDown": "",
"loc.description": "Tâche d’authentification pour le client conda",
"loc.instanceNameFormat": "Authentification Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Nous n’avons pas pu ajouter l’authentification.",
"loc.messages.AddingAuthChannel": "Ajout de l’authentification pour le jeton %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Authentification de Conda (pour les exécuteurs de tâches)",
"loc.helpMarkDown": "",
"loc.description": "Tâche d’authentification pour le client conda",
"loc.instanceNameFormat": "Authentification Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Nous n’avons pas pu ajouter l’authentification.",
"loc.messages.AddingAuthChannel": "Ajout de l’authentification pour le jeton %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Autenticazione Conda (per gli strumenti di esecuzione attività)",
"loc.helpMarkDown": "",
"loc.description": "Attività di autenticazione per il client Conda",
"loc.instanceNameFormat": "Autenticazione Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Non è stato possibile aggiungere l'autenticazione.",
"loc.messages.AddingAuthChannel": "Aggiunta dell'autenticazione per il token %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Autenticazione Conda (per gli strumenti di esecuzione attività)",
"loc.helpMarkDown": "",
"loc.description": "Attività di autenticazione per il client Conda",
"loc.instanceNameFormat": "Autenticazione Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Non è stato possibile aggiungere l'autenticazione.",
"loc.messages.AddingAuthChannel": "Aggiunta dell'autenticazione per il token %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Conda 認証 (タスク ランナー用)",
"loc.helpMarkDown": "",
"loc.description": "Conda クライアントの認証タスク",
"loc.instanceNameFormat": "Conda 認証",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "認証を追加できませんでした。",
"loc.messages.AddingAuthChannel": "トークン %s の認証を追加しています",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Conda 認証 (タスク ランナー用)",
"loc.helpMarkDown": "",
"loc.description": "Conda クライアントの認証タスク",
"loc.instanceNameFormat": "Conda 認証",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "認証を追加できませんでした。",
"loc.messages.AddingAuthChannel": "トークン %s の認証を追加しています",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Conda 인증(작업 실행기용)",
"loc.helpMarkDown": "",
"loc.description": "Conda 클라이언트에 대한 인증 작업",
"loc.instanceNameFormat": "Conda 인증",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "인증을 추가하지 못했습니다.",
"loc.messages.AddingAuthChannel": "토큰 %s에 대한 인증을 추가하는 중",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Conda 인증(작업 실행기용)",
"loc.helpMarkDown": "",
"loc.description": "Conda 클라이언트에 대한 인증 작업",
"loc.instanceNameFormat": "Conda 인증",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "인증을 추가하지 못했습니다.",
"loc.messages.AddingAuthChannel": "토큰 %s에 대한 인증을 추가하는 중",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Проверка подлинности Conda (для запускателей задач)",
"loc.helpMarkDown": "",
"loc.description": "Задача проверки подлинности для клиента Conda",
"loc.instanceNameFormat": "Проверка подлинности Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Добавить проверку подлинности не удалось.",
"loc.messages.AddingAuthChannel": "Добавление проверки подлинности для маркера %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Проверка подлинности Conda (для запускателей задач)",
"loc.helpMarkDown": "",
"loc.description": "Задача проверки подлинности для клиента Conda",
"loc.instanceNameFormat": "Проверка подлинности Conda",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Добавить проверку подлинности не удалось.",
"loc.messages.AddingAuthChannel": "Добавление проверки подлинности для маркера %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Conda 身份验证 (适用于任务运行程序)",
"loc.helpMarkDown": "",
"loc.description": "Conda 客户端的身份验证任务",
"loc.instanceNameFormat": "Conda 身份验证",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "添加身份验证失败。",
"loc.messages.AddingAuthChannel": "为令牌 %s 添加身份验证",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Conda 身份验证 (适用于任务运行程序)",
"loc.helpMarkDown": "",
"loc.description": "Conda 客户端的身份验证任务",
"loc.instanceNameFormat": "Conda 身份验证",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "添加身份验证失败。",
"loc.messages.AddingAuthChannel": "为令牌 %s 添加身份验证",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"loc.friendlyName": "Conda 驗證 (適用於工作執行器)",
"loc.helpMarkDown": "",
"loc.description": "Conda 用戶端的驗證工作",
"loc.instanceNameFormat": "Conda 驗證",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "無法新增驗證。",
"loc.messages.AddingAuthChannel": "正在新增權杖 %s 的驗證",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
{
"loc.friendlyName": "Conda 驗證 (適用於工作執行器)",
"loc.helpMarkDown": "",
"loc.description": "Conda 用戶端的驗證工作",
"loc.instanceNameFormat": "Conda 驗證",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "無法新增驗證。",
"loc.messages.AddingAuthChannel": "正在新增權杖 %s 的驗證",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
}
Loading

0 comments on commit 4689b18

Please sign in to comment.