Commit 2754e913 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent d153f4ed
......@@ -4,7 +4,7 @@ CurrencyCodeIsoNumeric3=442
#Context for Name: Adjectival Country Name and Currency Name
Name=Luxembourgish Franc
Name[ca]=Franc luxemburguès
Name[ca@valencia]=Franc luxemburguera
Name[ca@valencia]=Franc luxemburgués
Name[cs]=Lucemburský frank
Name[de]=Luxemburgischer Franc
Name[en_GB]=Luxembourgish Franc
......
......@@ -16,6 +16,7 @@ Name[uk]=Grand Trunk
Name[x-test]=xxGrand Trunkxx
Comment=You can get the list of supported currencies from <a href="https://currencies.apps.grandtrunk.net/currencies">here</a>.<br/>Then, enter the expected currency.
Comment[ca]=Podeu obtenir la llista de les divises admeses <a href="https://currencies.apps.grandtrunk.net/currencies">aquí</a>.<br/>Després introduïu la divisa esperada.
Comment[ca@valencia]=Podeu obtindre la llista de les divises admeses <a href="https://currencies.apps.grandtrunk.net/currencies">ací</a>.<br/>Després introduïu la divisa esperada.
Comment[en_GB]=You can get the list of supported currencies from <a href="https://currencies.apps.grandtrunk.net/currencies">here</a>.<br/>Then, enter the expected currency.
Comment[es]=Puede obtener la lista de las monedas permitidas de <a href="https://currencies.apps.grandtrunk.net/currencies">aquí</a>.<br/>A continuación, introduzca la moneda esperada.
Comment[et]=Toetatud vääringute loendi võib hankida <a href="https://currencies.apps.grandtrunk.net/currencies">siit</a>.<br/>Seejärel sisesta oodatav vääring.
......
[Desktop Entry]
Name=RatesAPI
Name[ca]=RatesAPI
Name[ca@valencia]=RatesAPI
Name[cs]=RatesAPI
Name[en_GB]=RatesAPI
Name[es]=RatesAPI
......@@ -16,6 +17,7 @@ Name[uk]=RatesAPI
Name[x-test]=xxRatesAPIxx
Comment=You can get the list of available quotes from <a href="https://ratesapi.io/">RatesAPI</a>.<br/>Then, enter the expected quote in format CURRENCY/BASE (eg. USD/EUR).
Comment[ca]=Podeu obtenir la llista de les cotitzacions disponibles a <a href="https://ratesapi.io/">RatesAPI</a>.<br/>Després introduïu la cotització desitjada en format DIVISA/BASE (p. ex. USD/EUR).
Comment[ca@valencia]=Podeu obtindre la llista de les cotitzacions disponibles a <a href="https://ratesapi.io/">RatesAPI</a>.<br/>Després introduïu la cotització desitjada en format DIVISA/BASE (p. ex. USD/EUR).
Comment[en_GB]=You can get the list of available quotes from <a href="https://ratesapi.io/">RatesAPI</a>.<br/>Then, enter the expected quote in format CURRENCY/BASE (eg. USD/EUR).
Comment[es]=Puede obtener la lista de las cotizaciones disponibles de <a href="https://ratesapi.io">RatesAPI</a>.<br/>A continuación, introduzca la cotización esperada con el formato DIVISA/BASE (por ejemplo, USD/EUR).
Comment[et]=Saadaolevate kursside loendi võib hankida saidilt <a href="https://ratesapi.io/">RatesAPI</a>.<br/>Seejärel sisesta oodatav kurss kujul VÄÄRING/BAAS (nt USD/EUR).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment