From: "Adolf Belka (ipfire)" <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Add Spanish translations for Captive Portal
Date: Mon, 22 Feb 2021 17:40:56 +0100 [thread overview]
Message-ID: <d2664cb6-6504-07c3-4d6d-45190966a023@ipfire.org> (raw)
In-Reply-To: <01D1F0FF-1D21-4A89-A98E-921A153EAF50@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 16576 bytes --]
Hi Michael,
On 22/02/2021 14:46, Michael Tremer wrote:
> Hello Adolf,
>
> Thank you for helping Robert to upstream his changes :)
>
> I changed the author on the commit to give him credit, and you are still part of it if course in the Signed-off-by: line.
>
> If you pick up any changes from somebody else, you can do this yourself by using —-author with “git commit”.
I thought I should get Roberto as the author but I couldn't figure out how. Now I know for the future :-).
Thanks very much.
>
> I also found why the Polish file has changed:
>
> https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=72c8478ee5233b8556cdce55238e3dce4676fb7f
Interesting. That makes sense now why I was seeing what I did. Also good that it has been found and corrected.
Regards,
Adolf.
>
> Best,
> -Michael
>
>> On 21 Feb 2021, at 11:11, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> - Spanish translations for Captive Portal provided by Roberto Peña
>> - Ran ./make lang before adding translations and git status was clear
>> - Ran ./make lang after adding translations and git status included also
>> doc/language_issues.pl although I did not change anything for Polish
>> and it was clear before making any changes
>>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> doc/language_issues.es | 54 +++++++++++++++++-------------------------
>> doc/language_issues.pl | 54 +++++++++++++++++-------------------------
>> doc/language_missings | 54 ------------------------------------------
>> langs/es/cgi-bin/es.pl | 54 ++++++++++++++++++++++++++++++++++++++++++
>> 4 files changed, 98 insertions(+), 118 deletions(-)
>>
>> diff --git a/doc/language_issues.es b/doc/language_issues.es
>> index 82d65d99c..a54428362 100644
>> --- a/doc/language_issues.es
>> +++ b/doc/language_issues.es
>> @@ -1,3 +1,25 @@
>> +WARNING: translation string unused: Captive 1day
>> +WARNING: translation string unused: Captive 1month
>> +WARNING: translation string unused: Captive 1week
>> +WARNING: translation string unused: Captive activate
>> +WARNING: translation string unused: Captive auth_lic
>> +WARNING: translation string unused: Captive auth_vou
>> +WARNING: translation string unused: Captive err doublevoucher
>> +WARNING: translation string unused: Captive expire
>> +WARNING: translation string unused: Captive heading terms
>> +WARNING: translation string unused: Captive heading voucher
>> +WARNING: translation string unused: Captive invalid coupon
>> +WARNING: translation string unused: Captive invalid logosize
>> +WARNING: translation string unused: Captive invalid_voucher
>> +WARNING: translation string unused: Captive ip
>> +WARNING: translation string unused: Captive logo_set
>> +WARNING: translation string unused: Captive noexpiretime
>> +WARNING: translation string unused: Captive nr
>> +WARNING: translation string unused: Captive please enter a coupon code
>> +WARNING: translation string unused: Captive time
>> +WARNING: translation string unused: Captive voactive
>> +WARNING: translation string unused: Captive voucher
>> +WARNING: translation string unused: Captive vout
>> WARNING: translation string unused: Client status and controlc
>> WARNING: translation string unused: ConnSched scheduler
>> WARNING: translation string unused: ConnSched select profile
>> @@ -752,40 +774,8 @@ WARNING: translation string unused: xtaccess bad transfert
>> WARNING: translation string unused: year-graph
>> WARNING: translation string unused: yearly firewallhits
>> WARNING: untranslated string: 24 hours = 24 Hours
>> -WARNING: untranslated string: Captive = Captive Portal
>> WARNING: untranslated string: Captive ACTIVATE = unknown string
>> -WARNING: untranslated string: Captive GAIN ACCESS = GAIN ACCESS
>> -WARNING: untranslated string: Captive WiFi coupon = WiFi Coupon
>> -WARNING: untranslated string: Captive activated = Activated
>> -WARNING: untranslated string: Captive active on = Activated on
>> -WARNING: untranslated string: Captive agree tac = I agree with the terms & conditions below.
>> -WARNING: untranslated string: Captive authentication = Type of Access
>> -WARNING: untranslated string: Captive brand color = Brand Color
>> -WARNING: untranslated string: Captive branding = Branding
>> -WARNING: untranslated string: Captive client session expiry time = Session Expiry Time
>> WARNING: untranslated string: Captive clients = unknown string
>> -WARNING: untranslated string: Captive config = Settings
>> -WARNING: untranslated string: Captive coupon = Coupon
>> -WARNING: untranslated string: Captive delete logo = Delete Logo
>> -WARNING: untranslated string: Captive expiry time = Expiry Time
>> -WARNING: untranslated string: Captive export coupons = Export Coupons
>> -WARNING: untranslated string: Captive generate coupons = Generate Coupons
>> -WARNING: untranslated string: Captive generated coupon no = Number of coupons
>> -WARNING: untranslated string: Captive issued coupons = Issued Coupons
>> -WARNING: untranslated string: Captive logo uploaded = Logo uploaded
>> -WARNING: untranslated string: Captive mac = MAC Address
>> -WARNING: untranslated string: Captive nolimit = unlimited
>> -WARNING: untranslated string: Captive please accept the terms and conditions = Please accept the terms & conditions
>> -WARNING: untranslated string: Captive portal = IPFire Captive Portal
>> -WARNING: untranslated string: Captive portal coupons = Captive Portal Coupons
>> -WARNING: untranslated string: Captive terms = Terms & Conditions
>> -WARNING: untranslated string: Captive terms short = T&Cs
>> -WARNING: untranslated string: Captive title = Title of Login Page
>> -WARNING: untranslated string: Captive upload logo = Upload Logo
>> -WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels)
>> -WARNING: untranslated string: Captive valid for = Valid for
>> -WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon
>> -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype
>> WARNING: untranslated string: ConnSched dial = Connect
>> WARNING: untranslated string: ConnSched hangup = Disconnect
>> WARNING: untranslated string: ConnSched reboot = Reboot
>> diff --git a/doc/language_issues.pl b/doc/language_issues.pl
>> index 82d65d99c..a54428362 100644
>> --- a/doc/language_issues.pl
>> +++ b/doc/language_issues.pl
>> @@ -1,3 +1,25 @@
>> +WARNING: translation string unused: Captive 1day
>> +WARNING: translation string unused: Captive 1month
>> +WARNING: translation string unused: Captive 1week
>> +WARNING: translation string unused: Captive activate
>> +WARNING: translation string unused: Captive auth_lic
>> +WARNING: translation string unused: Captive auth_vou
>> +WARNING: translation string unused: Captive err doublevoucher
>> +WARNING: translation string unused: Captive expire
>> +WARNING: translation string unused: Captive heading terms
>> +WARNING: translation string unused: Captive heading voucher
>> +WARNING: translation string unused: Captive invalid coupon
>> +WARNING: translation string unused: Captive invalid logosize
>> +WARNING: translation string unused: Captive invalid_voucher
>> +WARNING: translation string unused: Captive ip
>> +WARNING: translation string unused: Captive logo_set
>> +WARNING: translation string unused: Captive noexpiretime
>> +WARNING: translation string unused: Captive nr
>> +WARNING: translation string unused: Captive please enter a coupon code
>> +WARNING: translation string unused: Captive time
>> +WARNING: translation string unused: Captive voactive
>> +WARNING: translation string unused: Captive voucher
>> +WARNING: translation string unused: Captive vout
>> WARNING: translation string unused: Client status and controlc
>> WARNING: translation string unused: ConnSched scheduler
>> WARNING: translation string unused: ConnSched select profile
>> @@ -752,40 +774,8 @@ WARNING: translation string unused: xtaccess bad transfert
>> WARNING: translation string unused: year-graph
>> WARNING: translation string unused: yearly firewallhits
>> WARNING: untranslated string: 24 hours = 24 Hours
>> -WARNING: untranslated string: Captive = Captive Portal
>> WARNING: untranslated string: Captive ACTIVATE = unknown string
>> -WARNING: untranslated string: Captive GAIN ACCESS = GAIN ACCESS
>> -WARNING: untranslated string: Captive WiFi coupon = WiFi Coupon
>> -WARNING: untranslated string: Captive activated = Activated
>> -WARNING: untranslated string: Captive active on = Activated on
>> -WARNING: untranslated string: Captive agree tac = I agree with the terms & conditions below.
>> -WARNING: untranslated string: Captive authentication = Type of Access
>> -WARNING: untranslated string: Captive brand color = Brand Color
>> -WARNING: untranslated string: Captive branding = Branding
>> -WARNING: untranslated string: Captive client session expiry time = Session Expiry Time
>> WARNING: untranslated string: Captive clients = unknown string
>> -WARNING: untranslated string: Captive config = Settings
>> -WARNING: untranslated string: Captive coupon = Coupon
>> -WARNING: untranslated string: Captive delete logo = Delete Logo
>> -WARNING: untranslated string: Captive expiry time = Expiry Time
>> -WARNING: untranslated string: Captive export coupons = Export Coupons
>> -WARNING: untranslated string: Captive generate coupons = Generate Coupons
>> -WARNING: untranslated string: Captive generated coupon no = Number of coupons
>> -WARNING: untranslated string: Captive issued coupons = Issued Coupons
>> -WARNING: untranslated string: Captive logo uploaded = Logo uploaded
>> -WARNING: untranslated string: Captive mac = MAC Address
>> -WARNING: untranslated string: Captive nolimit = unlimited
>> -WARNING: untranslated string: Captive please accept the terms and conditions = Please accept the terms & conditions
>> -WARNING: untranslated string: Captive portal = IPFire Captive Portal
>> -WARNING: untranslated string: Captive portal coupons = Captive Portal Coupons
>> -WARNING: untranslated string: Captive terms = Terms & Conditions
>> -WARNING: untranslated string: Captive terms short = T&Cs
>> -WARNING: untranslated string: Captive title = Title of Login Page
>> -WARNING: untranslated string: Captive upload logo = Upload Logo
>> -WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels)
>> -WARNING: untranslated string: Captive valid for = Valid for
>> -WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon
>> -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype
>> WARNING: untranslated string: ConnSched dial = Connect
>> WARNING: untranslated string: ConnSched hangup = Disconnect
>> WARNING: untranslated string: ConnSched reboot = Reboot
>> diff --git a/doc/language_missings b/doc/language_missings
>> index 0d89426ca..f42be2e77 100644
>> --- a/doc/language_missings
>> +++ b/doc/language_missings
>> @@ -108,60 +108,6 @@
>> < block
>> < broken
>> < capabilities
>> -< Captive
>> -< Captive 1day
>> -< Captive 1month
>> -< Captive 1week
>> -< Captive activate
>> -< Captive activated
>> -< Captive active on
>> -< Captive agree tac
>> -< Captive authentication
>> -< Captive auth_lic
>> -< Captive auth_vou
>> -< Captive brand color
>> -< Captive branding
>> -< Captive client session expiry time
>> -< Captive config
>> -< Captive coupon
>> -< Captive delete logo
>> -< Captive err doublevoucher
>> -< Captive expire
>> -< Captive expiry time
>> -< Captive export coupons
>> -< Captive GAIN ACCESS
>> -< Captive generate coupons
>> -< Captive generated coupon no
>> -< Captive heading terms
>> -< Captive heading voucher
>> -< Captive invalid coupon
>> -< Captive invalid logosize
>> -< Captive invalid_voucher
>> -< Captive ip
>> -< Captive issued coupons
>> -< Captive logo_set
>> -< Captive logo uploaded
>> -< Captive mac
>> -< Captive noexpiretime
>> -< Captive nolimit
>> -< Captive nr
>> -< Captive please accept the terms and conditions
>> -< Captive please enter a coupon code
>> -< Captive portal
>> -< Captive portal coupons
>> -< Captive terms
>> -< Captive terms short
>> -< Captive time
>> -< Captive title
>> -< Captive upload logo
>> -< Captive upload logo recommendations
>> -< Captive valid for
>> -< Captive voactive
>> -< Captive voucher
>> -< Captive vouchervalid
>> -< Captive vout
>> -< Captive WiFi coupon
>> -< Captive wrong ext
>> < ccd add
>> < ccd choose net
>> < ccd clientip
>> diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
>> index 9a39ffd16..ad6a228d8 100644
>> --- a/langs/es/cgi-bin/es.pl
>> +++ b/langs/es/cgi-bin/es.pl
>> @@ -6,6 +6,60 @@
>> 'Add Port Rule' => 'Añadir Regla de Puerto',
>> 'Add Rule' => 'Añadir Regla',
>> 'Add a route' => 'Añadir una route',
>> +'Captive' => 'Portal Cautivo',
>> +'Captive 1day' => '1 día',
>> +'Captive 1month' => '1 mes',
>> +'Captive 1week' => '1 semana',
>> +'Captive GAIN ACCESS' => 'ACCEDER',
>> +'Captive WiFi coupon' => 'WiFi Cupón',
>> +'Captive activate' => 'Activar',
>> +'Captive activated' => 'Activado',
>> +'Captive active on' => 'Activado en',
>> +'Captive agree tac' => 'Estoy de acuerdo con los términos y condiciones de a continuación.',
>> +'Captive auth_lic' => 'Licencia',
>> +'Captive auth_vou' => 'Cupón',
>> +'Captive authentication' => 'Tipo de Acceso',
>> +'Captive brand color' => 'Color de Marca',
>> +'Captive branding' => 'Marca',
>> +'Captive client session expiry time' => 'Caducidad de la Sesión',
>> +'Captive config' => 'Ajustes',
>> +'Captive coupon' => 'Cupón',
>> +'Captive delete logo' => 'Borrar Logo',
>> +'Captive err doublevoucher' => 'Ya existe un cupón con este código',
>> +'Captive expire' => 'Caducar',
>> +'Captive expiry time' => 'Tiempo de caducidad',
>> +'Captive export coupons' => 'Exportar Cupones',
>> +'Captive generate coupons' => 'Generar Cupones',
>> +'Captive generated coupon no' => 'Numero de cupones',
>> +'Captive heading terms' => 'Términos & Condiciones',
>> +'Captive heading voucher' => 'Cupón or Código de Acceso',
>> +'Captive invalid coupon' => 'Ingresó un código de cupón no válido. Inténtalo de nuevo.',
>> +'Captive invalid logosize' => 'El archivo de imagen cargado no cumple con la resolución requerida de al menos 1280x400 pero no mayor de 1920x800 píxeles',
>> +'Captive invalid_voucher' => 'Código inválido. Por favor, inténtalo de nuevo',
>> +'Captive ip' => 'Dirección IP',
>> +'Captive issued coupons' => 'Cupones emitidos',
>> +'Captive logo uploaded' => 'Logo subido',
>> +'Captive logo_set' => 'Logo actual',
>> +'Captive mac' => 'Dirección MAC',
>> +'Captive noexpiretime' => 'No se ha proporcionado un intervalo de tiempo de conexión válido',
>> +'Captive nolimit' => 'ilimitado',
>> +'Captive nr' => 'Número',
>> +'Captive please accept the terms and conditions' => 'Por favor, acepte los términos & condiciones',
>> +'Captive please enter a coupon code' => 'Por favor, introduzca el código de cupón',
>> +'Captive portal' => 'Portal Cautivo Business Secure',
>> +'Captive portal coupons' => 'Cupones del Portal Cautivo',
>> +'Captive terms' => 'Términos & Condiciones',
>> +'Captive terms short' => 'T&Cs',
>> +'Captive time' => 'Tiempo de acceso posterior a la activación (horas)',
>> +'Captive title' => 'Título de la página de inicio de sesión',
>> +'Captive upload logo' => 'Logo subido',
>> +'Captive upload logo recommendations' => '(PNG o JPEG, 1280x720 pixels recomendados)',
>> +'Captive valid for' => 'Válido para',
>> +'Captive voactive' => 'Cupones activos',
>> +'Captive voucher' => 'Cupón',
>> +'Captive vouchervalid' => 'Tiempo permitido para este cupón',
>> +'Captive vout' => 'Cupones emitidos',
>> +'Captive wrong ext' => 'El archivo subido tiene un tipo de archivo incorrecto',
>> 'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.',
>> 'Class' => 'Clase',
>> 'Class was deleted' => 'con subclases potenciales fué eliminado',
>> --
>> 2.30.1
>>
>
prev parent reply other threads:[~2021-02-22 16:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-21 11:11 Adolf Belka
2021-02-22 13:46 ` Michael Tremer
2021-02-22 16:40 ` Adolf Belka (ipfire) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d2664cb6-6504-07c3-4d6d-45190966a023@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox