services.cgi: translate "Addon"

* Translate string "Addon" in services.cgi
* Added EN/NL translations
* Correct existing plural DE translation for singular "Add-on"
* Fix usage of the incorrect strings "addon(s)" to correct
  hyphenated "add-on(s)" also in other translation strings for
  EN/NL/DE

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 14ed01c50a689d632a12e83be573435e4d6a0abf..3c0f27f99ff72f9f96132787017f218ea79fbd1a 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -138,7 +138,7 @@ END
        print "</table></div>\n";
        &Header::closebox();
 
-       &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
+       &Header::openbox('100%', 'left', "$Lang::tr{addon} - $Lang::tr{services}");
        my $paramstr=$ENV{QUERY_STRING};
        my @param=split(/!/, $paramstr);
        # Make sure action parameter is actually one of the allowed service actions
@@ -156,7 +156,7 @@ END
 <div align='center'>
 <table width='80%' cellspacing='1' class='tbl'>
 <tr>
-       <th align='left'><b>Addon $Lang::tr{service}</b></th>
+       <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th>
        <th align='center'><b>Boot</b></th>
        <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
        <th align='center'><b>$Lang::tr{'status'}</b></th>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index abfba5d5e4b531ceadb9274704cc939306543f1d..a52d41531b4735881167d2b86b944600dc1cb653 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -157,7 +157,7 @@
 'add xtaccess' => 'Externen Zugang hinzugefügt',
 'add-route' => 'Zusätzlich zu propagierende Route',
 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste',
-'addon' => 'Add-Ons',
+'addon' => 'Add-On',
 'addons' => 'Add-Ons',
 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
 'admin users' => 'Liste der Benutzer mit Super User Rechten',
@@ -477,7 +477,7 @@
 'backupaddon' => 'Add-On-Sicherung',
 'backupprofile' => 'Falls die Wiederverbindung scheitert, auf dieses Profil umschalten',
 'backups' => 'Sicherungen',
-'backupwarning' => 'Spielen Sie zuerst Ihre Hauptsicherung und anschließend die Sicherung(en) der Addon-Konfiguration(en) ein.<br />Es werden lediglich die gesicherten Konfigurationsdatei(en) der Addons, nicht die installierten Addons wiederhergestellt!<br />Achten Sie außerdem darauf, dass die Sicherungen ihre originalen Dateinamen behalten.',
+'backupwarning' => 'Spielen Sie zuerst Ihre Hauptsicherung und anschließend die Sicherung(en) der Add-on-Konfiguration(en) ein.<br />Es werden lediglich die gesicherten Konfigurationsdatei(en) der Add-ons, nicht die installierten Add-ons wiederhergestellt!<br />Achten Sie außerdem darauf, dass die Sicherungen ihre originalen Dateinamen behalten.',
 'bad characters in' => 'Ungültige Zeichen in ',
 'bad characters in script field' => 'Nicht erlaubte Zeichen im Skriptnamen',
 'bad characters in the telephone number field' => 'Nicht erlaubte(s) Zeichen im Feld Telefonnummer.',
@@ -2005,16 +2005,16 @@
 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
 'pakfire ago' => 'her.',
 'pakfire already busy' => 'Pakfire führt bereits eine Aufgabe aus. Bitte versuchen Sie es später erneut.',
-'pakfire available addons' => 'Verfügbare Addons:',
+'pakfire available addons' => 'Verfügbare Add-ons:',
 'pakfire configuration' => 'Pakfire Konfiguration',
-'pakfire core update auto' => 'Core- und Addon-Updates automatisch installieren:',
+'pakfire core update auto' => 'Core- und Add-on-Updates automatisch installieren:',
 'pakfire core update level' => 'Core-Update-Level',
 'pakfire finished' => 'Pakfire ist fertig! Kehre zurück...',
 'pakfire finished error' => 'Pakfire ist fertig! Fehler sind aufgetreten, bitte überprüfen Sie die Log-Ausgabe, bevor Sie fortfahren.',
 'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus-Symbol.',
 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
-'pakfire installed addons' => 'Installierte Addons:',
+'pakfire installed addons' => 'Installierte Add-ons:',
 'pakfire invalid tree' => '',
 'pakfire last core list update' => 'Letztes Corelisten Update ist',
 'pakfire last package update' => 'Letztes Paketlisten Update ist',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bf18b22a2ae22f3b8c8fde24fe2c234ac24a925a..f7443babb689a955255520edbc7eeb8a1b80eef9 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -155,7 +155,8 @@
 'add xtaccess' => 'Add External Access',
 'add-route' => 'Additional push route',
 'added from dhcp lease list' => 'Added from DHCP lease list',
-'addons' => 'Addons',
+'addon' => 'Add-On',
+'addons' => 'Add-Ons',
 'admin user password has been changed' => 'Admin user password has been changed.',
 'admin users' => 'User with superuser rights',
 'administrator password' => 'Administrator password',
@@ -489,10 +490,10 @@
 'backup protect key password' => 'Backup key password',
 'backup sets' => 'Backup sets',
 'backup to floppy' => 'Backup to floppy',
