diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
| commit | 0ce35af02acb2fa9fe0ef401dc75345b5114e3d6 (patch) | |
| tree | 5ff19a7cc1bce5901cfeec7e11179ed2682b9e78 /core/l10n/sl.php | |
| parent | 7c296a6cf915da6630422ceb8e253ebf9f004964 (diff) | |
| parent | a89199cc7bd19f6ba3e76fcd510219b2bd930ae6 (diff) | |
| download | nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.tar.gz nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.zip | |
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
Diffstat (limited to 'core/l10n/sl.php')
| -rw-r--r-- | core/l10n/sl.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 397ede93fd4..0b72f1dc4e4 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -41,7 +41,6 @@ $TRANSLATIONS = array( "last year" => "lansko leto", "years ago" => "let nazaj", "Choose" => "Izbor", -"Cancel" => "Prekliči", "Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta", "Yes" => "Da", "No" => "Ne", @@ -134,8 +133,6 @@ $TRANSLATIONS = array( "Log in" => "Prijava", "Alternative Logins" => "Druge prijavne možnosti", "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!", -"prev" => "nazaj", -"next" => "naprej", "Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno." ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; |