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/sr@latin.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/sr@latin.php')
| -rw-r--r-- | core/l10n/sr@latin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php index e7783b3c023..9b10179b722 100644 --- a/core/l10n/sr@latin.php +++ b/core/l10n/sr@latin.php @@ -30,9 +30,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "prošle godine", "years ago" => "pre nekoliko godina", -"Choose" => "Izaberi", "Yes" => "Da", "No" => "Ne", +"Choose" => "Izaberi", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), "Cancel" => "Otkaži", @@ -45,7 +45,6 @@ $TRANSLATIONS = array( "Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ", "Shared with you by {owner}" => "Sa vama podelio {owner}", "Password protect" => "Zaštita lozinkom", -"Password" => "Lozinka", "Email link to person" => "Pošalji link e-mailom", "Send" => "Pošalji", "Set expiration date" => "Datum isteka", @@ -91,6 +90,7 @@ $TRANSLATIONS = array( "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.", "Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>", +"Password" => "Lozinka", "Data folder" => "Fascikla podataka", "Configure the database" => "Podešavanje baze", "will be used" => "će biti korišćen", |