diff options
| author | Christian Reiner <arkascha@balder.site> | 2012-09-28 13:31:01 +0200 |
|---|---|---|
| committer | Christian Reiner <arkascha@balder.site> | 2012-09-28 13:31:01 +0200 |
| commit | 4dbd4c35c510bb1db1d3d63c13c3f8a85255f527 (patch) | |
| tree | 346064949986b5c6605e10d3b5d644b835aee72e /lib | |
| parent | 743826bbf34b82b92371cf7e9b0478897188c046 (diff) | |
| parent | 5144d26088b98685a37c73c776a9a47203efa68a (diff) | |
| download | nextcloud-server-4dbd4c35c510bb1db1d3d63c13c3f8a85255f527.tar.gz nextcloud-server-4dbd4c35c510bb1db1d3d63c13c3f8a85255f527.zip | |
Merge branch 'master' of git://github.com/owncloud/core
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/de.php | 4 | ||||
| -rwxr-xr-x | lib/util.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/l10n/de.php b/lib/l10n/de.php index aea631aba28..8c81be16582 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -11,10 +11,10 @@ "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Authentifizierungs-Fehler", -"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.", +"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.", "seconds ago" => "Vor wenigen Sekunden", "1 minute ago" => "Vor einer Minute", -"%d minutes ago" => "Vor %d Minute(n)", +"%d minutes ago" => "Vor %d Minuten", "today" => "Heute", "yesterday" => "Gestern", "%d days ago" => "Vor %d Tag(en)", diff --git a/lib/util.php b/lib/util.php index b14664c9d1e..777cb7a28fc 100755 --- a/lib/util.php +++ b/lib/util.php @@ -81,7 +81,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user - return array(4,84,10); + return array(4,85,11); } /** @@ -89,7 +89,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '4.5 beta 4'; + return '4.5 RC 1'; } /** |