Skip to content

Commit

Permalink
fix translation merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@oliverrahner
oliverrahner committed Jan 3, 2025
2 parents dc8873d + 95162d5 commit 81c14c8
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 29 deletions.
9 changes: 6 additions & 3 deletions i18n/en.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-10-28 14:12+0000\n"
"PO-Revision-Date: 2025-01-03 13:28+0000\n"
"PO-Revision-Date: 2025-01-03 13:47+0000\n"
"Last-Translator: Oliver Rahner <[email protected]>\n"
"Language-Team: English <https://weblate.my-agrirouter.com/projects/"
"agrirouter/user-manual/en/>\n"
Expand Down Expand Up @@ -3120,8 +3120,11 @@ msgid ""
"*Endpunkte:* Maschinen und Agrarsoftware können Daten austauschen, wenn du sie dem agrirouter als <<Endpunkt,Endpunkte>> hinzufügst.\n"
"[.result]#Füge Endpunkte hinzu, wie in den Kapiteln xref:endpoint.adoc#connect-machine[Maschine verbinden] und xref:endpoint.adoc#connect-software[Agrarsoftware verbinden] beschrieben.#\n"
msgstr ""
"*Endpoints:* Machines and agricultural software can exchange data if you add them to the agrirouter as <<endpoint,endpoints>>.\n"
"[.result]#Add Endpoints as described in the chapters xref:endpoint.adoc#connect-machine[Connect machine] and xref:endpoint.adoc#connect-software[Connect agricultural software]#.\n"
"*Endpoints:* Machines and agricultural software can exchange data if you add "
"them to the agrirouter as <<endpoint,endpoints>>.\n"
"[.result]#Add Endpoints as described in the chapters xref:endpoint.adoc"
"#connect-machine[Connect machine] and xref:endpoint.adoc#connect-software["
"Connect agricultural software].#\n"

#. type: Plain text
#: de/modules/ROOT/pages/introduction.adoc:27
Expand Down
21 changes: 13 additions & 8 deletions i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-01-03 14:05+0100\n"
"PO-Revision-Date: 2024-10-28 15:16+0000\n"
"Last-Translator: DeepL <[email protected]>\n"
"POT-Creation-Date: 2024-10-28 14:12+0000\n"
"PO-Revision-Date: 2025-01-03 14:14+0000\n"
"Last-Translator: Oliver Rahner <[email protected]>\n"
"Language-Team: Spanish <https://weblate.my-agrirouter.com/projects/"
"agrirouter/user-manual/es/>\n"
"Language: es\n"
Expand Down Expand Up @@ -1521,8 +1521,8 @@ msgid ""
"image:endpoints/endpoint-name.png[Endpunktname, 50]: Name oder Beschreibung "
"des Endpunkts."
msgstr ""
"image:endpoints/nombre-del-punto-de-final.png[Nombre del punto final, 50]: "
"Nombre o descripción del Punto de conexión."
"image:endpoints/endpoint-name.png[Nombre del punto final, 50]: Nombre o "
"descripción del Punto de conexión."

#. type: Plain text
#: de/modules/ROOT/pages/endpoint.adoc:47
Expand Down Expand Up @@ -1669,7 +1669,7 @@ msgid ""
"image:endpoints/add-manufacturer-3.png[Hersteller verbunden, 400, "
"float=right]"
msgstr ""
"image:endpoints/add-fabricante-3.png[fabricante vincular, 400, float=right]"
"image:endpoints/add-manufacturer-3.png[fabricante vincular, 400, float=right]"

#. type: Plain text
#: de/modules/ROOT/pages/endpoint.adoc:88
Expand Down Expand Up @@ -2229,7 +2229,12 @@ msgstr ""
#: de/modules/ROOT/pages/endpoint.adoc:272
#, no-wrap
msgid "*_Von agrirouter verwaltete Routen_*: Wenn diese Option gewählt ist image:endpoints/active-routing-icon.png[Active Icon, 25], dann sind die Routeneinstellungen nach den Standardeinstellungen des agrirouters aktiv. Die Routeneinstellungen können auch xref:routing.adoc#edit-connection[manuell angepasst] werden.\n"
msgstr "*_Rutas gestionadas por agrirouter_*: Si esta opción está seleccionada image:endpoints/active-routing-icon.png[Icono activo, 25], los ajustes de ruta están activos según los ajustes por defecto del agrirouter. Los ajustes de ruta también se pueden xref:enrutamiento.adoc#editar-conexion[ajustar manualmente].\n"
msgstr ""
"*_Rutas gestionadas por agrirouter_*: Si esta opción está seleccionada image:"
"endpoints/active-routing-icon.png[Icono activo, 25], los ajustes de ruta "
"están activos según los ajustes por defecto del agrirouter. Los ajustes de "
"ruta también se pueden xref:routing.adoc#editar-conexion[ajustar "
"manualmente].\n"

