diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-10-30 06:53:49 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-10-30 06:53:49 +0100 |
| commit | 5550cde03b34e86671652258e7f3bbc2a92b6111 (patch) | |
| tree | ec6dd9ac1465a3ae4b9e4bbffdc1c87b78621b4b /core/l10n/ca.php | |
| parent | d9d8da0a5cee5fac1e5f24a321dd612f312af508 (diff) | |
| parent | 3fdf239b478273155a68ec4ede8d4e4dd54b504d (diff) | |
| download | nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.tar.gz nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
Diffstat (limited to 'core/l10n/ca.php')
| -rw-r--r-- | core/l10n/ca.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/l10n/ca.php b/core/l10n/ca.php index 2445e378ab2..5c7552a4e87 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -38,8 +38,8 @@ "ownCloud password reset" => "estableix de nou la contrasenya Owncloud", "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}", "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.", -"Requested" => "Sol·licitat", -"Login failed!" => "No s'ha pogut iniciar la sessió", +"Reset email send." => "S'ha enviat el correu reinicialització", +"Request failed!" => "El requeriment ha fallat!", "Username" => "Nom d'usuari", "Request reset" => "Sol·licita reinicialització", "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat", @@ -70,7 +70,6 @@ "Database tablespace" => "Espai de taula de la base de dades", "Database host" => "Ordinador central de la base de dades", "Finish setup" => "Acaba la configuració", -"web services under your control" => "controleu els vostres serveis web", "Sunday" => "Diumenge", "Monday" => "Dilluns", "Tuesday" => "Dimarts", @@ -90,6 +89,7 @@ "October" => "Octubre", "November" => "Novembre", "December" => "Desembre", +"web services under your control" => "controleu els vostres serveis web", "Log out" => "Surt", "Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!", "If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!", |