wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:owncloud/core into vcategories_db

Browse source
This commit is contained in:
Thomas Tanghus 2012-10-03 17:44:34 +02:00
commit 667d60e133
14 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_external/l10n/de.php
View file

@ -1,4 +1,10 @@
<?php $TRANSLATIONS = array(
"Access granted" => "Zugriff erlaubt",
"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
"Grant access" => "Zugriff erlauben",
"Fill out all required fields" => "Alle notwendigen Felder füllen",
"Please provide a valid Dropbox app key and secret." => "Bitte geben Sie einen gültigen Dropbox-App-Key mit Secret ein.",
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
"External Storage" => "Externer Speicher",
"Mount point" => "Mount-Point",
"Backend" => "Backend",

5
apps/files_external/l10n/it.php
View file

@ -1,4 +1,9 @@
<?php $TRANSLATIONS = array(
"Access granted" => "Accesso consentito",
"Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
"Grant access" => "Concedi l'accesso",
"Fill out all required fields" => "Compila tutti i campi richiesti",
"Error configuring Google Drive storage" => "Errore durante la configurazione dell'archivio Google Drive",
"External Storage" => "Archiviazione esterna",
"Mount point" => "Punto di mount",
"Backend" => "Motore",

17
l10n/de/files_external.po
View file

@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# I Robot <thomas.mueller@tmit.eu>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"PO-Revision-Date: 2012-10-02 21:17+0000\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: 2012-10-02 21:25+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@ -21,27 +22,27 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
msgid "Access granted"
msgstr ""
msgstr "Zugriff erlaubt"
#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
msgid "Error configuring Dropbox storage"
msgstr ""
msgstr "Fehler beim Einrichten von Dropbox"
#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
msgstr ""
msgstr "Zugriff erlauben"
#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
msgstr ""
msgstr "Alle notwendigen Felder füllen"
#: js/dropbox.js:85
msgid "Please provide a valid Dropbox app key and secret."
msgstr ""
msgstr "Bitte geben Sie einen gültigen Dropbox-App-Key mit Secret ein."
#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
msgstr ""
msgstr "Fehler beim Einrichten von Google Drive"
#: templates/settings.php:3
msgid "External Storage"

16
l10n/it/files_external.po
View file

@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"PO-Revision-Date: 2012-10-02 21:17+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: 2012-10-02 21:34+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -21,19 +21,19 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
msgid "Access granted"
msgstr ""
msgstr "Accesso consentito"
#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
msgid "Error configuring Dropbox storage"
msgstr ""
msgstr "Errore durante la configurazione dell'archivio Dropbox"
#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
msgstr ""
msgstr "Concedi l'accesso"
#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
msgstr ""
msgstr "Compila tutti i campi richiesti"
#: js/dropbox.js:85
msgid "Please provide a valid Dropbox app key and secret."
@ -41,7 +41,7 @@ msgstr ""
#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
msgstr ""
msgstr "Errore durante la configurazione dell'archivio Google Drive"
#: templates/settings.php:3
msgid "External Storage"

2
l10n/templates/core.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/files.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/files_encryption.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/files_external.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/files_sharing.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/files_versions.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/lib.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/settings.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
l10n/templates/user_ldap.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-02 23:16+0200\n"
"POT-Creation-Date: 2012-10-03 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

4
lib/util.php
View file

@ -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,86,11);
return array(4,87,12);
}
/**
@ -89,7 +89,7 @@ class OC_Util {
* @return string
*/
public static function getVersionString() {
return '4.5 RC 1';
return '4.5 RC 2';
}
/**