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

2 files changed, 48 insertions, 6 deletions

diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index 834c0ad9054..bc0954abe29 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -1,7 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Niet alle agenda's zijn volledig gecached",
+"Everything seems to be completely cached" => "Alles lijkt volledig gecached te zijn",
 "No calendars found." => "Geen kalenders gevonden.",
 "No events found." => "Geen gebeurtenissen gevonden.",
 "Wrong calendar" => "Verkeerde kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Het bestand bevat geen gebeurtenissen of alle gebeurtenissen worden al in uw agenda bewaard.",
+"events has been saved in the new calendar" => "De gebeurtenissen worden in de nieuwe agenda bewaard",
+"Import failed" => "import is gefaald",
+"events has been saved in your calendar" => "de gebeurtenissen zijn in uw agenda opgeslagen ",
 "New Timezone:" => "Nieuwe tijdszone:",
 "Timezone changed" => "Tijdzone is veranderd",
 "Invalid request" => "Ongeldige aanvraag",
@@ -27,6 +33,7 @@
 "Projects" => "Projecten",
 "Questions" => "Vragen",
 "Work" => "Werk",
+"by" => "door",
 "unnamed" => "onbekend",
 "New Calendar" => "Nieuwe Kalender",
 "Does not repeat" => "Wordt niet herhaald",
@@ -73,6 +80,25 @@
 "by day and month" => "per dag en maand",
 "Date" => "Datum",
 "Cal." => "Cal.",
+"Sun." => "Zon.",
+"Mon." => "Maa.",
+"Tue." => "Din.",
+"Wed." => "Woe.",
+"Thu." => "Don.",
+"Fri." => "Vrij.",
+"Sat." => "Zat.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Maa.",
+"Apr." => "Apr.",
+"May." => "Mei.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "Hele dag",
 "Missing fields" => "missende velden",
 "Title" => "Titel",
@@ -86,6 +112,7 @@
 "Month" => "Maand",
 "List" => "Lijst",
 "Today" => "Vandaag",
+"Settings" => "Instellingen",
 "Your calendars" => "Je kalenders",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Gedeelde kalenders",
@@ -136,7 +163,10 @@
 "occurrences" => "gebeurtenissen",
 "create a new calendar" => "Maak een nieuw agenda",
 "Import a calendar file" => "Importeer een agenda bestand",
+"Please choose a calendar" => "Kies een agenda",
 "Name of new calendar" => "Naam van de nieuwe agenda",
+"Take an available name!" => "Kies een beschikbare naam!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Een agenda met deze naam bestaat al.  Als u doorgaat, worden deze agenda's samengevoegd",
 "Import" => "Importeer",
 "Close Dialog" => "Sluit venster",
 "Create a new event" => "Maak een nieuwe afspraak",
@@ -144,9 +174,21 @@
 "No categories selected" => "Geen categorieën geselecteerd",
 "of" => "van",
 "at" => "op",
+"General" => "Algemeen",
 "Timezone" => "Tijdzone",
+"Update timezone automatically" => "Werk de tijdzone automatisch bij",
+"Time format" => "Tijd formaat",
 "24h" => "24uur",
 "12h" => "12uur",
+"Start week on" => "Begin de week op",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Leeg cache voor repeterende gebeurtenissen",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "Agenda CalDAV synchronisatie adres",
+"more info" => "meer informatie",
+"Primary address (Kontact et al)" => "Primary adres (voor Kontact en dergelijke)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Alleen lezen iCalendar link(en)",
 "Users" => "Gebruikers",
 "select users" => "kies gebruikers",
 "Editable" => "Te wijzigen",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index fbf5ec5ff74..ba0be30df19 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -22,7 +22,7 @@
 "Business" => "Бизнес",
 "Call" => "Звонить",
 "Clients" => "Клиенты",
-"Deliverer" => "Доставщик",
+"Deliverer" => "Посыльный",
 "Holidays" => "Праздники",
 "Ideas" => "Идеи",
 "Journey" => "Поездка",
@@ -115,13 +115,13 @@
 "Settings" => "Параметры",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
-"Shared calendars" => "Общие календари",
-"No shared calendars" => "Нет общих календарей",
-"Share Calendar" => "Сделать календарь общим",
+"Shared calendars" => "Опубликованные",
+"No shared calendars" => "Нет опубликованных календарей",
+"Share Calendar" => "Опубликовать",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
-"shared with you by" => "с вами поделился",
+"shared with you by" => "опубликовал для вас",
 "New calendar" => "Новый календарь",
 "Edit calendar" => "Редактировать календарь",
 "Displayname" => "Отображаемое имя",
@@ -136,7 +136,7 @@
 "Repeating" => "Повторение",
 "Alarm" => "Сигнал",
 "Attendees" => "Участники",
-"Share" => "Поделиться",
+"Share" => "Опубликовать",
 "Title of the Event" => "Название событие",
 "Category" => "Категория",
 "Separate categories with commas" => "Разделяйте категории запятыми",