Skip to content

Commit 665a0a4

Browse files
authored
Merge pull request #122 from zendesk/samgavinio/update-transations-go-lion
[MI-1060] Re-fetch strings from rosetta for golion
2 parents 4d44c48 + 472b709 commit 665a0a4

File tree

26 files changed

+734
-535
lines changed

26 files changed

+734
-535
lines changed

src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public function saveAction()
378378

379379
$text = Mage::helper('zendesk')->__('Ticket #%s Created', $response['id']);
380380
$text .= ' <a href="' . Mage::helper('zendesk')->getTicketUrl($response, true) . '" target="_blank">';
381-
$text .= Mage::helper('zendesk')->__('View ticket in Zendesk');
381+
$text .= Mage::helper('zendesk')->__('View ticket in Zendesk Support');
382382
$text .= '</a>';
383383

384384
Mage::getSingleton('adminhtml/session')->addSuccess($text);

src/app/code/community/Zendesk/Zendesk/etc/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<sort_order>2</sort_order>
199199
</zendesk_create>
200200
<zendesk_launch module="zendesk">
201-
<title>Launch Zendesk</title>
201+
<title>Launch Zendesk Support</title>
202202
<action>adminhtml/zendesk/launch</action>
203203
<sort_order>3</sort_order>
204204
</zendesk_launch>
@@ -238,7 +238,7 @@
238238
<sort_order>2</sort_order>
239239
</zendesk_create>
240240
<zendesk_launch translate="title" module="zendesk">
241-
<title>Launch Zendesk</title>
241+
<title>Launch Zendesk Support</title>
242242
<sort_order>3</sort_order>
243243
</zendesk_launch>
244244
<zendesk_log>

