Skip to content

Commit 4689b18

Browse files
vmapetrvmapetr
committed
Resolve conflicts
1 parent 074e536 commit 4689b18

File tree

63 files changed

+4608
-4608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+4608
-4608
lines changed

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/de-DE/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Conda-Authentifizierung (für Aufgabenausführungen)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Authentifizierungsaufgabe für den Conda-Client",
5-
"loc.instanceNameFormat": "Conda-Authentifizierung",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "Fehler beim Hinzufügen der Authentifizierung.",
9-
"loc.messages.AddingAuthChannel": "Die Authentifizierung für das Token „%s“ wird hinzugefügt",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Conda-Authentifizierung (für Aufgabenausführungen)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Authentifizierungsaufgabe für den Conda-Client",
5+
"loc.instanceNameFormat": "Conda-Authentifizierung",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "Fehler beim Hinzufügen der Authentifizierung.",
9+
"loc.messages.AddingAuthChannel": "Die Authentifizierung für das Token „%s“ wird hinzugefügt",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/es-ES/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Autenticación de Conda (para ejecutores de tareas)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Tarea de autenticación para el cliente de Conda",
5-
"loc.instanceNameFormat": "Autenticación de Conda",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "No se pudo agregar la autenticación",
9-
"loc.messages.AddingAuthChannel": "Agregando autenticación para el token %s",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Autenticación de Conda (para ejecutores de tareas)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Tarea de autenticación para el cliente de Conda",
5+
"loc.instanceNameFormat": "Autenticación de Conda",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "No se pudo agregar la autenticación",
9+
"loc.messages.AddingAuthChannel": "Agregando autenticación para el token %s",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/fr-FR/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Authentification de Conda (pour les exécuteurs de tâches)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Tâche d’authentification pour le client conda",
5-
"loc.instanceNameFormat": "Authentification Conda",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "Nous n’avons pas pu ajouter l’authentification.",
9-
"loc.messages.AddingAuthChannel": "Ajout de l’authentification pour le jeton %s",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Authentification de Conda (pour les exécuteurs de tâches)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Tâche d’authentification pour le client conda",
5+
"loc.instanceNameFormat": "Authentification Conda",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "Nous n’avons pas pu ajouter l’authentification.",
9+
"loc.messages.AddingAuthChannel": "Ajout de l’authentification pour le jeton %s",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/it-IT/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Autenticazione Conda (per gli strumenti di esecuzione attività)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Attività di autenticazione per il client Conda",
5-
"loc.instanceNameFormat": "Autenticazione Conda",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "Non è stato possibile aggiungere l'autenticazione.",
9-
"loc.messages.AddingAuthChannel": "Aggiunta dell'autenticazione per il token %s",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Autenticazione Conda (per gli strumenti di esecuzione attività)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Attività di autenticazione per il client Conda",
5+
"loc.instanceNameFormat": "Autenticazione Conda",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "Non è stato possibile aggiungere l'autenticazione.",
9+
"loc.messages.AddingAuthChannel": "Aggiunta dell'autenticazione per il token %s",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/ja-JP/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Conda 認証 (タスク ランナー用)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Conda クライアントの認証タスク",
5-
"loc.instanceNameFormat": "Conda 認証",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "認証を追加できませんでした。",
9-
"loc.messages.AddingAuthChannel": "トークン %s の認証を追加しています",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Conda 認証 (タスク ランナー用)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Conda クライアントの認証タスク",
5+
"loc.instanceNameFormat": "Conda 認証",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "認証を追加できませんでした。",
9+
"loc.messages.AddingAuthChannel": "トークン %s の認証を追加しています",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/ko-KR/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Conda 인증(작업 실행기용)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Conda 클라이언트에 대한 인증 작업",
5-
"loc.instanceNameFormat": "Conda 인증",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "인증을 추가하지 못했습니다.",
9-
"loc.messages.AddingAuthChannel": "토큰 %s에 대한 인증을 추가하는 중",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Conda 인증(작업 실행기용)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Conda 클라이언트에 대한 인증 작업",
5+
"loc.instanceNameFormat": "Conda 인증",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "인증을 추가하지 못했습니다.",
9+
"loc.messages.AddingAuthChannel": "토큰 %s에 대한 인증을 추가하는 중",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/ru-RU/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Проверка подлинности Conda (для запускателей задач)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Задача проверки подлинности для клиента Conda",
5-
"loc.instanceNameFormat": "Проверка подлинности Conda",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "Добавить проверку подлинности не удалось.",
9-
"loc.messages.AddingAuthChannel": "Добавление проверки подлинности для маркера %s",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Проверка подлинности Conda (для запускателей задач)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Задача проверки подлинности для клиента Conda",
5+
"loc.instanceNameFormat": "Проверка подлинности Conda",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "Добавить проверку подлинности не удалось.",
9+
"loc.messages.AddingAuthChannel": "Добавление проверки подлинности для маркера %s",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/zh-CN/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Conda 身份验证 (适用于任务运行程序)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Conda 客户端的身份验证任务",
5-
"loc.instanceNameFormat": "Conda 身份验证",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "添加身份验证失败。",
9-
"loc.messages.AddingAuthChannel": "为令牌 %s 添加身份验证",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Conda 身份验证 (适用于任务运行程序)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Conda 客户端的身份验证任务",
5+
"loc.instanceNameFormat": "Conda 身份验证",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "添加身份验证失败。",
9+
"loc.messages.AddingAuthChannel": "为令牌 %s 添加身份验证",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

‎Tasks/CondaAuthenticateV0/Strings/resources.resjson/zh-TW/resources.resjson

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"loc.friendlyName": "Conda 驗證 (適用於工作執行器)",
3-
"loc.helpMarkDown": "",
4-
"loc.description": "Conda 用戶端的驗證工作",
5-
"loc.instanceNameFormat": "Conda 驗證",
6-
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7-
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8-
"loc.messages.FailedToAddAuthentication": "無法新增驗證。",
9-
"loc.messages.AddingAuthChannel": "正在新增權杖 %s 的驗證",
10-
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11-
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12-
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1+
{
2+
"loc.friendlyName": "Conda 驗證 (適用於工作執行器)",
3+
"loc.helpMarkDown": "",
4+
"loc.description": "Conda 用戶端的驗證工作",
5+
"loc.instanceNameFormat": "Conda 驗證",
6+
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
7+
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
8+
"loc.messages.FailedToAddAuthentication": "無法新增驗證。",
9+
"loc.messages.AddingAuthChannel": "正在新增權杖 %s 的驗證",
10+
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
11+
"loc.messages.Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for service connection %s.",
12+
"loc.messages.FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection: %s."
1313
}

0 commit comments

Comments
 (0)