Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support

diff --cc apps/calendar/l10n/ru.php
Simple merge

diff --cc apps/contacts/l10n/ca.php
Simple merge

diff --cc apps/contacts/l10n/cs_CZ.php
Simple merge

diff --cc apps/contacts/l10n/el.php
Simple merge

diff --cc apps/contacts/l10n/fr.php
Simple merge

diff --cc apps/contacts/l10n/it.php
Simple merge

diff --cc apps/contacts/l10n/nl.php
index bcf93c506a9889e1ce13084eea389fbb50fd92c5,7c85dd7ce9394529c44ca62828be2c1bf09f3680..a8646e9d4e22473de420bb73b03452227bcbe2d9
--- 1/apps/contacts/l10n/nl.php
--- 2/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@@ -103,14 -197,11 +197,17 @@@
  "create a new addressbook" => "Maak een nieuw adresboek",
  "Name of new addressbook" => "Naam van nieuw adresboek",
  "Importing contacts" => "Importeren van contacten",
 +"Contacts imported successfully" => "Contacten zijn geïmporteerd",
 +"Close Dialog" => "Sluit venster",
 +"Import Addressbook" => "Importeer adresboek",
 +"Select address book to import to:" => "Selecteer adresboek voor import:",
 +"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
 +"Select from HD" => "Selecteer van schijf",
  "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
  "Add contact" => "Contactpersoon toevoegen",
+ "Select Address Books" => "Selecteer adresboeken",
+ "Enter name" => "Naam",
+ "Enter description" => "Beschrijving",
  "CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
  "more info" => "meer informatie",
  "Primary address (Kontact et al)" => "Standaardadres",

diff --cc apps/contacts/l10n/sl.php
Simple merge

diff --cc apps/files/l10n/nl.php
Simple merge

diff --cc apps/files/l10n/pt_BR.php
Simple merge

diff --cc apps/files/l10n/zh_CN.php
Simple merge