diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2014-05-28 22:57:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@owncloud.com> | 2014-05-28 22:57:33 +0200 |
| commit | 5754b0b9e70824786878b847abb6b728ca0414bb (patch) | |
| tree | 9ad1fbc35edde8f54f44c9ef7029e007a16815b9 /core/l10n/is.php | |
| parent | f81ee94cad8a997c3a2fef0b6aac4f8d509571f6 (diff) | |
| parent | ce9d5df6df37e51587dcde638086dfe501892b56 (diff) | |
| download | nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.tar.gz nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.zip | |
Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command
* owncloud/master: (238 commits)
Change visibility of scanner internals
[tx-robot] updated from transifex
remove legacy OC_Filesystem being used in a hook callback
add title property to share dialog
forgotten infobox messages translations
reverts 188c543 and translates only mail
fix warning text and margin
Adjust core apps to use "requiremin" instead of "require"
Added requiremin/requiremax fields for apps
[tx-robot] updated from transifex
unwrapped strings fix
allow resharing of files with only share permissions
don't lose file size during rename
drop superflous statement in phpdoc
add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
[tx-robot] updated from transifex
fix grammar
make user_ldap fully translatable
[tx-robot] updated from transifex
fix typo
...
Conflicts:
core/register_command.php
Diffstat (limited to 'core/l10n/is.php')
| -rw-r--r-- | core/l10n/is.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/l10n/is.php b/core/l10n/is.php index 254c4b38689..dcce228e243 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -31,9 +31,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "síðasta ári", "years ago" => "einhverjum árum", -"Choose" => "Veldu", "Yes" => "Já", "No" => "Nei", +"Choose" => "Veldu", "Ok" => "Í lagi", "_{count} file conflict_::_{count} file conflicts_" => array("",""), "Cancel" => "Hætta við", @@ -46,7 +46,6 @@ $TRANSLATIONS = array( "Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}", "Shared with you by {owner}" => "Deilt með þér af {owner}", "Password protect" => "Verja með lykilorði", -"Password" => "Lykilorð", "Email link to person" => "Senda vefhlekk í tölvupóstu til notenda", "Send" => "Senda", "Set expiration date" => "Setja gildistíma", @@ -90,6 +89,7 @@ $TRANSLATIONS = array( "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.", "Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>", +"Password" => "Lykilorð", "Data folder" => "Gagnamappa", "Configure the database" => "Stilla gagnagrunn", "will be used" => "verður notað", |