aboutsummaryrefslogtreecommitdiffstats
path: root/view/ca
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-16 08:10:28 +0200
committerMichael <icarus@dabo.de>2012-05-16 08:10:28 +0200
commit2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (patch)
tree8c569c61c06e50c943addc132286d44c2f8ec178 /view/ca
parent188829ed46be6d3c7a91380226e26e8292c327be (diff)
parenta3f08c44be78d4517e9f1619811def09b2ec7e7a (diff)
downloadvolse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.gz
volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.bz2
volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/ca')
-rw-r--r--view/ca/messages.po2
-rw-r--r--view/ca/strings.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/ca/messages.po b/view/ca/messages.po
index 8463ceb12..25c3ce6dc 100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@@ -2910,7 +2910,7 @@ msgstr "Comptes abandonats després de x dies"
#: ../../mod/admin.php:330
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
diff --git a/view/ca/strings.php b/view/ca/strings.php
index e5aed8be6..265058391 100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@@ -654,7 +654,7 @@ $a->strings["Register policy"] = "Política per a registrar";
$a->strings["Register text"] = "Text al registrar";
$a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
$a->strings["Allowed friend domains"] = "Dominis amics permesos";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
$a->strings["Allowed email domains"] = "Dominis de correu permesos";