src/app/code/community/Zendesk/Zendesk/etc/system.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<general translate="label comment">
3939
<expanded>1</expanded>
4040
<label>General</label>
41-
<comment>General settings that are required to connect Zendesk and Magento.</comment>
41+
<comment>General settings that are required to connect Zendesk Support and Magento.</comment>
4242
<frontend_type>text</frontend_type>
4343
<sort_order>10</sort_order>
4444
<show_in_default>1</show_in_default>
@@ -220,7 +220,7 @@
220220
<show_in_store>1</show_in_store>
221221
</web_widget_customise>
222222
<footer_link_enabled translate="label">
223-
<label>Display link to Zendesk in Magento footer</label>
223+
<label>Display link to Zendesk Support in Magento footer</label>
224224
<frontend_type>select</frontend_type>
225225
<source_model>adminhtml/system_config_source_yesno</source_model>
226226
<sort_order>9</sort_order>
@@ -245,7 +245,7 @@
245245
<show_in_default>1</show_in_default>
246246
<show_in_website>1</show_in_website>
247247
<show_in_store>1</show_in_store>
248-
<comment><![CDATA[Used to link order in Magento with tickets in Zendesk]]></comment>
248+
<comment><![CDATA[Used to link order in Magento with tickets in Zendesk Support]]></comment>
249249
</order_field_id>
250250
</fields>
251251
</frontend_features>
@@ -327,7 +327,7 @@
327327
</backend_features>
328328
<api translate="label comment">
329329
<label>API Details</label>
330-
<comment>Required for Magento App inside Zendesk to work.</comment>
330+
<comment>Required for Magento app to work in Zendesk Support.</comment>
331331
<frontend_type>text</frontend_type>
332332
<sort_order>40</sort_order>
333333
<show_in_default>1</show_in_default>
@@ -470,7 +470,7 @@
470470
<show_in_default>1</show_in_default>
471471
<show_in_website>1</show_in_website>
472472
<show_in_store>1</show_in_store>
473-
<comment><![CDATA[Haven't setup Zendesk yet? Follow our easy setup guide to start using Zendesk to support your customers.]]></comment>
473+
<comment><![CDATA[Haven't set up Zendesk Support yet? Follow our easy setup guide to get started.]]></comment>
474474
<fields>
475475
<sign_up translate="button_label">
476476
<label></label>

src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<?php if ($this->isAllowed('launch')) { ?>
3535
<li>
3636
<a href="<?php echo Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/launch'); ?>" target="_blank" class="tab-item-link">
37-
<span><?php echo $this->__('Launch Zendesk'); ?></span>
37+
<span><?php echo $this->__('Launch Zendesk Support'); ?></span>
3838
</a>
3939
</li>
4040
<?php } ?>

src/app/locale/da_DA/Zendesk_Zendesk.csv

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,35 @@
1010
"Are you sure you want to clear the entire Zendesk log?","Er du sikker på, at du vil rydde hele Zendesk-logfilen?"
1111
"Assignee","Ansvarlig"
1212
"Chat","Chat"
13+
"Click 'Save Config' and try again. If the issue persist, check if the entered Agent Email Address and Agent Token combination is correct.","Klik på 'Gem konfiguration' og prøv igen. Kontrollér om den indtastede kombination af e‑mailadresse og token til agent er korrekt, hvis problemet fortsætter."
1314
"Code to display Feedback Tab","Kode til visning af Feedback-fanen"
1415
"Connection to Zendesk API failed","Tilslutning til Zendesk API mislykkedes"
1516
"Connection to Zendesk API successful","Tilslutning til Zendesk API lykkedes"
1617
"Create Ticket","Opret ticket"
1718
"Create tickets from Contact Us form","Opret tickets fra formularen Kontakt os"
1819
"Customize Feedback Tab","Brugerdefiner fanen Feedback"
20+
"Customize Web Widget","Tilpas Web Widget"
1921
"Dashboard","Panel"
2022
"Decide which features you would like turned on in your Magento store.","Beslut hvilke funktioner, du vil aktivere i Magento-forretningen."
2123
"Description","Beskrivelse"
24+
"Display link to Zendesk Support in Magento footer","Vis link til Zendesk Support i Magento-sidefod"
2225
"Display link to Zendesk in Magento footer","Vis link til Zendesk i Magent-sidefod"
2326
"Email","E-mail"
2427
"Facebook","Facebook"
2528
"Features","Funktioner"
2629
"Feedback Tab","Feedback-fane"
2730
"File size too large - only showing the last %s lines. Click Download to retrieve the entire file.","Filstørrelse for stor – viser kun de sidste %s linjer. Klik på Download for at hente hele filen."
31+
"General settings that are required to connect Zendesk Support and Magento.","Generelle indstillinger, der er nødvendige for at forbinde Zendesk Support og Magento."
2832
"General settings that are required to connect Zendesk and Magento.","Generelle indstillinger, der er nødvendige for at forbinde Zendesk og Magento."
2933
"General","Generelt"
3034
"Generate","Generer"
3135
"Group","Gruppe"
36+
"Haven't set up Zendesk Support yet? Follow our easy setup guide to get started.","Har du ikke installeret Zendesk Support endnu? Følg den brugervenlige installationsguide for at komme i gang."
3237
"Haven't setup Zendesk yet? Follow our easy setup guide to start using Zendesk to support your customers.","Har du ikke installeret Zendesk endnu? Følg den brugervenlige installationsguide for at komme i gang med Zendesk og hjælpe dine kunder."
3338
"High","Høj"
3439
"Incident","Hændelse"
40+
"Include Web Widget","Inkluder Web Widget"
41+
"Launch Zendesk Support","Start Zendesk Support"
3542
"Launch Zendesk","Start Zendesk"
3643
"Low","Lav"
3744
"New Support Ticket","Ny support-ticket"
@@ -41,7 +48,7 @@
4148
"Normal","Normal"
4249
"On-hold","I bero"
4350
"Open","Åben"
44-
"Order Number","Ordrenummer"
51+
"Order number","Ordrenummer"
4552
"Pending","Venter"
4653
"Priority","Prioritet"
4754
"Problem","Problem"
@@ -54,6 +61,7 @@
5461
"Requester Website","Anmoderens website"
5562
"Requester","Anmoder"
5663
"Required for Magento App inside Zendesk to work.","Nødvendig for at Magento App i Zendesk vil virke."
64+
"Required for Magento app to work in Zendesk Support.","Nødvendig for at Magento App vil virke i Zendesk Support."
5765
"Save Config","Gem konfiguration"
5866
"Settings","Indstillinger"
5967
"Setup guide","Installationsguide"
@@ -70,24 +78,25 @@
7078
"Subject","Emne"
7179
"Successfully generated a new API token","Genererede et nyt API-token."
7280
"Support Channels","Supportkanaler"
73-
"Support Tickets","Support-tickets"
7481
"Task","Opgave"
7582
"Test Connection","Prøvetilslutning"
7683
"The Zendesk log file has not been created. Check to see if logging has been enabled.","Zendesk-logfilen er ikke blevet oprettet. Kontroller, om logføring er blevet aktiveret."
7784
"Ticket #%s Created","Ticket #%s oprettet"
78-
"To generate a token, log in to Zendesk then select Manage > Channels > API > Token","Du genererer et token ved at logge ind til Zendesk og dernæst vælge Administrer > Kanaler > API > Token"
79-
"Troubleshooting tips can be found at <a href="%s">%s</a>","Der findes tip til fejlfinding på <a href="%s">%s</a>"
85+
"Tickets","Tickets"
86+
"To generate a token, sign in to Zendesk then select Manage > Channels > API > Token","Du genererer et token ved at logge ind til Zendesk og dernæst vælge Administrer > Kanaler > API > Token"
8087
"Twitter","Twitter"
8188
"Type","Type"
8289
"Updated","Opdateret"
8390
"Urgent","Haster"
84-
"Use Magento to manage admin and agent authentication.","Brug Magento til at administrere administrator- og agentautentifikation."
85-
"Use Magento to manage end-user authentication.","Brug Magento til at administrere slutbrugerautentifikation."
86-
"Use Magento to manage user authentication.","Brug Magento til at administrere brugerautentifikation."
91+
"Use Magento to manage admin and agent authentication.","Brug Magento til at administrere administrator- og agentgodkendelse."
92+
"Use Magento to manage end-user authentication.","Brug Magento til at administrere slutbrugergodkendelse."
93+
"Use Magento to manage user authentication.","Brug Magento til at administrere brugergodkendelse."
94+
"Used to link order in Magento with tickets in Zendesk Support","Bruges til at sammenkæde ordre i Magento med tickets i Zendesk Support"
8795
"Used to link order in Magento with tickets in Zendesk","Bruges til at sammenkæde ordre i Magento med tickets i Zendesk"
8896
"View All Tickets","Vis alle tickets"
97+
"View ticket in Zendesk Support","Vis ticket i Zendesk Support"
8998
"View ticket in Zendesk","Vis ticket i Zendesk"
90-
"Views to show on dashboards","Views, der skal vises på paneler"
99+
"Views to show on dashboards","Views, der skal vises på kontrolpaneler"
91100
"Voice","Voice"
92101
"Web Portal","Webportal"
93102
"Zendesk Domain","Zendesk-domæne"

src/app/locale/de_DE/Zendesk_Zendesk.csv

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,35 @@
1010
"Are you sure you want to clear the entire Zendesk log?","Möchten Sie wirklich den gesamten Inhalt des Zendesk-Protokolls löschen?"
1111
"Assignee","Mitarbeiter"
1212
"Chat","Chat"
13+
"Click 'Save Config' and try again. If the issue persist, check if the entered Agent Email Address and Agent Token combination is correct.","Klicken Sie auf „Konfiguration speichern“ und versuchen Sie es erneut. Wenn der Fehler weiterhin auftritt, stellen Sie sicher, dass die eingegebene Kombination aus E‑Mail-Adresse und Token für den Agenten korrekt ist."
1314
"Code to display Feedback Tab","Code zur Darstellung des Feedback-Menüs"
1415
"Connection to Zendesk API failed","Verbindung zur Zendesk-API fehlgeschlagen"
1516
"Connection to Zendesk API successful","Verbindung zur Zendesk-API erfolgreich"
1617
"Create Ticket","Ticket erstellen"
1718
"Create tickets from Contact Us form","Tickets aus Kontaktformular erstellen"
1819
"Customize Feedback Tab","Feedback-Menü anpassen"
20+
"Customize Web Widget","Web Widget anpassen"
1921
"Dashboard","Dashboard"
2022
"Decide which features you would like turned on in your Magento store.","Geben Sie an, welche Funktionen in Ihrem Magento-Shop aktiviert werden sollen."
2123
"Description","Beschreibung"
24+
"Display link to Zendesk Support in Magento footer","Link zu Zendesk Support im Magento-Fußbereich anzeigen"
2225
"Display link to Zendesk in Magento footer","Link zu Zendesk im Magento-Fußbereich anzeigen"
2326
"Email","E-Mail"
2427
"Facebook","Facebook"
2528
"Features","Funktionen"
2629
"Feedback Tab","Feedback-Menü"
2730
"File size too large - only showing the last %s lines. Click Download to retrieve the entire file.","Datei zu groß – nur die letzten %s Zeilen werden angezeigt. Klicken Sie auf „Download“, um die gesamte Datei herunterzuladen."
31+
"General settings that are required to connect Zendesk Support and Magento.","Allgemeine Einstellungen, die zur Verbindung von Zendesk Support und Magento erforderlich sind."
2832
"General settings that are required to connect Zendesk and Magento.","Allgemeine Einstellungen, die zur Verbindung von Zendesk und Magento erforderlich sind."
2933
"General","Allgemein"
3034
"Generate","Generieren"
3135
"Group","Gruppe"
36+
"Haven't set up Zendesk Support yet? Follow our easy setup guide to get started.","Sie haben Zendesk Support noch nicht eingerichtet? Befolgen Sie unsere einfachen Anweisungen, um loszulegen."
3237
"Haven't setup Zendesk yet? Follow our easy setup guide to start using Zendesk to support your customers.","Sie haben Zendesk noch nicht eingerichtet? Befolgen Sie unsere Setup-Anleitung, um Ihre Kunden über Zendesk zu unterstützen."
3338
"High","Hoch"
3439
"Incident","Vorfall"
40+
"Include Web Widget","Web Widget verwenden"
41+
"Launch Zendesk Support","Zendesk Support starten"
3542
"Launch Zendesk","Zendesk starten"
3643
"Low","Niedrig"
3744
"New Support Ticket","Neues Supportticket"
@@ -41,7 +48,7 @@
4148
"Normal","Normal"
4249
"On-hold","Angehalten"
4350
"Open","Offen"
44-
"Order Number","Bestellnummer"
51+
"Order number","Bestellnummer"
4552
"Pending","Wartend"
4653
"Priority","Priorität"
4754
"Problem","Problem"
@@ -54,6 +61,7 @@
5461
"Requester Website","Website des Anfragenden"
5562
"Requester","Anfragender"
5663
"Required for Magento App inside Zendesk to work.","Erforderlich, damit die Magento-App in Zendesk funktioniert."
64+
"Required for Magento app to work in Zendesk Support.","Erforderlich, damit die Magento-App in Zendesk Support funktioniert."
5765
"Save Config","Konfig. speichern"
5866
"Settings","Einstellungen"
5967
"Setup guide","Setup-Anleitung"
@@ -70,22 +78,23 @@
7078
"Subject","Betreff"
7179
"Successfully generated a new API token","Neues API-Token erfolgreich generiert"
7280
"Support Channels","Supportkanäle"
73-
"Support Tickets","Supporttickets"
7481
"Task","Aufgabe"
7582
"Test Connection","Verbindung testen"
7683
"The Zendesk log file has not been created. Check to see if logging has been enabled.","Die Zendesk-Protokolldatei wurde nicht erstellt. Stellen Sie sicher, dass die Protokollierung aktiviert ist."
7784
"Ticket #%s Created","Ticket #%s erstellt"
78-
"To generate a token, log in to Zendesk then select Manage > Channels > API > Token","Um ein Token zu generieren, melden Sie sich bei Zendesk an und wählen Sie dann „Verwalten“ > „Kanäle“ > „API“ > „Token“."
79-
"Troubleshooting tips can be found at <a href="%s">%s</a>","Tipps zur Fehlerbehebung finden Sie unter <a href="%s">%s</a>."
85+
"Tickets","Tickets"
86+
"To generate a token, sign in to Zendesk then select Manage > Channels > API > Token","Um ein Token zu generieren, melden Sie sich bei Zendesk an und wählen Sie dann „Verwalten“ > „Kanäle“ > „API“ > „Token“."
8087
"Twitter","Twitter"
8188
"Type","Typ"
8289
"Updated","Aktualisiert"
8390
"Urgent","Dringend"
8491
"Use Magento to manage admin and agent authentication.","Authentifizierung von Administratoren und Agenten über Magento verwalten."
8592
"Use Magento to manage end-user authentication.","Authentifizierung von Endbenutzern über Magento verwalten."
8693
"Use Magento to manage user authentication.","Benutzerauthentifizierung über Magento verwalten."
94+
"Used to link order in Magento with tickets in Zendesk Support","Dient zur Verknüpfung der Bestellung in Magento mit Tickets in Zendesk Support"
8795
"Used to link order in Magento with tickets in Zendesk","Dient zur Verknüpfung der Bestellung in Magento mit Tickets in Zendesk"
8896
"View All Tickets","Alle Tickets anzeigen"
97+
"View ticket in Zendesk Support","Ticket in Zendesk Support anzeigen"
8998
"View ticket in Zendesk","Ticket in Zendesk anzeigen"
9099
"Views to show on dashboards","Ansichten, die in Dashboards erscheinen sollen"
91100
"Voice","Voice"

0 commit comments

Comments
 (0)