-'backupaddon' => 'Addon Backup',
+'backupaddon' => 'Add-on Backup',
 'backupprofile' => 'In case reconnection fails, switch to profile',
 'backups' => 'backups',
-'backupwarning' => 'Import your main backup first and then the backup(s) of the addon configuration(s).<br />Only the backed up addon configuration file(s) will be restored, not the installed addons!<br />Also make sure that the backups keep their original file names.',
+'backupwarning' => 'Import your main backup first and then the backup(s) of the add-on configuration(s).<br />Only the backed up add-on configuration file(s) will be restored, not the installed add-ons!<br />Also make sure that the backups keep their original file names.',
 'bad characters in' => 'Bad characters in ',
 'bad characters in script field' => 'Bad characters in script field',
 'bad characters in the telephone number field' => 'Bad characters in the telephone number field.',
@@ -2057,16 +2058,16 @@
 'pakfire accept all' => 'Do you want to install all packages?',
 'pakfire ago' => 'ago.',
 'pakfire already busy' => 'Pakfire is already performing a task. Please try again later.',
-'pakfire available addons' => 'Available Addons:',
+'pakfire available addons' => 'Available Add-ons:',
 'pakfire configuration' => 'Pakfire Configuration',
-'pakfire core update auto' => 'Install core and addon updates automatically:',
+'pakfire core update auto' => 'Install core and add-on updates automatically:',
 'pakfire core update level' => 'Core-Update-Level',
 'pakfire finished' => 'Pakfire has finished! Returning...',
 'pakfire finished error' => 'Pakfire has finished! Errors occurred, please check the log output before proceeding.',
 'pakfire health check' => 'Check if mirror is reachable (ping):',
 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
 'pakfire install package' => 'You want to install the following packages: ',
-'pakfire installed addons' => 'Installed Addons:',
+'pakfire installed addons' => 'Installed Add-ons:',
 'pakfire invalid tree' => 'Invalid repository selected',
 'pakfire last core list update' => 'Last core list update made',
 'pakfire last package update' => 'Last packages list update made',

diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index ebac2754a92d64b3b9191d8a3291c1433ec1e6c7..bb116b662523272de52431c10adeaf72493eaf2f 100644 (file)
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -95,7 +95,8 @@
 'add xtaccess' => 'Voeg een externe toegang toe',
 'add-route' => 'Extra push route',
 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.',
-'addons' => 'Toevoegingen',
+'addon' => 'Add-On',
+'addons' => 'Add-Ons',
 'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
 'admin users' => 'Gebruiker met beheerdersrechten.',
 'administrator user password' => 'Beheerderswachtwoord:',
@@ -400,10 +401,10 @@
 'backup protect key password' => 'Back-up sleutelwachtwoord',
 'backup sets' => 'Back-up sets',
 'backup to floppy' => 'Back-up naar floppy',
-'backupaddon' => 'Back-up toevoeging',
+'backupaddon' => 'Back-up add-on',
 'backupprofile' => 'In geval het opnieuw verbinden mislukt, schakel dan over naar profiel',
 'backups' => 'back-ups',
-'backupwarning' => 'Importeer eerst uw hoofdback-up en dan de back-up(en) van de addon configuratie(s).<br />Alleen de configuratiebestanden van de addons waarvan een backup is gemaakt worden hersteld, niet de geïnstalleerde addons!<br />Zorg er ook voor dat de back-ups hun oorspronkelijke bestandsnamen behouden.',
+'backupwarning' => 'Importeer eerst uw hoofdback-up en dan de back-up(en) van de add-on configuratie(s).<br />Alleen de configuratiebestanden van de add-ons waarvan een backup is gemaakt worden hersteld, niet de geïnstalleerde add-ons!<br />Zorg er ook voor dat de back-ups hun oorspronkelijke bestandsnamen behouden.',
 'bad characters in' => 'Ongeldige tekens in ',
 'bad characters in script field' => 'Ongeldige tekens in scriptveld',
 'bad characters in the telephone number field' => 'Ongeldige tekens in telefoonnummerveld',
@@ -1694,14 +1695,14 @@
 'pak update' => 'Opwaardering',
 'pakfire accept all' => 'Wilt u alle pakketten installeren?',
 'pakfire ago' => 'geleden.',
-'pakfire available addons' => 'Beschikbare extensies:',
+'pakfire available addons' => 'Beschikbare add-ons:',
 'pakfire configuration' => 'Pakfire configuratie',
 'pakfire core update auto' => 'Installeer core- en extensie-updates automatisch:',
 'pakfire core update level' => 'Core-updateniveau',
 'pakfire health check' => 'Controleer of de mirror bereikbaar is  (ping):',
 'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en klik op de plus om te installeren.',
 'pakfire install package' => 'U wilt de volgende pakketten installeren: ',
-'pakfire installed addons' => 'Geïnstalleerde extensies:',
+'pakfire installed addons' => 'Geïnstalleerde add-ons:',
 'pakfire last core list update' => 'Laatste core-lijst update gemaakt',
 'pakfire last package update' => 'Laatste pakketlijst update gemaakt',
 'pakfire last serverlist update' => 'Laatste serverlijst update gemaakt',