#. type: Plain text
#: de/modules/ROOT/pages/endpoint.adoc:273
Expand Down Expand Up @@ -3370,7 +3375,7 @@ msgid ""
msgstr ""
"Una ruta es la Vinculación entre dos Puntos de conexión, es decir, los datos "
"fluyen del remitente al destinatario y viceversa a través de la ruta. Puede "
"averiguar cómo configurar una nueva ruta xref:enrutamiento.adoc[aquí]."
"averiguar cómo configurar una nueva ruta xref:routing.adoc[aquí]."

#. type: Plain text
#: de/modules/ROOT/pages/introduction.adoc:67
Expand Down
24 changes: 14 additions & 10 deletions i18n/fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-01-03 14:05+0100\n"
"PO-Revision-Date: 2024-10-28 15:16+0000\n"
"Last-Translator: DeepL <[email protected]>\n"
"POT-Creation-Date: 2024-10-28 14:12+0000\n"
"PO-Revision-Date: 2025-01-03 14:14+0000\n"
"Last-Translator: Oliver Rahner <[email protected]>\n"
"Language-Team: French (formal) <https://weblate.my-agrirouter.com/projects/"
"agrirouter/user-manual/fr@formal/>\n"
"Language: fr\n"
Expand Down Expand Up @@ -1128,7 +1128,7 @@ msgstr ""
#: de/modules/ROOT/pages/account.adoc:107
#, no-wrap
msgid "Anmelden"
msgstr "Ouvrir une session"
msgstr "S'inscrire"

#. type: Plain text
#: de/modules/ROOT/pages/account.adoc:118
Expand All @@ -1141,8 +1141,8 @@ msgid ""
"Gib die *_E-Mail-Adresse_* ein, mit der du dich bereits beim agrirouter "
"<<benutzerkonto-erstellen, registriert>> hast."
msgstr ""
"Saisissez la *_adresse e-mail_* avec laquelle vous vous êtes déjà inscrit "
"sur agrirouter <<créer un compte utilisateur, s'inscrire>>."
"Saisissez la *_adresse e-mail_* avec laquelle vous vous êtes déjà "
"<<s'inscrire, inscrit>> sur agrirouter."

#. type: Plain text
#: de/modules/ROOT/pages/account.adoc:127
Expand All @@ -1158,8 +1158,8 @@ msgid ""
"registriert>> hast. Kopiere den Code aus der Mail."
msgstr ""
"Vous recevrez alors un *_email contenant un code à 8 chiffres_* à l'adresse "
"e-mail avec laquelle vous vous êtes inscrit sur agrirouter <<créer un compte "
"d'utilisateur, s'inscrire>>. Copiez le code de l'e-mail."
"e-mail avec laquelle vous vous êtes <<s'inscrire,inscrit>> sur agrirouter. "
"Copiez le code de l'e-mail."

#. type: delimited block =
#: de/modules/ROOT/pages/account.adoc:132
Expand Down Expand Up @@ -3207,8 +3207,12 @@ msgid ""
"*Endpunkte:* Maschinen und Agrarsoftware können Daten austauschen, wenn du sie dem agrirouter als <<Endpunkt,Endpunkte>> hinzufügst.\n"
"[.result]#Füge Endpunkte hinzu, wie in den Kapiteln xref:endpoint.adoc#connect-machine[Maschine verbinden] und xref:endpoint.adoc#connect-software[Agrarsoftware verbinden] beschrieben.#\n"
msgstr ""
"*points d'extrémité:* les machines et les logiciels agricoles peuvent échanger des données si vous les ajoutez à l'agrirouter comme <<point d'extrémité,points d'extrémité>>.\n"
"[.result]#Ajouter des points de terminaison comme décrit dans les chapitres xref:endpoint.adoc#connect-machine[connecter une machine] et xref:endpoint.adoc#connect-software[connecter un logiciel agricole].#\n"
"*points d'extrémité:* les machines et les logiciels agricoles peuvent "
"échanger des données si vous les ajoutez à l'agrirouter comme "
"<<endpoint,points d'extrémité>>.\n"
"[.result]#Ajouter des points de terminaison comme décrit dans les chapitres "
"xref:endpoint.adoc#connect-machine[connecter une machine] et xref:endpoint."
"adoc#connect-software[connecter un logiciel agricole].#\n"

