aboutsummaryrefslogtreecommitdiffstats
path: root/view/ca
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-20 13:42:33 +0200
committerzottel <github@zottel.net>2012-04-20 13:42:33 +0200
commit9663299da1be50eef4327778fae619fc6f9edef4 (patch)
tree5cd9b93f16c344cf896ac8d4e2a4a818fe21e783 /view/ca
parent041f74dc775424f686a1cd95c00e0d63bfc4b99c (diff)
parent0e25376e4afea4e5d96c233594feef0a35ca314c (diff)
downloadvolse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.gz
volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.bz2
volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.zip
Merge remote branch 'upstream/master'
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";