aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-09-30 07:56:24 +0000
committerMario <mario@mariovavti.com>2022-09-30 07:56:24 +0000
commit624bb1db8dcab12494bd4f64c74f288bceea77a2 (patch)
tree6ea43842fd7315b0dd792ea7b7601ed56ee9062d
parent931da3b4f7d709b429f81ab7ff67caada2a81c43 (diff)
parent9f522bbe6c91e0ab2a2c5999f29f27f4dba7f364 (diff)
downloadvolse-hubzilla-624bb1db8dcab12494bd4f64c74f288bceea77a2.tar.gz
volse-hubzilla-624bb1db8dcab12494bd4f64c74f288bceea77a2.tar.bz2
volse-hubzilla-624bb1db8dcab12494bd4f64c74f288bceea77a2.zip
Merge branch 'dev' into 7.8RC
-rw-r--r--view/ca/hstrings.php1
-rw-r--r--view/de-de/hstrings.php1
2 files changed, 0 insertions, 2 deletions
diff --git a/view/ca/hstrings.php b/view/ca/hstrings.php
index d2954b2b7..8d4d75873 100644
--- a/view/ca/hstrings.php
+++ b/view/ca/hstrings.php
@@ -2300,7 +2300,6 @@ App::$strings["Diaspora Protocol Settings"] = "Configuració del Protocol de DiÃ
App::$strings["No username found in import file."] = "No s'ha trobat el nom d'usuari en el fitxer d'importació.";
App::$strings["Unable to create a unique channel address. Import failed."] = "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear.";
App::$strings["Your account on %s will expire in a few days."] = "El teu compte a %s caducarà d'aquí a pocs dies.";
-App::$strings["Your $Productname test account is about to expire."] = "El teu compte de prova a $Productname està a punt de caducar.";
App::$strings["Enable Rainbowtag"] = "Activa el Rainbowtag";
App::$strings["Rainbowtag Settings"] = "Configuració de Rainbowtag";
App::$strings["Rainbowtag Settings saved."] = "S'ha desat la configuració del Rainbowtag.";
diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php
index c9ef4ace1..df3e25bb8 100644
--- a/view/de-de/hstrings.php
+++ b/view/de-de/hstrings.php
@@ -749,7 +749,6 @@ App::$strings["Directory to store rotated logs"] = "Verzeichnis, in dem rotierte
App::$strings["Logfile size in bytes before rotating"] = "zu erreichende Logdateigröße in Bytes, bevor rotiert wird";
App::$strings["Number of logfiles to retain"] = "Anzahl aufzubewahrender rotierter Logdateien";
App::$strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen ablaufen.";
-App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Konto wird bald auslaufen.";
App::$strings["Hide Aside App"] = "Hide Aside App";
App::$strings["Fade out aside areas after a while when using endless scroll"] = "Ausblenden von Randbereichen nach einer Weile bei Verwendung des Endlos-Scrollens";
App::$strings["Some setting"] = "Einige Einstellungen";