#. type: Plain text
#: de/modules/ROOT/pages/introduction.adoc:27
Expand Down
10 changes: 5 additions & 5 deletions i18n/it.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-10-28 14:12+0000\n"
"PO-Revision-Date: 2025-01-03 13:28+0000\n"
"PO-Revision-Date: 2025-01-03 14:14+0000\n"
"Last-Translator: Oliver Rahner <[email protected]>\n"
"Language-Team: Italian <https://weblate.my-agrirouter.com/projects/"
"agrirouter/user-manual/it/>\n"
Expand Down Expand Up @@ -1331,9 +1331,9 @@ msgid ""
"Kontoeinstellungen. Scrolle hier ganz nach unten und du siehst diesen "
"Abschnitt:#"
msgstr ""
"Seguite i passaggi 1 e 2 del capitolo <<Modifica dell'account, modifica "
"delle informazioni sull'account>>. [Ora vi trovate nell'area delle "
"impostazioni dell'account. Scorrete fino in fondo e vedrete questa sezione:#"
"Seguite i passaggi 1 e 2 del capitolo <<edit-account, modifica delle "
"informazioni sull'account>>. [Ora vi trovate nell'area delle impostazioni "
"dell'account. Scorrete fino in fondo e vedrete questa sezione:#"

#. type: Plain text
#: de/modules/ROOT/pages/account.adoc:207
Expand Down Expand Up @@ -3638,7 +3638,7 @@ msgid ""
"image:endpoints/a-to-b-icon.png[Legende Icon, 40] In dieser Spalte ist der "
"Endpunkt A Sender und der Endpunkt B Empfänger."
msgstr ""
"image:endpoint/a-to-b-icon.png[icona della legenda, 40] In questa colonna, "
"image:endpoints/a-to-b-icon.png[icona della legenda, 40] In questa colonna, "
"l'endpoint A è il mittente e l'endpoint B è il destinatario."

#. type: Plain text
Expand Down
6 changes: 3 additions & 3 deletions i18n/pt.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-10-28 14:12+0000\n"
"PO-Revision-Date: 2025-01-03 13:28+0000\n"
"PO-Revision-Date: 2025-01-03 14:14+0000\n"
"Last-Translator: Oliver Rahner <[email protected]>\n"
"Language-Team: Portuguese <https://weblate.my-agrirouter.com/projects/"
"agrirouter/user-manual/pt/>\n"
Expand Down Expand Up @@ -1500,7 +1500,7 @@ msgid ""
"icon.png[Software Icon, 40]: Dieses Symbol steht für die Art von Endpunkt, "
"die verbunden ist."
msgstr ""
"image:endpoints/trator-icon.png[Ícone do trator, 40] image:endpoints/"
"image:endpoints/tractor-icon.png[Ícone do trator, 40] image:endpoints/"
"software-icon.png[Ícone do software, 40]: Este ícone representa o tipo de "
"Ponto final que está ligado."

Expand Down Expand Up @@ -3229,7 +3229,7 @@ msgid ""
"endpoint.adoc#manufacturer-machine-connection[*_bearbeiten_*]."
msgstr ""
"Pode alterar a Designação e a atribuição do fabricante dos seus pontos "
"finais xref:pontofinal.adoc#manufacturer-machine-connection[*_edit_*]."
"finais xref:endpoint.adoc#manufacturer-machine-connection[*_edit_*]."

#. type: Plain text
#: de/modules/ROOT/pages/introduction.adoc:44
Expand Down

0 comments on commit 81c14c8

Please sign in to comment.