aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/l10n/ar.js28
-rw-r--r--apps/dav/l10n/ar.json28
-rw-r--r--apps/dav/l10n/cs.js57
-rw-r--r--apps/dav/l10n/cs.json57
-rw-r--r--apps/dav/l10n/de.js22
-rw-r--r--apps/dav/l10n/de.json22
-rw-r--r--apps/dav/l10n/de_DE.js57
-rw-r--r--apps/dav/l10n/de_DE.json57
-rw-r--r--apps/dav/l10n/en_GB.js57
-rw-r--r--apps/dav/l10n/en_GB.json57
-rw-r--r--apps/dav/l10n/es.js10
-rw-r--r--apps/dav/l10n/es.json10
-rw-r--r--apps/dav/l10n/es_MX.js10
-rw-r--r--apps/dav/l10n/es_MX.json10
-rw-r--r--apps/dav/l10n/eu.js117
-rw-r--r--apps/dav/l10n/eu.json117
-rw-r--r--apps/dav/l10n/fr.js26
-rw-r--r--apps/dav/l10n/fr.json26
-rw-r--r--apps/dav/l10n/ga.js57
-rw-r--r--apps/dav/l10n/ga.json57
-rw-r--r--apps/dav/l10n/gl.js22
-rw-r--r--apps/dav/l10n/gl.json22
-rw-r--r--apps/dav/l10n/hu.js6
-rw-r--r--apps/dav/l10n/hu.json6
-rw-r--r--apps/dav/l10n/ja.js57
-rw-r--r--apps/dav/l10n/ja.json57
-rw-r--r--apps/dav/l10n/nb.js22
-rw-r--r--apps/dav/l10n/nb.json22
-rw-r--r--apps/dav/l10n/pt_BR.js22
-rw-r--r--apps/dav/l10n/pt_BR.json22
-rw-r--r--apps/dav/l10n/sr.js22
-rw-r--r--apps/dav/l10n/sr.json22
-rw-r--r--apps/dav/l10n/sv.js22
-rw-r--r--apps/dav/l10n/sv.json22
-rw-r--r--apps/dav/l10n/tr.js22
-rw-r--r--apps/dav/l10n/tr.json22
-rw-r--r--apps/dav/l10n/ug.js22
-rw-r--r--apps/dav/l10n/ug.json22
-rw-r--r--apps/dav/l10n/uk.js24
-rw-r--r--apps/dav/l10n/uk.json24
-rw-r--r--apps/dav/l10n/zh_HK.js57
-rw-r--r--apps/dav/l10n/zh_HK.json57
-rw-r--r--apps/dav/l10n/zh_TW.js57
-rw-r--r--apps/dav/l10n/zh_TW.json57
-rw-r--r--apps/dav/lib/CalDAV/Schedule/IMipService.php297
-rw-r--r--apps/dav/lib/CalDAV/Schedule/Plugin.php28
-rw-r--r--apps/dav/lib/Command/FixCalendarSyncCommand.php5
-rw-r--r--apps/dav/lib/Connector/Sabre/FilesPlugin.php5
-rw-r--r--apps/dav/lib/Migration/Version1027Date20230504122946.php2
-rw-r--r--apps/dav/lib/ServerFactory.php5
-rw-r--r--apps/dav/lib/SystemTag/SystemTagList.php1
-rw-r--r--apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap76
-rw-r--r--apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php546
-rw-r--r--apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php2
-rw-r--r--apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php2
55 files changed, 1903 insertions, 658 deletions
diff --git a/apps/dav/l10n/ar.js b/apps/dav/l10n/ar.js
index 085f8fe7c2a..5a89bd9e183 100644
--- a/apps/dav/l10n/ar.js
+++ b/apps/dav/l10n/ar.js
@@ -1,7 +1,7 @@
OC.L10N.register(
"dav",
{
- "Calendar" : "الجدول الزمني",
+ "Calendar" : "التقويم",
"Tasks" : "المهام",
"Personal" : "خاص",
"{actor} created calendar {calendar}" : "{actor} قام بإنشاء تقويم {calendar}",
@@ -72,10 +72,10 @@ OC.L10N.register(
"Description: %s" : "الوصف: %s",
"Where: %s" : "المكان: %s",
"%1$s via %2$s" : "%1$s عبر %2$s",
- "In a %1$s on %2$s for the entire day" : "عند %1$s في %2$s كامل اليوم",
- "In a %1$s on %2$s between %3$s - %4$s" : "عند %1$s في %2$s بين %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "عند %1$s %2$s في %3$s كامل اليوم",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "عند %1$s %2$s في %3$s بين %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "في الماضي في %1$s لكامل اليوم",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["في %n دقيقة في %1$s لكامل اليوم","في %1$s for the entire day","في %n دقيقة في %1$s لكامل اليوم","في %n دقائق في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["في %n ساعة في %1$s لكامل اليوم","في ساعة واحدة في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعات في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعة في %1$s لكل اليوم"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["في%n يوم في %1$s لكامل اليوم","في يوم واحد في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم","في %n أيام في %1$s لكامل ايوم","في %n يوم في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم"],
"Could not generate when statement" : "يتعذّر تكوين عبارة \"متى\"",
"Every Day for the entire day" : "كل يوم لكامل اليوم",
"Every Day for the entire day until %1$s" : "كل يوم كامل اليوم حتى %1$s",
@@ -112,12 +112,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "كل %1$d سنة في %2$s أيام %3$s بين %4$s - %5$s حتى %6$s",
"On specific dates for the entire day until %1$s" : "في تورايخ محددة كامل اليوم حتى%1$s",
"On specific dates between %1$s - %2$s until %3$s" : "في تواريخ محددة بين %1$s - %2$s حتى %3$s",
- "In a %1$s on %2$s" : "عند %1$s في %2$s",
- "In a %1$s on %2$s then on %3$s" : "عند %1$s في %2$s ثم في%3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "عند %1$s في %2$s ثم في %3$s و %4$s",
- "In %1$s %2$s on %3$s" : "عند %1$s %2$s في %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "عند %1$s %2$s في %3$s ثم في %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "عند %1$s %2$s في %3$s ثم في %4$s و%5$s",
"Could not generate next recurrence statement" : "يتعذّر توليد عبارة التكرار التالي",
"Cancelled: %1$s" : "مُلغىً: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" تمّ إلغاؤه",
@@ -288,6 +282,16 @@ OC.L10N.register(
"Could not open file" : "تعذّر فتح الملف",
"Invalid chunk name" : "اسم كتلة chunk غير صحيح",
"Could not rename part file assembled from chunks" : "تعذّرت إعادة تسمية ملف جزئي مُجمّعٍ من كُتلٍ chunks",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه.",
+ "In a %1$s on %2$s for the entire day" : "عند %1$s في %2$s كامل اليوم",
+ "In a %1$s on %2$s between %3$s - %4$s" : "عند %1$s في %2$s بين %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "عند %1$s %2$s في %3$s كامل اليوم",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "عند %1$s %2$s في %3$s بين %4$s - %5$s",
+ "In a %1$s on %2$s" : "عند %1$s في %2$s",
+ "In a %1$s on %2$s then on %3$s" : "عند %1$s في %2$s ثم في%3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "عند %1$s في %2$s ثم في %3$s و %4$s",
+ "In %1$s %2$s on %3$s" : "عند %1$s %2$s في %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "عند %1$s %2$s في %3$s ثم في %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "عند %1$s %2$s في %3$s ثم في %4$s و%5$s"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/dav/l10n/ar.json b/apps/dav/l10n/ar.json
index 503bfbccdaf..a0b32101633 100644
--- a/apps/dav/l10n/ar.json
+++ b/apps/dav/l10n/ar.json
@@ -1,5 +1,5 @@
{ "translations": {
- "Calendar" : "الجدول الزمني",
+ "Calendar" : "التقويم",
"Tasks" : "المهام",
"Personal" : "خاص",
"{actor} created calendar {calendar}" : "{actor} قام بإنشاء تقويم {calendar}",
@@ -70,10 +70,10 @@
"Description: %s" : "الوصف: %s",
"Where: %s" : "المكان: %s",
"%1$s via %2$s" : "%1$s عبر %2$s",
- "In a %1$s on %2$s for the entire day" : "عند %1$s في %2$s كامل اليوم",
- "In a %1$s on %2$s between %3$s - %4$s" : "عند %1$s في %2$s بين %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "عند %1$s %2$s في %3$s كامل اليوم",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "عند %1$s %2$s في %3$s بين %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "في الماضي في %1$s لكامل اليوم",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["في %n دقيقة في %1$s لكامل اليوم","في %1$s for the entire day","في %n دقيقة في %1$s لكامل اليوم","في %n دقائق في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["في %n ساعة في %1$s لكامل اليوم","في ساعة واحدة في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعات في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعة في %1$s لكل اليوم"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["في%n يوم في %1$s لكامل اليوم","في يوم واحد في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم","في %n أيام في %1$s لكامل ايوم","في %n يوم في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم"],
"Could not generate when statement" : "يتعذّر تكوين عبارة \"متى\"",
"Every Day for the entire day" : "كل يوم لكامل اليوم",
"Every Day for the entire day until %1$s" : "كل يوم كامل اليوم حتى %1$s",
@@ -110,12 +110,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "كل %1$d سنة في %2$s أيام %3$s بين %4$s - %5$s حتى %6$s",
"On specific dates for the entire day until %1$s" : "في تورايخ محددة كامل اليوم حتى%1$s",
"On specific dates between %1$s - %2$s until %3$s" : "في تواريخ محددة بين %1$s - %2$s حتى %3$s",
- "In a %1$s on %2$s" : "عند %1$s في %2$s",
- "In a %1$s on %2$s then on %3$s" : "عند %1$s في %2$s ثم في%3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "عند %1$s في %2$s ثم في %3$s و %4$s",
- "In %1$s %2$s on %3$s" : "عند %1$s %2$s في %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "عند %1$s %2$s في %3$s ثم في %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "عند %1$s %2$s في %3$s ثم في %4$s و%5$s",
"Could not generate next recurrence statement" : "يتعذّر توليد عبارة التكرار التالي",
"Cancelled: %1$s" : "مُلغىً: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" تمّ إلغاؤه",
@@ -286,6 +280,16 @@
"Could not open file" : "تعذّر فتح الملف",
"Invalid chunk name" : "اسم كتلة chunk غير صحيح",
"Could not rename part file assembled from chunks" : "تعذّرت إعادة تسمية ملف جزئي مُجمّعٍ من كُتلٍ chunks",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه.",
+ "In a %1$s on %2$s for the entire day" : "عند %1$s في %2$s كامل اليوم",
+ "In a %1$s on %2$s between %3$s - %4$s" : "عند %1$s في %2$s بين %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "عند %1$s %2$s في %3$s كامل اليوم",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "عند %1$s %2$s في %3$s بين %4$s - %5$s",
+ "In a %1$s on %2$s" : "عند %1$s في %2$s",
+ "In a %1$s on %2$s then on %3$s" : "عند %1$s في %2$s ثم في%3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "عند %1$s في %2$s ثم في %3$s و %4$s",
+ "In %1$s %2$s on %3$s" : "عند %1$s %2$s في %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "عند %1$s %2$s في %3$s ثم في %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "عند %1$s %2$s في %3$s ثم في %4$s و%5$s"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/cs.js b/apps/dav/l10n/cs.js
index 378e039f1c8..0f038ba4712 100644
--- a/apps/dav/l10n/cs.js
+++ b/apps/dav/l10n/cs.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "Popis: %s",
"Where: %s" : "Kde: %s",
"%1$s via %2$s" : "%1$s prostřednictvím %2$s",
- "In a %1$s on %2$s for the entire day" : "Na %1$s v %2$s po celý den",
- "In a %1$s on %2$s between %3$s - %4$s" : "Na %1$s v %2$s mezi %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Na %1$s %2$s v %3$s po celý den",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "V %1$s %2$s na %3$s mezi %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "V minulosti %1$s po celý den",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za minutu %2$s po celý den","Za %n minuty %1$s po celý den","Za %n minut %1$s po celý den","Za %n minuty %1$s po celý den"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za hodinu %1$s po celý den","Za %n hodiny %1$s po celý den","Za %n hodin %1$s po celý den","Za %n hodiny %1$s po celý den"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za den %1$s po celý den","Za %n dny %1$s po celý den","Za %n dnů %1$s po celý den","Za %n dny %1$s po celý den"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za týden %1$s po celý den","Za %n týdny %1$s po celý den","Za %n týdnů %1$s po celý den","Za %n týdny %1$s po celý den"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za měsíc %2$s po celý den","Za %n měsíce %1$s po celý den","Za %n měsíců %1$s po celý den","Za %n měsíce %1$s po celý den"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za rok %1$s po celý den","Za %n roky %1$s po celý den","Za %n let %1$s po celý den","Za %n roky %1$s po celý den"],
+ "In the past on %1$s between %2$s - %3$s" : "V minulosti %1$s mezi %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za minutu %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s","Za %n minut %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za hodinu %1$s mezi %2$s - %3$s ","Za %n hodiny %1$s mezi %2$s - %3$s","Za %n hodin %1$s mezi %2$s - %3$s","Za %n hodiny %1$s mezi %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za den %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s","Za %n dnů %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za týden %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s","Za %n týdnů %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Za měsíc %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s","Za %n měsíců %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Za rok %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s","Za %n let %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s"],
"Could not generate when statement" : "Nepodařilo se vytvořit výrok kdy",
"Every Day for the entire day" : "Každý den pro celý den",
"Every Day for the entire day until %1$s" : "Každý den pro celý den až do %1$s",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Co %1$d let %2$s v %3$s mezi %4$s - %5$s až do %6$s",
"On specific dates for the entire day until %1$s" : "V konkrétních datech pro celý den až do %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "V konkrétních datech mezi %1$s - %2$s až do %3$s",
- "In a %1$s on %2$s" : "V %1$s v %2$s",
- "In a %1$s on %2$s then on %3$s" : "V %1$s v %2$s, pak v %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "V %1$s v %2$s, pak v %3$s a %4$s",
- "In %1$s %2$s on %3$s" : "V %1$s %2$s v %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "V %1$s %2$s v %3$s, pak v %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "V %1$s %2$s v %3$s, pak v %4$s a %5$s",
+ "In the past on %1$s" : "V minulosti %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Za minutu %1$s","Za %n minuty %1$s","Za %n minut %1$s","Za %n minuty %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Za hodinu %1$s","Za %n hodiny %1$s","Za %n hodin %1$s","Za %n hodiny %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["Za den %1$s","Za %n dny %1$s","Za %n dnů %1$s","Za %n dny %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Za týden %1$s","Za %n týdny %1$s","Za %n týdnů %1$s","Za %n týdny %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["Za měsíce %1$s","Za %n měsíce %1$s","Za %n měsíců %1$s","Za %n měsíce %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["Za rok %1$s","Za %n roky %1$s","Za %n let %1$s","Za %n roky %1$s"],
+ "In the past on %1$s then on %2$s" : "V minulosti %1$s, pak %2$s ",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za minutu %1$s, poté %2$s","Za %n minuty %1$s, poté %2$s","Za %n minut %1$s, poté %2$s ","Za %n minuty %1$s, poté %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za hodinu %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s","Za %n hodin %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za den %1$s, poté %2$s","Za %n dny %1$s, poté %2$s","Za %n dnů %1$s, poté %2$s","Za %n dny %1$s, poté %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za týden %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s","Za %n týdnů %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za měsíc %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s","Za %n měsíců %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za rok %1$s, poté %2$s","Za %n roky %1$s, poté %2$s","Za %n let %1$s, poté %2$s","Za %n roky %1$s, poté %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "V minulosti %1$s, poté %2$s a %3$s ",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Za minutu %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s ","Za %n minut %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s "],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Za hodinu %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s","Za %n hodin %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Za den %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s","Za %n dnů %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Za týden %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s","Za %n týdnů %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Za měsíc %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s","Za %n měsíců %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Za rok %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s","Za %n let %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s"],
"Could not generate next recurrence statement" : "Nepodařilo se vytvořit výrok o příštím opakování",
"Cancelled: %1$s" : "Zrušeno: %1$s",
"\"%1$s\" has been canceled" : "„%1$s“ bylo zrušeno",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "Nedaří se otevřít soubor",
"Invalid chunk name" : "Neplatný název pro shluk (chunk)",
"Could not rename part file assembled from chunks" : "Nedaří se přejmenovat částečný soubor složený ze shluků",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Když sem zadáte svou pracovní dobu, ostatní uživatelé při rezervování schůzky uvidí, kdy jste mimo kancelář."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Když sem zadáte svou pracovní dobu, ostatní uživatelé při rezervování schůzky uvidí, kdy jste mimo kancelář.",
+ "In a %1$s on %2$s for the entire day" : "Na %1$s v %2$s po celý den",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Na %1$s v %2$s mezi %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Na %1$s %2$s v %3$s po celý den",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "V %1$s %2$s na %3$s mezi %4$s - %5$s",
+ "In a %1$s on %2$s" : "V %1$s v %2$s",
+ "In a %1$s on %2$s then on %3$s" : "V %1$s v %2$s, pak v %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "V %1$s v %2$s, pak v %3$s a %4$s",
+ "In %1$s %2$s on %3$s" : "V %1$s %2$s v %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "V %1$s %2$s v %3$s, pak v %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "V %1$s %2$s v %3$s, pak v %4$s a %5$s"
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/apps/dav/l10n/cs.json b/apps/dav/l10n/cs.json
index 88c68f0f6ee..793789836e5 100644
--- a/apps/dav/l10n/cs.json
+++ b/apps/dav/l10n/cs.json
@@ -70,10 +70,20 @@
"Description: %s" : "Popis: %s",
"Where: %s" : "Kde: %s",
"%1$s via %2$s" : "%1$s prostřednictvím %2$s",
- "In a %1$s on %2$s for the entire day" : "Na %1$s v %2$s po celý den",
- "In a %1$s on %2$s between %3$s - %4$s" : "Na %1$s v %2$s mezi %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Na %1$s %2$s v %3$s po celý den",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "V %1$s %2$s na %3$s mezi %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "V minulosti %1$s po celý den",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za minutu %2$s po celý den","Za %n minuty %1$s po celý den","Za %n minut %1$s po celý den","Za %n minuty %1$s po celý den"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za hodinu %1$s po celý den","Za %n hodiny %1$s po celý den","Za %n hodin %1$s po celý den","Za %n hodiny %1$s po celý den"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za den %1$s po celý den","Za %n dny %1$s po celý den","Za %n dnů %1$s po celý den","Za %n dny %1$s po celý den"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za týden %1$s po celý den","Za %n týdny %1$s po celý den","Za %n týdnů %1$s po celý den","Za %n týdny %1$s po celý den"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za měsíc %2$s po celý den","Za %n měsíce %1$s po celý den","Za %n měsíců %1$s po celý den","Za %n měsíce %1$s po celý den"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za rok %1$s po celý den","Za %n roky %1$s po celý den","Za %n let %1$s po celý den","Za %n roky %1$s po celý den"],
+ "In the past on %1$s between %2$s - %3$s" : "V minulosti %1$s mezi %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za minutu %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s","Za %n minut %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za hodinu %1$s mezi %2$s - %3$s ","Za %n hodiny %1$s mezi %2$s - %3$s","Za %n hodin %1$s mezi %2$s - %3$s","Za %n hodiny %1$s mezi %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za den %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s","Za %n dnů %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za týden %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s","Za %n týdnů %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Za měsíc %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s","Za %n měsíců %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Za rok %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s","Za %n let %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s"],
"Could not generate when statement" : "Nepodařilo se vytvořit výrok kdy",
"Every Day for the entire day" : "Každý den pro celý den",
"Every Day for the entire day until %1$s" : "Každý den pro celý den až do %1$s",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Co %1$d let %2$s v %3$s mezi %4$s - %5$s až do %6$s",
"On specific dates for the entire day until %1$s" : "V konkrétních datech pro celý den až do %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "V konkrétních datech mezi %1$s - %2$s až do %3$s",
- "In a %1$s on %2$s" : "V %1$s v %2$s",
- "In a %1$s on %2$s then on %3$s" : "V %1$s v %2$s, pak v %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "V %1$s v %2$s, pak v %3$s a %4$s",
- "In %1$s %2$s on %3$s" : "V %1$s %2$s v %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "V %1$s %2$s v %3$s, pak v %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "V %1$s %2$s v %3$s, pak v %4$s a %5$s",
+ "In the past on %1$s" : "V minulosti %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Za minutu %1$s","Za %n minuty %1$s","Za %n minut %1$s","Za %n minuty %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Za hodinu %1$s","Za %n hodiny %1$s","Za %n hodin %1$s","Za %n hodiny %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["Za den %1$s","Za %n dny %1$s","Za %n dnů %1$s","Za %n dny %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Za týden %1$s","Za %n týdny %1$s","Za %n týdnů %1$s","Za %n týdny %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["Za měsíce %1$s","Za %n měsíce %1$s","Za %n měsíců %1$s","Za %n měsíce %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["Za rok %1$s","Za %n roky %1$s","Za %n let %1$s","Za %n roky %1$s"],
+ "In the past on %1$s then on %2$s" : "V minulosti %1$s, pak %2$s ",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za minutu %1$s, poté %2$s","Za %n minuty %1$s, poté %2$s","Za %n minut %1$s, poté %2$s ","Za %n minuty %1$s, poté %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za hodinu %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s","Za %n hodin %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za den %1$s, poté %2$s","Za %n dny %1$s, poté %2$s","Za %n dnů %1$s, poté %2$s","Za %n dny %1$s, poté %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za týden %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s","Za %n týdnů %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za měsíc %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s","Za %n měsíců %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za rok %1$s, poté %2$s","Za %n roky %1$s, poté %2$s","Za %n let %1$s, poté %2$s","Za %n roky %1$s, poté %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "V minulosti %1$s, poté %2$s a %3$s ",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Za minutu %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s ","Za %n minut %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s "],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Za hodinu %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s","Za %n hodin %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Za den %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s","Za %n dnů %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Za týden %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s","Za %n týdnů %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Za měsíc %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s","Za %n měsíců %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Za rok %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s","Za %n let %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s"],
"Could not generate next recurrence statement" : "Nepodařilo se vytvořit výrok o příštím opakování",
"Cancelled: %1$s" : "Zrušeno: %1$s",
"\"%1$s\" has been canceled" : "„%1$s“ bylo zrušeno",
@@ -286,6 +311,16 @@
"Could not open file" : "Nedaří se otevřít soubor",
"Invalid chunk name" : "Neplatný název pro shluk (chunk)",
"Could not rename part file assembled from chunks" : "Nedaří se přejmenovat částečný soubor složený ze shluků",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Když sem zadáte svou pracovní dobu, ostatní uživatelé při rezervování schůzky uvidí, kdy jste mimo kancelář."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Když sem zadáte svou pracovní dobu, ostatní uživatelé při rezervování schůzky uvidí, kdy jste mimo kancelář.",
+ "In a %1$s on %2$s for the entire day" : "Na %1$s v %2$s po celý den",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Na %1$s v %2$s mezi %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Na %1$s %2$s v %3$s po celý den",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "V %1$s %2$s na %3$s mezi %4$s - %5$s",
+ "In a %1$s on %2$s" : "V %1$s v %2$s",
+ "In a %1$s on %2$s then on %3$s" : "V %1$s v %2$s, pak v %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "V %1$s v %2$s, pak v %3$s a %4$s",
+ "In %1$s %2$s on %3$s" : "V %1$s %2$s v %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "V %1$s %2$s v %3$s, pak v %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "V %1$s %2$s v %3$s, pak v %4$s a %5$s"
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/de.js b/apps/dav/l10n/de.js
index 485ec97a34c..712164ba324 100644
--- a/apps/dav/l10n/de.js
+++ b/apps/dav/l10n/de.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Beschreibung: %s",
"Where: %s" : "Ort: %s",
"%1$s via %2$s" : "%1$s über %2$s",
- "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
- "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
"Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden.",
"Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
"Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Alle %1$d Jahre im %2$s am %3$s zwischen %4$s - %5$s bis %6$s",
"On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
- "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
- "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
- "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s",
"Could not generate next recurrence statement" : "Angabe für nächste Wiederholung konnte nicht erzeugt werden.",
"Cancelled: %1$s" : "Abgesagt: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" wurde abgesagt.",
@@ -288,6 +278,16 @@ OC.L10N.register(
"Could not open file" : "Datei konnte nicht geöffnet werden",
"Invalid chunk name" : "Ungültiger Chunk-Name",
"Could not rename part file assembled from chunks" : "Aus Chunks zusammengesetzte temporäre Datei konnte nicht umbenannt werden",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten konfigurierst, können andere Benutzer sehen, wann du nicht im Büro bist, wenn sie eine Besprechung buchen."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten konfigurierst, können andere Benutzer sehen, wann du nicht im Büro bist, wenn sie eine Besprechung buchen.",
+ "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
+ "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
+ "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
+ "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
+ "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/de.json b/apps/dav/l10n/de.json
index f86cf6874e2..b5c0e1ea39d 100644
--- a/apps/dav/l10n/de.json
+++ b/apps/dav/l10n/de.json
@@ -70,10 +70,6 @@
"Description: %s" : "Beschreibung: %s",
"Where: %s" : "Ort: %s",
"%1$s via %2$s" : "%1$s über %2$s",
- "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
- "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
"Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden.",
"Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
"Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Alle %1$d Jahre im %2$s am %3$s zwischen %4$s - %5$s bis %6$s",
"On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
- "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
- "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
- "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s",
"Could not generate next recurrence statement" : "Angabe für nächste Wiederholung konnte nicht erzeugt werden.",
"Cancelled: %1$s" : "Abgesagt: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" wurde abgesagt.",
@@ -286,6 +276,16 @@
"Could not open file" : "Datei konnte nicht geöffnet werden",
"Invalid chunk name" : "Ungültiger Chunk-Name",
"Could not rename part file assembled from chunks" : "Aus Chunks zusammengesetzte temporäre Datei konnte nicht umbenannt werden",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten konfigurierst, können andere Benutzer sehen, wann du nicht im Büro bist, wenn sie eine Besprechung buchen."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten konfigurierst, können andere Benutzer sehen, wann du nicht im Büro bist, wenn sie eine Besprechung buchen.",
+ "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
+ "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
+ "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
+ "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
+ "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/de_DE.js b/apps/dav/l10n/de_DE.js
index 115e92ff6f4..73276aaabf7 100644
--- a/apps/dav/l10n/de_DE.js
+++ b/apps/dav/l10n/de_DE.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "Beschreibung: %s",
"Where: %s" : "Ort: %s",
"%1$s via %2$s" : "%1$s über %2$s",
- "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
- "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "In der Vergangenheit am %1$s für den ganzen Tag",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
+ "In the past on %1$s between %2$s - %3$s" : "In der Vergangenheit am %1$s zwischen %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
"Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden",
"Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
"Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Alle %1$d Jahre im %2$s am %3$s zwischen %4$s - %5$s bis %6$s",
"On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
- "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
- "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
- "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s",
+ "In the past on %1$s" : "In der Vergangenheit am %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
+ "In the past on %1$s then on %2$s" : "In der Vergangenheit am %1$s danach am %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "In der Vergangenheit am %1$s danach am %2$s und %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
"Could not generate next recurrence statement" : "Nächste Wiederholungsangabe konnte nicht erzeugt werden",
"Cancelled: %1$s" : "Abgesagt: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s“ wurde abgesagt.",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "Datei konnte nicht geöffnet werden",
"Invalid chunk name" : "Ungültiger Chunk-Name",
"Could not rename part file assembled from chunks" : "Aus Chunks zusammengesetzte Teildatei konnte nicht umbenannt werden",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten konfigurieren, können andere Benutzer sehen, wann Sie nicht im Büro sind, wenn sie eine Besprechung buchen."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten konfigurieren, können andere Benutzer sehen, wann Sie nicht im Büro sind, wenn sie eine Besprechung buchen.",
+ "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
+ "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
+ "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
+ "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
+ "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/de_DE.json b/apps/dav/l10n/de_DE.json
index 40be084da10..607060b8718 100644
--- a/apps/dav/l10n/de_DE.json
+++ b/apps/dav/l10n/de_DE.json
@@ -70,10 +70,20 @@
"Description: %s" : "Beschreibung: %s",
"Where: %s" : "Ort: %s",
"%1$s via %2$s" : "%1$s über %2$s",
- "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
- "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "In der Vergangenheit am %1$s für den ganzen Tag",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
+ "In the past on %1$s between %2$s - %3$s" : "In der Vergangenheit am %1$s zwischen %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
"Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden",
"Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
"Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Alle %1$d Jahre im %2$s am %3$s zwischen %4$s - %5$s bis %6$s",
"On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
- "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
- "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
- "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s",
+ "In the past on %1$s" : "In der Vergangenheit am %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
+ "In the past on %1$s then on %2$s" : "In der Vergangenheit am %1$s danach am %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "In der Vergangenheit am %1$s danach am %2$s und %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
"Could not generate next recurrence statement" : "Nächste Wiederholungsangabe konnte nicht erzeugt werden",
"Cancelled: %1$s" : "Abgesagt: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s“ wurde abgesagt.",
@@ -286,6 +311,16 @@
"Could not open file" : "Datei konnte nicht geöffnet werden",
"Invalid chunk name" : "Ungültiger Chunk-Name",
"Could not rename part file assembled from chunks" : "Aus Chunks zusammengesetzte Teildatei konnte nicht umbenannt werden",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten konfigurieren, können andere Benutzer sehen, wann Sie nicht im Büro sind, wenn sie eine Besprechung buchen."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten konfigurieren, können andere Benutzer sehen, wann Sie nicht im Büro sind, wenn sie eine Besprechung buchen.",
+ "In a %1$s on %2$s for the entire day" : "In einer %1$s am %2$s für den ganzen Tag",
+ "In a %1$s on %2$s between %3$s - %4$s" : "In einer %1$s am %2$s zwischen %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s am %3$s für den ganzen Tag",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s am %3$s zwischen %4$s - %5$s",
+ "In a %1$s on %2$s" : "In einer %1$s am %2$s ",
+ "In a %1$s on %2$s then on %3$s" : "In einer %1$s am %2$s danach am %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "In einer %1$s am %2$s danach am %3$s und %4$s",
+ "In %1$s %2$s on %3$s" : "In %1$s %2$s am %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s am %3$s danach am %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s am %3$s danach am %4$s und %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/en_GB.js b/apps/dav/l10n/en_GB.js
index 39834611ff8..a028ce855a7 100644
--- a/apps/dav/l10n/en_GB.js
+++ b/apps/dav/l10n/en_GB.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "Description: %s",
"Where: %s" : "Where: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "In a %1$s on %2$s for the entire day",
- "In a %1$s on %2$s between %3$s - %4$s" : "In a %1$s on %2$s between %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s on %3$s for the entire day",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s on %3$s between %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "In the past on %1$s for the entire day",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In a minute on %1$s for the entire day","In %n minutes on %1$s for the entire day"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In a hour on %1$s for the entire day","In %n hours on %1$s for the entire day"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In a day on %1$s for the entire day","In %n days on %1$s for the entire day"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In a week on %1$s for the entire day","In %n weeks on %1$s for the entire day"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In a month on %1$s for the entire day","In %n months on %1$s for the entire day"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In a year on %1$s for the entire day","In %n years on %1$s for the entire day"],
+ "In the past on %1$s between %2$s - %3$s" : "In the past on %1$s between %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In a minute on %1$s between %2$s - %3$s","In %n minutes on %1$s between %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In a hour on %1$s between %2$s - %3$s","In %n hours on %1$s between %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In a day on %1$s between %2$s - %3$s","In %n days on %1$s between %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In a week on %1$s between %2$s - %3$s","In %n weeks on %1$s between %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In a month on %1$s between %2$s - %3$s","In %n months on %1$s between %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In a year on %1$s between %2$s - %3$s","In %n years on %1$s between %2$s - %3$s"],
"Could not generate when statement" : "Could not generate when statement",
"Every Day for the entire day" : "Every Day for the entire day",
"Every Day for the entire day until %1$s" : "Every Day for the entire day until %1$s",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s",
"On specific dates for the entire day until %1$s" : "On specific dates for the entire day until %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "On specific dates between %1$s - %2$s until %3$s",
- "In a %1$s on %2$s" : "In a %1$s on %2$s",
- "In a %1$s on %2$s then on %3$s" : "In a %1$s on %2$s then on %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "In a %1$s on %2$s then on %3$s and %4$s",
- "In %1$s %2$s on %3$s" : "In %1$s %2$s on %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s on %3$s then on %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s on %3$s then on %4$s and %5$s",
+ "In the past on %1$s" : "In the past on %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In a minute on %1$s","In %n minutes on %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In a hour on %1$s","In %n hours on %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["In a day on %1$s","In %n days on %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In a week on %1$s","In %n weeks on %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["In a month on %1$s","In %n months on %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["In a year on %1$s","In %n years on %1$s"],
+ "In the past on %1$s then on %2$s" : "In the past on %1$s then on %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In a minute on %1$s then on %2$s","In %n minutes on %1$s then on %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In a hour on %1$s then on %2$s","In %n hours on %1$s then on %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In a day on %1$s then on %2$s","In %n days on %1$s then on %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In a week on %1$s then on %2$s","In %n weeks on %1$s then on %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In a month on %1$s then on %2$s","In %n months on %1$s then on %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In a year on %1$s then on %2$s","In %n years on %1$s then on %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "In the past on %1$s then on %2$s and %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In a minute on %1$s then on %2$s and %3$s","In %n minutes on %1$s then on %2$s and %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In a hour on %1$s then on %2$s and %3$s","In %n hours on %1$s then on %2$s and %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In a day on %1$s then on %2$s and %3$s","In %n days on %1$s then on %2$s and %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In a week on %1$s then on %2$s and %3$s","In %n weeks on %1$s then on %2$s and %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In a month on %1$s then on %2$s and %3$s","In %n months on %1$s then on %2$s and %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In a year on %1$s then on %2$s and %3$s","In %n years on %1$s then on %2$s and %3$s"],
"Could not generate next recurrence statement" : "Could not generate next recurrence statement",
"Cancelled: %1$s" : "Cancelled: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" has been cancelled",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "Could not open file",
"Invalid chunk name" : "Invalid chunk name",
"Could not rename part file assembled from chunks" : "Could not rename part file assembled from chunks",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "If you configure your working hours, other users will see when you are out of office when they book a meeting."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "If you configure your working hours, other users will see when you are out of office when they book a meeting.",
+ "In a %1$s on %2$s for the entire day" : "In a %1$s on %2$s for the entire day",
+ "In a %1$s on %2$s between %3$s - %4$s" : "In a %1$s on %2$s between %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s on %3$s for the entire day",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s on %3$s between %4$s - %5$s",
+ "In a %1$s on %2$s" : "In a %1$s on %2$s",
+ "In a %1$s on %2$s then on %3$s" : "In a %1$s on %2$s then on %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "In a %1$s on %2$s then on %3$s and %4$s",
+ "In %1$s %2$s on %3$s" : "In %1$s %2$s on %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s on %3$s then on %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s on %3$s then on %4$s and %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/en_GB.json b/apps/dav/l10n/en_GB.json
index 58731b43149..891850d0987 100644
--- a/apps/dav/l10n/en_GB.json
+++ b/apps/dav/l10n/en_GB.json
@@ -70,10 +70,20 @@
"Description: %s" : "Description: %s",
"Where: %s" : "Where: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "In a %1$s on %2$s for the entire day",
- "In a %1$s on %2$s between %3$s - %4$s" : "In a %1$s on %2$s between %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s on %3$s for the entire day",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s on %3$s between %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "In the past on %1$s for the entire day",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In a minute on %1$s for the entire day","In %n minutes on %1$s for the entire day"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In a hour on %1$s for the entire day","In %n hours on %1$s for the entire day"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In a day on %1$s for the entire day","In %n days on %1$s for the entire day"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In a week on %1$s for the entire day","In %n weeks on %1$s for the entire day"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In a month on %1$s for the entire day","In %n months on %1$s for the entire day"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In a year on %1$s for the entire day","In %n years on %1$s for the entire day"],
+ "In the past on %1$s between %2$s - %3$s" : "In the past on %1$s between %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In a minute on %1$s between %2$s - %3$s","In %n minutes on %1$s between %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In a hour on %1$s between %2$s - %3$s","In %n hours on %1$s between %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In a day on %1$s between %2$s - %3$s","In %n days on %1$s between %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In a week on %1$s between %2$s - %3$s","In %n weeks on %1$s between %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In a month on %1$s between %2$s - %3$s","In %n months on %1$s between %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In a year on %1$s between %2$s - %3$s","In %n years on %1$s between %2$s - %3$s"],
"Could not generate when statement" : "Could not generate when statement",
"Every Day for the entire day" : "Every Day for the entire day",
"Every Day for the entire day until %1$s" : "Every Day for the entire day until %1$s",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s",
"On specific dates for the entire day until %1$s" : "On specific dates for the entire day until %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "On specific dates between %1$s - %2$s until %3$s",
- "In a %1$s on %2$s" : "In a %1$s on %2$s",
- "In a %1$s on %2$s then on %3$s" : "In a %1$s on %2$s then on %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "In a %1$s on %2$s then on %3$s and %4$s",
- "In %1$s %2$s on %3$s" : "In %1$s %2$s on %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s on %3$s then on %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s on %3$s then on %4$s and %5$s",
+ "In the past on %1$s" : "In the past on %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In a minute on %1$s","In %n minutes on %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In a hour on %1$s","In %n hours on %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["In a day on %1$s","In %n days on %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In a week on %1$s","In %n weeks on %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["In a month on %1$s","In %n months on %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["In a year on %1$s","In %n years on %1$s"],
+ "In the past on %1$s then on %2$s" : "In the past on %1$s then on %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In a minute on %1$s then on %2$s","In %n minutes on %1$s then on %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In a hour on %1$s then on %2$s","In %n hours on %1$s then on %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In a day on %1$s then on %2$s","In %n days on %1$s then on %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In a week on %1$s then on %2$s","In %n weeks on %1$s then on %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In a month on %1$s then on %2$s","In %n months on %1$s then on %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In a year on %1$s then on %2$s","In %n years on %1$s then on %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "In the past on %1$s then on %2$s and %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In a minute on %1$s then on %2$s and %3$s","In %n minutes on %1$s then on %2$s and %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In a hour on %1$s then on %2$s and %3$s","In %n hours on %1$s then on %2$s and %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In a day on %1$s then on %2$s and %3$s","In %n days on %1$s then on %2$s and %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In a week on %1$s then on %2$s and %3$s","In %n weeks on %1$s then on %2$s and %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In a month on %1$s then on %2$s and %3$s","In %n months on %1$s then on %2$s and %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In a year on %1$s then on %2$s and %3$s","In %n years on %1$s then on %2$s and %3$s"],
"Could not generate next recurrence statement" : "Could not generate next recurrence statement",
"Cancelled: %1$s" : "Cancelled: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" has been cancelled",
@@ -286,6 +311,16 @@
"Could not open file" : "Could not open file",
"Invalid chunk name" : "Invalid chunk name",
"Could not rename part file assembled from chunks" : "Could not rename part file assembled from chunks",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "If you configure your working hours, other users will see when you are out of office when they book a meeting."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "If you configure your working hours, other users will see when you are out of office when they book a meeting.",
+ "In a %1$s on %2$s for the entire day" : "In a %1$s on %2$s for the entire day",
+ "In a %1$s on %2$s between %3$s - %4$s" : "In a %1$s on %2$s between %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "In %1$s %2$s on %3$s for the entire day",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "In %1$s %2$s on %3$s between %4$s - %5$s",
+ "In a %1$s on %2$s" : "In a %1$s on %2$s",
+ "In a %1$s on %2$s then on %3$s" : "In a %1$s on %2$s then on %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "In a %1$s on %2$s then on %3$s and %4$s",
+ "In %1$s %2$s on %3$s" : "In %1$s %2$s on %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s on %3$s then on %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "In %1$s %2$s on %3$s then on %4$s and %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/es.js b/apps/dav/l10n/es.js
index 9459723eb2c..2abde7b51aa 100644
--- a/apps/dav/l10n/es.js
+++ b/apps/dav/l10n/es.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Descripción: %s",
"Where: %s" : "Lugar: %s",
"%1$s via %2$s" : "%1$s vía %2$s",
- "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
- "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
"Could not generate when statement" : "No se ha podido general la declaración de cuándo",
"Every Day for the entire day" : "Todos los días durante todo el día",
"Every Day for the entire day until %1$s" : "Cada day todo el día hasta el %1$s",
@@ -244,6 +240,10 @@ OC.L10N.register(
"Could not open file" : "No se ha podido abrir el archivo",
"Invalid chunk name" : "Nombre de trozo inválido",
"Could not rename part file assembled from chunks" : "No se ha podido renombrar el archivo parcial formado por los fragmentos",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura su horario de trabajo, otros usuarios verán cuándo está fuera de la oficina cuando planifiquen una reunión."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura su horario de trabajo, otros usuarios verán cuándo está fuera de la oficina cuando planifiquen una reunión.",
+ "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
+ "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/es.json b/apps/dav/l10n/es.json
index fae10d48384..fa997ffb18e 100644
--- a/apps/dav/l10n/es.json
+++ b/apps/dav/l10n/es.json
@@ -70,10 +70,6 @@
"Description: %s" : "Descripción: %s",
"Where: %s" : "Lugar: %s",
"%1$s via %2$s" : "%1$s vía %2$s",
- "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
- "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
"Could not generate when statement" : "No se ha podido general la declaración de cuándo",
"Every Day for the entire day" : "Todos los días durante todo el día",
"Every Day for the entire day until %1$s" : "Cada day todo el día hasta el %1$s",
@@ -242,6 +238,10 @@
"Could not open file" : "No se ha podido abrir el archivo",
"Invalid chunk name" : "Nombre de trozo inválido",
"Could not rename part file assembled from chunks" : "No se ha podido renombrar el archivo parcial formado por los fragmentos",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura su horario de trabajo, otros usuarios verán cuándo está fuera de la oficina cuando planifiquen una reunión."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura su horario de trabajo, otros usuarios verán cuándo está fuera de la oficina cuando planifiquen una reunión.",
+ "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
+ "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/es_MX.js b/apps/dav/l10n/es_MX.js
index c757a72cfdc..475c4c645bc 100644
--- a/apps/dav/l10n/es_MX.js
+++ b/apps/dav/l10n/es_MX.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Descripción: %s",
"Where: %s" : "Lugar: %s",
"%1$s via %2$s" : "%1$s vía %2$s",
- "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
- "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
"Could not generate when statement" : "No se pudo generar la declaración de cuándo",
"Every Day for the entire day" : "Cada día todo el día",
"Every Day for the entire day until %1$s" : "Cada día todo el día hasta el %1$s",
@@ -250,6 +246,10 @@ OC.L10N.register(
"Could not open file" : "No se pudo abrir el archivo",
"Invalid chunk name" : "Nombre de fragmento inválido",
"Could not rename part file assembled from chunks" : "No se pudo renombrar el archivo parcial ensamblado por fragmentos",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura sus horas laborales, otros usuarios verán cuándo está fuera de la oficina cuando agenden una reunión."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura sus horas laborales, otros usuarios verán cuándo está fuera de la oficina cuando agenden una reunión.",
+ "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
+ "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/es_MX.json b/apps/dav/l10n/es_MX.json
index 10ce932151d..3decededbad 100644
--- a/apps/dav/l10n/es_MX.json
+++ b/apps/dav/l10n/es_MX.json
@@ -70,10 +70,6 @@
"Description: %s" : "Descripción: %s",
"Where: %s" : "Lugar: %s",
"%1$s via %2$s" : "%1$s vía %2$s",
- "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
- "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
"Could not generate when statement" : "No se pudo generar la declaración de cuándo",
"Every Day for the entire day" : "Cada día todo el día",
"Every Day for the entire day until %1$s" : "Cada día todo el día hasta el %1$s",
@@ -248,6 +244,10 @@
"Could not open file" : "No se pudo abrir el archivo",
"Invalid chunk name" : "Nombre de fragmento inválido",
"Could not rename part file assembled from chunks" : "No se pudo renombrar el archivo parcial ensamblado por fragmentos",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura sus horas laborales, otros usuarios verán cuándo está fuera de la oficina cuando agenden una reunión."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configura sus horas laborales, otros usuarios verán cuándo está fuera de la oficina cuando agenden una reunión.",
+ "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
+ "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/eu.js b/apps/dav/l10n/eu.js
index a9bd576eb3e..578f0dd0eca 100644
--- a/apps/dav/l10n/eu.js
+++ b/apps/dav/l10n/eu.js
@@ -72,52 +72,77 @@ OC.L10N.register(
"Description: %s" : "Deskripzioa: %s",
"Where: %s" : "Non: %s",
"%1$s via %2$s" : "%2$s bidez, %1$s",
- "In a %1$s on %2$s for the entire day" : " %1$s batean %2$s(e)n egun osorako",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s batean %2$s(e)n %3$s eta %4$s artean",
- "In %1$s %2$s on %3$s for the entire day" : "%1$sn %2$sn %3$s(e)n egun osorako",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s %3$sn %4$s eta %5$s(e)n artean",
+ "In the past on %1$s for the entire day" : "Iraganean %1$s(e)an egun osorako",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Minutu batean %1$s(e)an egun osorako","%n minututan %1$s(e)an egun osorako"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Ordu batean %1$s(e)an egun osorako","%n ordutan %1$s(e)an egun osorako"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Egun batean %1$s(e)an egun osorako","%n egunetan %1$s(e)an egun osorako"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Aste batean %1$s(e)an egun osorako","%n astetan %1$s(e)an egun osorako"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Hilabete batean %1$s(e)an egun osorako","%n hilabetetan %1$s(e)an egun osorako"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Urte batean %1$s(e)an egun osorako","%n urtetan %1$s(e)an egun osorako"],
+ "In the past on %1$s between %2$s - %3$s" : "Iraganean %1$s(e)an %2$s eta %3$s artean",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Minutu batean %1$s(e)an %2$s eta %3$s artean","%n minututan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Ordu batean %1$s(e)an %2$s eta %3$s artean","%n ordutan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Egun batean %1$s(e)an %2$s eta %3$s artean","%n egunetan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Aste batean %1$s(e)an %2$s eta %3$s artean","%n astetan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Hilabete batean %1$s(e)an %2$s eta %3$s artean","%n hilabetetan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Urte batean %1$s(e)an %2$s eta %3$s artean","%n urtetan %1$s(e)an %2$s eta %3$s artean"],
"Could not generate when statement" : "Ezin izan da noiz adierazpena sortu",
"Every Day for the entire day" : "Egunero egun osoan",
"Every Day for the entire day until %1$s" : "Egunero egun osoan %1$s arte",
- "Every Day between %1$s - %2$s" : "Egunero %1$setatik %2$setara",
- "Every Day between %1$s - %2$s until %3$s" : "Egunero %1$setatik %2$setara(%3$s arte",
+ "Every Day between %1$s - %2$s" : "Egunero %1$s(e)tatik %2$s(e)tara",
+ "Every Day between %1$s - %2$s until %3$s" : "Egunero %1$s eta %2$s artean %3$s arte",
"Every %1$d Days for the entire day" : "%1$d egunero egun osorako",
"Every %1$d Days for the entire day until %2$s" : "%1$d egunero egun osorako %2$s arte",
- "Every %1$d Days between %2$s - %3$s" : "%1$d egunero %2$setatik %3$setara ",
- "Every %1$d Days between %2$s - %3$s until %4$s" : "%1$d egunero %2$setatik %3$setara %4$s arte",
+ "Every %1$d Days between %2$s - %3$s" : "%1$d egunero %2$s eta %3$s artean ",
+ "Every %1$d Days between %2$s - %3$s until %4$s" : "%1$d egunero %2$s eta %3$s artean %4$s arte",
"Could not generate event recurrence statement" : "Ezin izan da gertaeraren errepikapen adierazpena sortu",
- "Every Week on %1$s for the entire day" : "Astero %1$sn egun osoan",
- "Every Week on %1$s for the entire day until %2$s" : "Astero %1$s(e)n egun osorako %2$s arte",
- "Every Week on %1$s between %2$s - %3$s" : "Astero %1$s(e)n %2$setatik %3$setara",
- "Every Week on %1$s between %2$s - %3$s until %4$s" : "Astero %1$s(e)n %2$setatik %3$setara %4$s arte ",
- "Every %1$d Weeks on %2$s for the entire day" : "%1$d astero %2$s(e)n egun osorako",
- "Every %1$d Weeks on %2$s for the entire day until %3$s" : "%1$d astero %2$s(e)n egun osorako %3$s arte",
- "Every %1$d Weeks on %2$s between %3$s - %4$s" : "%1$d astero %2$s(e)n %3$setatik %4$setara",
- "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "%1$d astero %2$s(e)n %3$setatik %4$setara %5$s arte",
- "Every Month on the %1$s for the entire day" : "Hilabetero %1$sn egun osoan",
- "Every Month on the %1$s for the entire day until %2$s" : "Hilabetero %1$s(e)n egun osorako %2$s arte",
- "Every Month on the %1$s between %2$s - %3$s" : "Hilabetero %1$s(e)n %2$setatik %3$setara",
- "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Hilabetero %1$s(e)n %2$setatik %3$setara %4$s arte ",
- "Every %1$d Months on the %2$s for the entire day" : "%1$d hilabetero %2$s(e)n egun osorako",
- "Every %1$d Months on the %2$s for the entire day until %3$s" : "%1$d hilabetero %2$s(e)n egun osorako %3$s arte",
- "Every %1$d Months on the %2$s between %3$s - %4$s" : "%1$d hilabetero %2$s(e)n %3$setatik %4$setara",
- "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "%1$d hilabetero %2$s(e)n %3$setatik %4$setara %5$s arte",
- "Every Year in %1$s on the %2$s for the entire day" : "Urtero %1$sk %2$s egun osorako",
- "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Urtero %1$sk %2$s egun osorako %3$s arte",
- "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Urtero %1$sk %2$s %3$setatik %4$setara",
- "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Urtero %1$sk %2$s %3$setatik %4$setara %5$s arte",
- "Every %1$d Years in %2$s on the %3$s for the entire day" : "%1$d urtero %2$sk %3$s egun osorako",
- "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "%1$d urtero %2$sk %3$s egun osorako %4$s arte",
- "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "%1$d urtero %2$sk %3$s %4$setik %5$setara",
- "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%1$d urtero %2$sk %3$s %4$setatik%5$setara %6$s arte",
+ "Every Week on %1$s for the entire day" : "Astero %1$s(e)an egun osoan",
+ "Every Week on %1$s for the entire day until %2$s" : "Astero %1$s(e)an egun osorako %2$s arte",
+ "Every Week on %1$s between %2$s - %3$s" : "Astero %1$s(e)an %2$s eta %3$s artean",
+ "Every Week on %1$s between %2$s - %3$s until %4$s" : "Astero %1$s(e)an %2$s eta %3$s artean %4$s arte ",
+ "Every %1$d Weeks on %2$s for the entire day" : "%1$d astero %2$s(e)an egun osorako",
+ "Every %1$d Weeks on %2$s for the entire day until %3$s" : "%1$d astero %2$s(e)an egun osorako %3$s arte",
+ "Every %1$d Weeks on %2$s between %3$s - %4$s" : "%1$d astero %2$s(e)an %3$s eta %4$s artean",
+ "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "%1$d astero %2$s(e)an %3$s eta %4$s artean %5$s arte",
+ "Every Month on the %1$s for the entire day" : "Hilabetero %1$s(e)an egun osoan",
+ "Every Month on the %1$s for the entire day until %2$s" : "Hilabetero %1$s(e)an egun osorako %2$s arte",
+ "Every Month on the %1$s between %2$s - %3$s" : "Hilabetero %1$s(e)an %2$s eta %3$s artean",
+ "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Hilabetero %1$s(e)an %2$s eta %3$s artean %4$s arte ",
+ "Every %1$d Months on the %2$s for the entire day" : "%1$d hilabetero %2$s(e)an egun osorako",
+ "Every %1$d Months on the %2$s for the entire day until %3$s" : "%1$d hilabetero %2$s(e)an egun osorako %3$s arte",
+ "Every %1$d Months on the %2$s between %3$s - %4$s" : "%1$d hilabetero %2$s(e)an %3$s eta %4$s artean",
+ "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "%1$d hilabetero %2$s(e)an %3$s eta %4$s artean %5$s arte",
+ "Every Year in %1$s on the %2$s for the entire day" : "Urtero %1$s(e)n %2$s(e)an egun osorako",
+ "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Urtero %1$s(e)n %2$s(e)an egun osorako %3$s arte",
+ "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Urtero %1$s(e)n %2$s(e)an %3$s eta %4$s artean",
+ "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Urtero %1$s(e)n %2$s(e)an %3$s eta %4$s artean %5$s arte",
+ "Every %1$d Years in %2$s on the %3$s for the entire day" : "%1$d urtero %2$s(e)n %3$s(e)an egun osorako",
+ "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "%1$d urtero %2$s(e)n %3$s(e)an egun osorako %4$s arte",
+ "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "%1$d urtero %2$s(e)n %3$s(e)an %4$s eta %5$s artean",
+ "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%1$d urtero %2$s(e)n %3$s(e)an %4$s eta %5$s artean %6$s arte",
"On specific dates for the entire day until %1$s" : "Egun osoan data zehatzetan %1$s arte",
- "On specific dates between %1$s - %2$s until %3$s" : "Data zehatzetan %1$setatik %2$setara %3$s arte",
- "In a %1$s on %2$s" : "%1$s(e)an %2$sn",
- "In a %1$s on %2$s then on %3$s" : "%1$s(e)an %2$sn eta %3$sn",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s(e)an %2$sn eta %3$s eta %4$s(e)an",
- "In %1$s %2$s on %3$s" : "%1$sk %2$s %3$san ",
- "In %1$s %2$s on %3$s then on %4$s" : "%1$sk %2$s %3$s eta %4$san",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$sk %2$s %3$san eta gero %4$s eta %5$s(e)an",
+ "On specific dates between %1$s - %2$s until %3$s" : "Data zehatzetan %1$s eta %2$s artean %3$s arte",
+ "In the past on %1$s" : "Iraganean %1$s(e)an",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Minutu batean %1$s(e)an","%n minututan %1$s(e)an"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Ordu batean %1$s(e)an","%n ordutan %1$s(e)an"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["Egun batean %1$s(e)an","%n egunetan %1$s(e)an"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Aste batean %1$s(e)an","%n astetan %1$s(e)an"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["Hilabete batean %1$s(e)an","%n hilabetetan %1$s(e)an"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["Urte batean %1$s(e)an","%n urtetan %1$s(e)an"],
+ "In the past on %1$s then on %2$s" : "Iraganean %1$s(e)an eta %2$s(e)an",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Minutu batean %1$s(e)an eta %2$s(e)an","%n minututan %1$s(e)an eta %2$s(e)an"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Ordu batean %1$s(e)an eta %2$s(e)an","%n ordutan %1$s(e)an eta %2$s(e)an"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Egun batean %1$s(e)an eta %2$s(e)an","%n egunetan %1$s(e)an eta %2$s(e)an"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Aste batean %1$s(e)an eta %2$s(e)an","%n astetan %1$s(e)an eta %2$s(e)an"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Hilabete batean %1$s(e)an eta %2$s(e)an","%n hilabetetan %1$s(e)an eta %2$s(e)an"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Urte batean %1$s(e)an eta %2$s(e)an","%n urtetan %1$s(e)an eta %2$s(e)an"],
+ "In the past on %1$s then on %2$s and %3$s" : "Iraganean %1$s(e)an, %2$s(e)an eta %3$s(e)an",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Minutu batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n minututan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Ordu batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n ordutan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Egun batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n egunetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Aste batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n astetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Hilabete batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n hilabetetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Urte batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n urtetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
"Could not generate next recurrence statement" : "Ezin izan da sortu hurrengo errepikapen-adierazpena",
"Cancelled: %1$s" : "Utzita: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" bertan behera utzi da",
@@ -129,7 +154,7 @@ OC.L10N.register(
"Invitation updated: %1$s" : "Gonbidapena eguneratuta: %1$s",
"%1$s updated the event \"%2$s\"" : "%1$s-k \"%2$s\" ekitaldia eguneratu du",
"Invitation: %1$s" : "Gonbidapena: %1$s",
- "%1$s would like to invite you to \"%2$s\"" : "%1$s-k \"%2$s\"-ra gonbidatu nahi zaitu",
+ "%1$s would like to invite you to \"%2$s\"" : "%1$s-(e)k \"%2$s\"(e)ra gonbidatu nahi zaitu",
"Organizer:" : "Antolatzailea:",
"Attendees:" : "Parte-hartzaileak:",
"Title:" : "Izenburua:",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "Ezin izan da fitxategia ireki",
"Invalid chunk name" : "Zati izen baliogabea",
"Could not rename part file assembled from chunks" : "Ezin izan da zati-fitxategiaren izena aldatu zenbait zatiz osatuta dagoelako",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Zure lan orduak konfiguratzen badituzu, beste erabiltzaileek bulegotik kanpo zaudela ikusiko dute bilera bat erreserbatzen dutenean."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Zure lan orduak konfiguratzen badituzu, beste erabiltzaileek bulegotik kanpo zaudela ikusiko dute bilera bat erreserbatzen dutenean.",
+ "In a %1$s on %2$s for the entire day" : " %1$s batean %2$s(e)an egun osorako",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s batean %2$s(e)an %3$s eta %4$s artean",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s(e)n %2$s %3$s(e)an egun osorako",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s(e)n %2$s %3$s(e)an %4$s eta %5$s artean",
+ "In a %1$s on %2$s" : "%1$s batean %2$s(e)an",
+ "In a %1$s on %2$s then on %3$s" : "%1$s batean %2$s(e)an eta %3$s(e)an",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s batean %2$s(e)an, %3$s(e)an eta %4$s(e)an",
+ "In %1$s %2$s on %3$s" : "%1$s(e)n %2$s %3$s(e)an ",
+ "In %1$s %2$s on %3$s then on %4$s" : "%1$s(e)n %2$s %3$s(e)an eta %4$s(e)an",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$s(e)n %2$s %3$s(e)an, %4$s(e)an eta %5$s(e)an"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/eu.json b/apps/dav/l10n/eu.json
index 117f09b240d..27a2b59963c 100644
--- a/apps/dav/l10n/eu.json
+++ b/apps/dav/l10n/eu.json
@@ -70,52 +70,77 @@
"Description: %s" : "Deskripzioa: %s",
"Where: %s" : "Non: %s",
"%1$s via %2$s" : "%2$s bidez, %1$s",
- "In a %1$s on %2$s for the entire day" : " %1$s batean %2$s(e)n egun osorako",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s batean %2$s(e)n %3$s eta %4$s artean",
- "In %1$s %2$s on %3$s for the entire day" : "%1$sn %2$sn %3$s(e)n egun osorako",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s %3$sn %4$s eta %5$s(e)n artean",
+ "In the past on %1$s for the entire day" : "Iraganean %1$s(e)an egun osorako",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Minutu batean %1$s(e)an egun osorako","%n minututan %1$s(e)an egun osorako"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Ordu batean %1$s(e)an egun osorako","%n ordutan %1$s(e)an egun osorako"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Egun batean %1$s(e)an egun osorako","%n egunetan %1$s(e)an egun osorako"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Aste batean %1$s(e)an egun osorako","%n astetan %1$s(e)an egun osorako"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Hilabete batean %1$s(e)an egun osorako","%n hilabetetan %1$s(e)an egun osorako"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Urte batean %1$s(e)an egun osorako","%n urtetan %1$s(e)an egun osorako"],
+ "In the past on %1$s between %2$s - %3$s" : "Iraganean %1$s(e)an %2$s eta %3$s artean",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Minutu batean %1$s(e)an %2$s eta %3$s artean","%n minututan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Ordu batean %1$s(e)an %2$s eta %3$s artean","%n ordutan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Egun batean %1$s(e)an %2$s eta %3$s artean","%n egunetan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Aste batean %1$s(e)an %2$s eta %3$s artean","%n astetan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Hilabete batean %1$s(e)an %2$s eta %3$s artean","%n hilabetetan %1$s(e)an %2$s eta %3$s artean"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Urte batean %1$s(e)an %2$s eta %3$s artean","%n urtetan %1$s(e)an %2$s eta %3$s artean"],
"Could not generate when statement" : "Ezin izan da noiz adierazpena sortu",
"Every Day for the entire day" : "Egunero egun osoan",
"Every Day for the entire day until %1$s" : "Egunero egun osoan %1$s arte",
- "Every Day between %1$s - %2$s" : "Egunero %1$setatik %2$setara",
- "Every Day between %1$s - %2$s until %3$s" : "Egunero %1$setatik %2$setara(%3$s arte",
+ "Every Day between %1$s - %2$s" : "Egunero %1$s(e)tatik %2$s(e)tara",
+ "Every Day between %1$s - %2$s until %3$s" : "Egunero %1$s eta %2$s artean %3$s arte",
"Every %1$d Days for the entire day" : "%1$d egunero egun osorako",
"Every %1$d Days for the entire day until %2$s" : "%1$d egunero egun osorako %2$s arte",
- "Every %1$d Days between %2$s - %3$s" : "%1$d egunero %2$setatik %3$setara ",
- "Every %1$d Days between %2$s - %3$s until %4$s" : "%1$d egunero %2$setatik %3$setara %4$s arte",
+ "Every %1$d Days between %2$s - %3$s" : "%1$d egunero %2$s eta %3$s artean ",
+ "Every %1$d Days between %2$s - %3$s until %4$s" : "%1$d egunero %2$s eta %3$s artean %4$s arte",
"Could not generate event recurrence statement" : "Ezin izan da gertaeraren errepikapen adierazpena sortu",
- "Every Week on %1$s for the entire day" : "Astero %1$sn egun osoan",
- "Every Week on %1$s for the entire day until %2$s" : "Astero %1$s(e)n egun osorako %2$s arte",
- "Every Week on %1$s between %2$s - %3$s" : "Astero %1$s(e)n %2$setatik %3$setara",
- "Every Week on %1$s between %2$s - %3$s until %4$s" : "Astero %1$s(e)n %2$setatik %3$setara %4$s arte ",
- "Every %1$d Weeks on %2$s for the entire day" : "%1$d astero %2$s(e)n egun osorako",
- "Every %1$d Weeks on %2$s for the entire day until %3$s" : "%1$d astero %2$s(e)n egun osorako %3$s arte",
- "Every %1$d Weeks on %2$s between %3$s - %4$s" : "%1$d astero %2$s(e)n %3$setatik %4$setara",
- "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "%1$d astero %2$s(e)n %3$setatik %4$setara %5$s arte",
- "Every Month on the %1$s for the entire day" : "Hilabetero %1$sn egun osoan",
- "Every Month on the %1$s for the entire day until %2$s" : "Hilabetero %1$s(e)n egun osorako %2$s arte",
- "Every Month on the %1$s between %2$s - %3$s" : "Hilabetero %1$s(e)n %2$setatik %3$setara",
- "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Hilabetero %1$s(e)n %2$setatik %3$setara %4$s arte ",
- "Every %1$d Months on the %2$s for the entire day" : "%1$d hilabetero %2$s(e)n egun osorako",
- "Every %1$d Months on the %2$s for the entire day until %3$s" : "%1$d hilabetero %2$s(e)n egun osorako %3$s arte",
- "Every %1$d Months on the %2$s between %3$s - %4$s" : "%1$d hilabetero %2$s(e)n %3$setatik %4$setara",
- "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "%1$d hilabetero %2$s(e)n %3$setatik %4$setara %5$s arte",
- "Every Year in %1$s on the %2$s for the entire day" : "Urtero %1$sk %2$s egun osorako",
- "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Urtero %1$sk %2$s egun osorako %3$s arte",
- "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Urtero %1$sk %2$s %3$setatik %4$setara",
- "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Urtero %1$sk %2$s %3$setatik %4$setara %5$s arte",
- "Every %1$d Years in %2$s on the %3$s for the entire day" : "%1$d urtero %2$sk %3$s egun osorako",
- "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "%1$d urtero %2$sk %3$s egun osorako %4$s arte",
- "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "%1$d urtero %2$sk %3$s %4$setik %5$setara",
- "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%1$d urtero %2$sk %3$s %4$setatik%5$setara %6$s arte",
+ "Every Week on %1$s for the entire day" : "Astero %1$s(e)an egun osoan",
+ "Every Week on %1$s for the entire day until %2$s" : "Astero %1$s(e)an egun osorako %2$s arte",
+ "Every Week on %1$s between %2$s - %3$s" : "Astero %1$s(e)an %2$s eta %3$s artean",
+ "Every Week on %1$s between %2$s - %3$s until %4$s" : "Astero %1$s(e)an %2$s eta %3$s artean %4$s arte ",
+ "Every %1$d Weeks on %2$s for the entire day" : "%1$d astero %2$s(e)an egun osorako",
+ "Every %1$d Weeks on %2$s for the entire day until %3$s" : "%1$d astero %2$s(e)an egun osorako %3$s arte",
+ "Every %1$d Weeks on %2$s between %3$s - %4$s" : "%1$d astero %2$s(e)an %3$s eta %4$s artean",
+ "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "%1$d astero %2$s(e)an %3$s eta %4$s artean %5$s arte",
+ "Every Month on the %1$s for the entire day" : "Hilabetero %1$s(e)an egun osoan",
+ "Every Month on the %1$s for the entire day until %2$s" : "Hilabetero %1$s(e)an egun osorako %2$s arte",
+ "Every Month on the %1$s between %2$s - %3$s" : "Hilabetero %1$s(e)an %2$s eta %3$s artean",
+ "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Hilabetero %1$s(e)an %2$s eta %3$s artean %4$s arte ",
+ "Every %1$d Months on the %2$s for the entire day" : "%1$d hilabetero %2$s(e)an egun osorako",
+ "Every %1$d Months on the %2$s for the entire day until %3$s" : "%1$d hilabetero %2$s(e)an egun osorako %3$s arte",
+ "Every %1$d Months on the %2$s between %3$s - %4$s" : "%1$d hilabetero %2$s(e)an %3$s eta %4$s artean",
+ "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "%1$d hilabetero %2$s(e)an %3$s eta %4$s artean %5$s arte",
+ "Every Year in %1$s on the %2$s for the entire day" : "Urtero %1$s(e)n %2$s(e)an egun osorako",
+ "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Urtero %1$s(e)n %2$s(e)an egun osorako %3$s arte",
+ "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Urtero %1$s(e)n %2$s(e)an %3$s eta %4$s artean",
+ "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Urtero %1$s(e)n %2$s(e)an %3$s eta %4$s artean %5$s arte",
+ "Every %1$d Years in %2$s on the %3$s for the entire day" : "%1$d urtero %2$s(e)n %3$s(e)an egun osorako",
+ "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "%1$d urtero %2$s(e)n %3$s(e)an egun osorako %4$s arte",
+ "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "%1$d urtero %2$s(e)n %3$s(e)an %4$s eta %5$s artean",
+ "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%1$d urtero %2$s(e)n %3$s(e)an %4$s eta %5$s artean %6$s arte",
"On specific dates for the entire day until %1$s" : "Egun osoan data zehatzetan %1$s arte",
- "On specific dates between %1$s - %2$s until %3$s" : "Data zehatzetan %1$setatik %2$setara %3$s arte",
- "In a %1$s on %2$s" : "%1$s(e)an %2$sn",
- "In a %1$s on %2$s then on %3$s" : "%1$s(e)an %2$sn eta %3$sn",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s(e)an %2$sn eta %3$s eta %4$s(e)an",
- "In %1$s %2$s on %3$s" : "%1$sk %2$s %3$san ",
- "In %1$s %2$s on %3$s then on %4$s" : "%1$sk %2$s %3$s eta %4$san",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$sk %2$s %3$san eta gero %4$s eta %5$s(e)an",
+ "On specific dates between %1$s - %2$s until %3$s" : "Data zehatzetan %1$s eta %2$s artean %3$s arte",
+ "In the past on %1$s" : "Iraganean %1$s(e)an",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Minutu batean %1$s(e)an","%n minututan %1$s(e)an"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Ordu batean %1$s(e)an","%n ordutan %1$s(e)an"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["Egun batean %1$s(e)an","%n egunetan %1$s(e)an"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Aste batean %1$s(e)an","%n astetan %1$s(e)an"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["Hilabete batean %1$s(e)an","%n hilabetetan %1$s(e)an"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["Urte batean %1$s(e)an","%n urtetan %1$s(e)an"],
+ "In the past on %1$s then on %2$s" : "Iraganean %1$s(e)an eta %2$s(e)an",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Minutu batean %1$s(e)an eta %2$s(e)an","%n minututan %1$s(e)an eta %2$s(e)an"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Ordu batean %1$s(e)an eta %2$s(e)an","%n ordutan %1$s(e)an eta %2$s(e)an"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Egun batean %1$s(e)an eta %2$s(e)an","%n egunetan %1$s(e)an eta %2$s(e)an"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Aste batean %1$s(e)an eta %2$s(e)an","%n astetan %1$s(e)an eta %2$s(e)an"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Hilabete batean %1$s(e)an eta %2$s(e)an","%n hilabetetan %1$s(e)an eta %2$s(e)an"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Urte batean %1$s(e)an eta %2$s(e)an","%n urtetan %1$s(e)an eta %2$s(e)an"],
+ "In the past on %1$s then on %2$s and %3$s" : "Iraganean %1$s(e)an, %2$s(e)an eta %3$s(e)an",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Minutu batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n minututan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Ordu batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n ordutan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Egun batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n egunetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Aste batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n astetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Hilabete batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n hilabetetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Urte batean %1$s(e)an, %2$s(e)an eta %3$s(e)an","%n urtetan %1$s(e)an, %2$s(e)an eta %3$s(e)an"],
"Could not generate next recurrence statement" : "Ezin izan da sortu hurrengo errepikapen-adierazpena",
"Cancelled: %1$s" : "Utzita: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" bertan behera utzi da",
@@ -127,7 +152,7 @@
"Invitation updated: %1$s" : "Gonbidapena eguneratuta: %1$s",
"%1$s updated the event \"%2$s\"" : "%1$s-k \"%2$s\" ekitaldia eguneratu du",
"Invitation: %1$s" : "Gonbidapena: %1$s",
- "%1$s would like to invite you to \"%2$s\"" : "%1$s-k \"%2$s\"-ra gonbidatu nahi zaitu",
+ "%1$s would like to invite you to \"%2$s\"" : "%1$s-(e)k \"%2$s\"(e)ra gonbidatu nahi zaitu",
"Organizer:" : "Antolatzailea:",
"Attendees:" : "Parte-hartzaileak:",
"Title:" : "Izenburua:",
@@ -286,6 +311,16 @@
"Could not open file" : "Ezin izan da fitxategia ireki",
"Invalid chunk name" : "Zati izen baliogabea",
"Could not rename part file assembled from chunks" : "Ezin izan da zati-fitxategiaren izena aldatu zenbait zatiz osatuta dagoelako",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Zure lan orduak konfiguratzen badituzu, beste erabiltzaileek bulegotik kanpo zaudela ikusiko dute bilera bat erreserbatzen dutenean."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Zure lan orduak konfiguratzen badituzu, beste erabiltzaileek bulegotik kanpo zaudela ikusiko dute bilera bat erreserbatzen dutenean.",
+ "In a %1$s on %2$s for the entire day" : " %1$s batean %2$s(e)an egun osorako",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s batean %2$s(e)an %3$s eta %4$s artean",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s(e)n %2$s %3$s(e)an egun osorako",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s(e)n %2$s %3$s(e)an %4$s eta %5$s artean",
+ "In a %1$s on %2$s" : "%1$s batean %2$s(e)an",
+ "In a %1$s on %2$s then on %3$s" : "%1$s batean %2$s(e)an eta %3$s(e)an",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s batean %2$s(e)an, %3$s(e)an eta %4$s(e)an",
+ "In %1$s %2$s on %3$s" : "%1$s(e)n %2$s %3$s(e)an ",
+ "In %1$s %2$s on %3$s then on %4$s" : "%1$s(e)n %2$s %3$s(e)an eta %4$s(e)an",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$s(e)n %2$s %3$s(e)an, %4$s(e)an eta %5$s(e)an"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js
index 2329ac14627..c53e5eaf95a 100644
--- a/apps/dav/l10n/fr.js
+++ b/apps/dav/l10n/fr.js
@@ -72,10 +72,10 @@ OC.L10N.register(
"Description: %s" : "Description : %s",
"Where: %s" : "Où : %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Dans un(e) %1$s le %2$s pour la journée entière",
- "In a %1$s on %2$s between %3$s - %4$s" : "Dans un(e) %1$s le %2$s entre %3$s et %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Dans %1$s %2$s le %3$s pour la journée entière",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Dans %1$s %2$s le %3$s entre %4$s et %5$s",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Dans une minute le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Dans une heure le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Dans un jour le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Dans une semaine le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière"],
"Could not generate when statement" : "Impossible de déterminer quand",
"Every Day for the entire day" : "Chaque jour pour toute la journée",
"Every Day for the entire day until %1$s" : "Chaque jour pour toute la journée jusqu'au %1$s",
@@ -112,12 +112,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Tous les %1$d ans en %2$s le %3$s entre %4$s - %5$s jusqu'au %6$s",
"On specific dates for the entire day until %1$s" : "À une date spécifique pour la journée entière jusqu'au %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "À des dates spécifiques entre %1$s et %2$s jusqu'au %3$s",
- "In a %1$s on %2$s" : "Dans un(e) %1$s le %2$s",
- "In a %1$s on %2$s then on %3$s" : "Dans un(e) %1$s le %2$s puis le %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Dans un(e) %1$s le %2$s puis le %3$s et le %4$s",
- "In %1$s %2$s on %3$s" : "Dans %1$s %2$s le %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "Dans %1$s %2$s le %3$s puis le %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Dans %1$s %2$s le %3$s puis le %4$s et le %5$s",
"Could not generate next recurrence statement" : "Impossible de déterminer la prochaine récurrence",
"Cancelled: %1$s" : "Annulé : %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" a été annulé(e)",
@@ -288,6 +282,16 @@ OC.L10N.register(
"Could not open file" : "Impossible d'ouvrir le fichier",
"Invalid chunk name" : "Nom de morceau invalide",
"Could not rename part file assembled from chunks" : "Impossible de renommer le fichier partiel à partir des morceaux",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si vous configurez vos heures de travail, les autres utilisateurs verront si vous êtes disponible quand ils planifient une réunion."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si vous configurez vos heures de travail, les autres utilisateurs verront si vous êtes disponible quand ils planifient une réunion.",
+ "In a %1$s on %2$s for the entire day" : "Dans un(e) %1$s le %2$s pour la journée entière",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Dans un(e) %1$s le %2$s entre %3$s et %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Dans %1$s %2$s le %3$s pour la journée entière",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Dans %1$s %2$s le %3$s entre %4$s et %5$s",
+ "In a %1$s on %2$s" : "Dans un(e) %1$s le %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Dans un(e) %1$s le %2$s puis le %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Dans un(e) %1$s le %2$s puis le %3$s et le %4$s",
+ "In %1$s %2$s on %3$s" : "Dans %1$s %2$s le %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "Dans %1$s %2$s le %3$s puis le %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Dans %1$s %2$s le %3$s puis le %4$s et le %5$s"
},
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json
index 36b38ee5158..84d39aea1dc 100644
--- a/apps/dav/l10n/fr.json
+++ b/apps/dav/l10n/fr.json
@@ -70,10 +70,10 @@
"Description: %s" : "Description : %s",
"Where: %s" : "Où : %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Dans un(e) %1$s le %2$s pour la journée entière",
- "In a %1$s on %2$s between %3$s - %4$s" : "Dans un(e) %1$s le %2$s entre %3$s et %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Dans %1$s %2$s le %3$s pour la journée entière",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Dans %1$s %2$s le %3$s entre %4$s et %5$s",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Dans une minute le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Dans une heure le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Dans un jour le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Dans une semaine le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière"],
"Could not generate when statement" : "Impossible de déterminer quand",
"Every Day for the entire day" : "Chaque jour pour toute la journée",
"Every Day for the entire day until %1$s" : "Chaque jour pour toute la journée jusqu'au %1$s",
@@ -110,12 +110,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Tous les %1$d ans en %2$s le %3$s entre %4$s - %5$s jusqu'au %6$s",
"On specific dates for the entire day until %1$s" : "À une date spécifique pour la journée entière jusqu'au %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "À des dates spécifiques entre %1$s et %2$s jusqu'au %3$s",
- "In a %1$s on %2$s" : "Dans un(e) %1$s le %2$s",
- "In a %1$s on %2$s then on %3$s" : "Dans un(e) %1$s le %2$s puis le %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Dans un(e) %1$s le %2$s puis le %3$s et le %4$s",
- "In %1$s %2$s on %3$s" : "Dans %1$s %2$s le %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "Dans %1$s %2$s le %3$s puis le %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Dans %1$s %2$s le %3$s puis le %4$s et le %5$s",
"Could not generate next recurrence statement" : "Impossible de déterminer la prochaine récurrence",
"Cancelled: %1$s" : "Annulé : %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" a été annulé(e)",
@@ -286,6 +280,16 @@
"Could not open file" : "Impossible d'ouvrir le fichier",
"Invalid chunk name" : "Nom de morceau invalide",
"Could not rename part file assembled from chunks" : "Impossible de renommer le fichier partiel à partir des morceaux",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si vous configurez vos heures de travail, les autres utilisateurs verront si vous êtes disponible quand ils planifient une réunion."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si vous configurez vos heures de travail, les autres utilisateurs verront si vous êtes disponible quand ils planifient une réunion.",
+ "In a %1$s on %2$s for the entire day" : "Dans un(e) %1$s le %2$s pour la journée entière",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Dans un(e) %1$s le %2$s entre %3$s et %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Dans %1$s %2$s le %3$s pour la journée entière",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Dans %1$s %2$s le %3$s entre %4$s et %5$s",
+ "In a %1$s on %2$s" : "Dans un(e) %1$s le %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Dans un(e) %1$s le %2$s puis le %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Dans un(e) %1$s le %2$s puis le %3$s et le %4$s",
+ "In %1$s %2$s on %3$s" : "Dans %1$s %2$s le %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "Dans %1$s %2$s le %3$s puis le %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Dans %1$s %2$s le %3$s puis le %4$s et le %5$s"
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/ga.js b/apps/dav/l10n/ga.js
index 6585d4f3b69..a4f0735ab95 100644
--- a/apps/dav/l10n/ga.js
+++ b/apps/dav/l10n/ga.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "Cur síos: %s",
"Where: %s" : "Cá: %s",
"%1$s via %2$s" : "%1$s trí %2$s",
- "In a %1$s on %2$s for the entire day" : "I %1$s ar %2$s ar feadh an lae ar fad",
- "In a %1$s on %2$s between %3$s - %4$s" : "I %1$s ar %2$s idir %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "I %1$s %2$s ar %3$s ar feadh an lae ar fad",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "I %1$s %2$s ar %3$s idir %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "San am atá thart ar %1$s don lá ar fad",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["I gceann nóiméid ar%1$s don lá ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["I gceann uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["I lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["I gceann seachtaine ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["I gceann míosa ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["I gceann bliana ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad"],
+ "In the past on %1$s between %2$s - %3$s" : "San am a chuaigh thart ar %1$s idir %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["I gceann nóiméid ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["I gceann uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["I lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["I gceann seachtaine ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["I gceann míosa ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["I mbliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s"],
"Could not generate when statement" : "Níorbh fhéidir a ghiniúint nuair a ráiteas",
"Every Day for the entire day" : "Gach Lá don lá ar fad",
"Every Day for the entire day until %1$s" : "Gach Lá ar feadh an lae ar fad go dtí %1$s",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Gach %1$d Bliain i %2$s ar an %3$s idir %4$s - %5$s go %6$s",
"On specific dates for the entire day until %1$s" : "Ar dhátaí ar leith don lá iomlán go dtí %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "Ar dhátaí sonracha idir %1$s - %2$s go %3$s",
- "In a %1$s on %2$s" : "I %1$s ar %2$s",
- "In a %1$s on %2$s then on %3$s" : "I %1$s ar %2$s ansin ar %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "I %1$s ar %2$s ansin ar %3$s agus %4$s",
- "In %1$s %2$s on %3$s" : "I %1$s %2$s ar %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s ar %3$s ansin ar %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s ar %3$s ansin ar %4$s agus %5$s",
+ "In the past on %1$s" : "San am a chuaigh thart ar %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["I gceann nóiméid ar %1$s","I gceann %n nóiméad ar %1$s","I gceann %n nóiméad ar %1$s","I gceann %n nóiméad ar %1$s","I gceann %n nóiméad ar %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["I gceann uair an chloig ar %1$s","I gceann %n uair ar %1$s","I gceann %n uair ar %1$s","I gceann %n uair ar %1$s","I gceann %n uair ar %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["I gceann lá ar %1$s","I gceann %n lá ar %1$s","I gceann %n lá ar %1$s","I gceann %n lá ar %1$s","I gceann %n lá ar %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["I gceann seachtaine ar %1$s","I gceann %n seachtain ar %1$s","I gceann %n seachtain ar %1$s","I gceann %n seachtain ar %1$s","I gceann %n seachtain ar %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["I gceann míosa ar %1$s","I gceann %n mí ar %1$s","I gceann %n mí ar %1$s","I gceann %n mí ar %1$s","I gceann %n mí ar %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["I gceann bliana ar %1$s","I gceann %n bliain ar %1$s","I gceann %n bliain ar %1$s","I gceann %n bliain ar %1$s","I gceann %n bliain ar %1$s"],
+ "In the past on %1$s then on %2$s" : "San am a chuaigh thart ar %1$s agus ansin ar %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["I gceann nóiméid ar %1$s agus ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["I gceann uair an chloig ar %1$s agus ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["I gceann lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["I gceann seachtaine ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["I gceann míosa ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["I mbliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "San am a chuaigh thart ar %1$s ansin ar %2$s agus %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["I gceann nóiméid ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["I gceann uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["I gceann lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["I gceann seachtaine ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["I gceann míosa ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["I mbliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s"],
"Could not generate next recurrence statement" : "Níorbh fhéidir an chéad ráiteas atarlaithe eile a ghiniúint",
"Cancelled: %1$s" : "Ar ceal: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" curtha ar ceal",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "Níorbh fhéidir an comhad a oscailt",
"Invalid chunk name" : "Ainm smután neamhbhailí",
"Could not rename part file assembled from chunks" : "Níorbh fhéidir páirtchomhad a athainmniú as smután",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Má dhéanann tú d’uaireanta oibre a chumrú, feicfidh úsáideoirí eile nuair a bhíonn tú as oifig nuair a chuirfidh siad cruinniú in áirithe."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Má dhéanann tú d’uaireanta oibre a chumrú, feicfidh úsáideoirí eile nuair a bhíonn tú as oifig nuair a chuirfidh siad cruinniú in áirithe.",
+ "In a %1$s on %2$s for the entire day" : "I %1$s ar %2$s ar feadh an lae ar fad",
+ "In a %1$s on %2$s between %3$s - %4$s" : "I %1$s ar %2$s idir %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "I %1$s %2$s ar %3$s ar feadh an lae ar fad",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "I %1$s %2$s ar %3$s idir %4$s - %5$s",
+ "In a %1$s on %2$s" : "I %1$s ar %2$s",
+ "In a %1$s on %2$s then on %3$s" : "I %1$s ar %2$s ansin ar %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "I %1$s ar %2$s ansin ar %3$s agus %4$s",
+ "In %1$s %2$s on %3$s" : "I %1$s %2$s ar %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s ar %3$s ansin ar %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s ar %3$s ansin ar %4$s agus %5$s"
},
"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);");
diff --git a/apps/dav/l10n/ga.json b/apps/dav/l10n/ga.json
index 0356d0bf8e0..3fc005d64ac 100644
--- a/apps/dav/l10n/ga.json
+++ b/apps/dav/l10n/ga.json
@@ -70,10 +70,20 @@
"Description: %s" : "Cur síos: %s",
"Where: %s" : "Cá: %s",
"%1$s via %2$s" : "%1$s trí %2$s",
- "In a %1$s on %2$s for the entire day" : "I %1$s ar %2$s ar feadh an lae ar fad",
- "In a %1$s on %2$s between %3$s - %4$s" : "I %1$s ar %2$s idir %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "I %1$s %2$s ar %3$s ar feadh an lae ar fad",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "I %1$s %2$s ar %3$s idir %4$s - %5$s",
+ "In the past on %1$s for the entire day" : "San am atá thart ar %1$s don lá ar fad",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["I gceann nóiméid ar%1$s don lá ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad","I gceann %n nóiméad ar %1$s ar feadh an lae ar fad"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["I gceann uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad","I gceann %n uair an chloig ar %1$s don lá ar fad"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["I lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad","I gceann %n lá ar %1$s don lá ar fad"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["I gceann seachtaine ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad","I gceann %n seachtain ar %1$s don lá ar fad"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["I gceann míosa ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad","I gceann %n mí ar %1$s don lá ar fad"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["I gceann bliana ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad","I gceann %n bliain ar %1$s don lá ar fad"],
+ "In the past on %1$s between %2$s - %3$s" : "San am a chuaigh thart ar %1$s idir %2$s - %3$s",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["I gceann nóiméid ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s","I %n nóiméad ar %1$s idir %2$s - %3$s"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["I gceann uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s","I %n uair an chloig ar %1$s idir %2$s - %3$s"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["I lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s","I %n lá ar %1$s idir %2$s - %3$s"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["I gceann seachtaine ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s","I %n seachtain ar %1$s idir %2$s - %3$s"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["I gceann míosa ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s","I %n mí ar %1$s idir %2$s - %3$s"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["I mbliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s","I gceann %n bliain ar %1$s idir %2$s - %3$s"],
"Could not generate when statement" : "Níorbh fhéidir a ghiniúint nuair a ráiteas",
"Every Day for the entire day" : "Gach Lá don lá ar fad",
"Every Day for the entire day until %1$s" : "Gach Lá ar feadh an lae ar fad go dtí %1$s",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Gach %1$d Bliain i %2$s ar an %3$s idir %4$s - %5$s go %6$s",
"On specific dates for the entire day until %1$s" : "Ar dhátaí ar leith don lá iomlán go dtí %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "Ar dhátaí sonracha idir %1$s - %2$s go %3$s",
- "In a %1$s on %2$s" : "I %1$s ar %2$s",
- "In a %1$s on %2$s then on %3$s" : "I %1$s ar %2$s ansin ar %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "I %1$s ar %2$s ansin ar %3$s agus %4$s",
- "In %1$s %2$s on %3$s" : "I %1$s %2$s ar %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s ar %3$s ansin ar %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s ar %3$s ansin ar %4$s agus %5$s",
+ "In the past on %1$s" : "San am a chuaigh thart ar %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["I gceann nóiméid ar %1$s","I gceann %n nóiméad ar %1$s","I gceann %n nóiméad ar %1$s","I gceann %n nóiméad ar %1$s","I gceann %n nóiméad ar %1$s"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["I gceann uair an chloig ar %1$s","I gceann %n uair ar %1$s","I gceann %n uair ar %1$s","I gceann %n uair ar %1$s","I gceann %n uair ar %1$s"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["I gceann lá ar %1$s","I gceann %n lá ar %1$s","I gceann %n lá ar %1$s","I gceann %n lá ar %1$s","I gceann %n lá ar %1$s"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["I gceann seachtaine ar %1$s","I gceann %n seachtain ar %1$s","I gceann %n seachtain ar %1$s","I gceann %n seachtain ar %1$s","I gceann %n seachtain ar %1$s"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["I gceann míosa ar %1$s","I gceann %n mí ar %1$s","I gceann %n mí ar %1$s","I gceann %n mí ar %1$s","I gceann %n mí ar %1$s"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["I gceann bliana ar %1$s","I gceann %n bliain ar %1$s","I gceann %n bliain ar %1$s","I gceann %n bliain ar %1$s","I gceann %n bliain ar %1$s"],
+ "In the past on %1$s then on %2$s" : "San am a chuaigh thart ar %1$s agus ansin ar %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["I gceann nóiméid ar %1$s agus ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s","I gceann %n nóiméad ar %1$s ansin ar %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["I gceann uair an chloig ar %1$s agus ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["I gceann lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s","I gceann %n lá ar %1$s ansin ar %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["I gceann seachtaine ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s","I gceann %n seachtain ar %1$s ansin ar %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["I gceann míosa ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s","I gceann %n mí ar %1$s ansin ar %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["I mbliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s","I gceann %n bliain ar %1$s ansin ar %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "San am a chuaigh thart ar %1$s ansin ar %2$s agus %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["I gceann nóiméid ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s","I gceann %n nóiméad ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["I gceann uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s","I gceann %n uair an chloig ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["I gceann lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s","I gceann %n lá ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["I gceann seachtaine ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s","I gceann %n seachtain ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["I gceann míosa ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s","I gceann %n mí ar %1$s ansin ar %2$s agus %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["I mbliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s","I gceann %n bliain ar %1$s ansin ar %2$s agus %3$s"],
"Could not generate next recurrence statement" : "Níorbh fhéidir an chéad ráiteas atarlaithe eile a ghiniúint",
"Cancelled: %1$s" : "Ar ceal: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" curtha ar ceal",
@@ -286,6 +311,16 @@
"Could not open file" : "Níorbh fhéidir an comhad a oscailt",
"Invalid chunk name" : "Ainm smután neamhbhailí",
"Could not rename part file assembled from chunks" : "Níorbh fhéidir páirtchomhad a athainmniú as smután",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Má dhéanann tú d’uaireanta oibre a chumrú, feicfidh úsáideoirí eile nuair a bhíonn tú as oifig nuair a chuirfidh siad cruinniú in áirithe."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Má dhéanann tú d’uaireanta oibre a chumrú, feicfidh úsáideoirí eile nuair a bhíonn tú as oifig nuair a chuirfidh siad cruinniú in áirithe.",
+ "In a %1$s on %2$s for the entire day" : "I %1$s ar %2$s ar feadh an lae ar fad",
+ "In a %1$s on %2$s between %3$s - %4$s" : "I %1$s ar %2$s idir %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "I %1$s %2$s ar %3$s ar feadh an lae ar fad",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "I %1$s %2$s ar %3$s idir %4$s - %5$s",
+ "In a %1$s on %2$s" : "I %1$s ar %2$s",
+ "In a %1$s on %2$s then on %3$s" : "I %1$s ar %2$s ansin ar %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "I %1$s ar %2$s ansin ar %3$s agus %4$s",
+ "In %1$s %2$s on %3$s" : "I %1$s %2$s ar %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s ar %3$s ansin ar %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s ar %3$s ansin ar %4$s agus %5$s"
},"pluralForm" :"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/gl.js b/apps/dav/l10n/gl.js
index fbb39bfa090..8397504dc9d 100644
--- a/apps/dav/l10n/gl.js
+++ b/apps/dav/l10n/gl.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Descrición: %s",
"Where: %s" : "Onde: %s",
"%1$s via %2$s" : "%1$s mediante %2$s",
- "In a %1$s on %2$s for the entire day" : "Nun/ha %1$s o %2$s durante todo o día",
- "In a %1$s on %2$s between %3$s - %4$s" : "Nun/ha %1$s o %2$s entre %3$s e %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s o %3$s durante todo o día",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s o %3$s entre %4$s e %5$s",
"Could not generate when statement" : "Non foi posíbel xerar a declaración when (cando)",
"Every Day for the entire day" : "Todos os días durante todo o día",
"Every Day for the entire day until %1$s" : "Todos os días durante todo o día ata o %1$s",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Cada %1$d anos en %2$s, o %3$s entre %4$s e %5$s ata o %6$s",
"On specific dates for the entire day until %1$s" : "En datas concretas durante todo o día ata o %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "En datas concretas entre %1$s e %2$s ata o %3$s",
- "In a %1$s on %2$s" : "Nun/ha %1$s o %2$s",
- "In a %1$s on %2$s then on %3$s" : "Nun/ha %1$s o %2$s após o %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Nun/ha %1$s o %2$s após o %3$s e o %4$s",
- "In %1$s %2$s on %3$s" : "En %1$s %2$s o %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "En %1$s %2$s o %3$s, após o %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "En %1$s %2$s o %3$s, após o %4$s e o %5$s",
"Could not generate next recurrence statement" : "Non foi posíbel xerar a seguinte declaración de recorrencia",
"Cancelled: %1$s" : "Cancelado: %1$s",
"\"%1$s\" has been canceled" : "Cancelouse «%1$s»",
@@ -288,6 +278,16 @@ OC.L10N.register(
"Could not open file" : "Non foi posíbel abrir o ficheiro",
"Invalid chunk name" : "O nome do fragmento non é válido",
"Could not rename part file assembled from chunks" : "Non foi posíbel cambiar o nome do ficheiro de pezas ensamblados a partir de fragmentos",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se configura o seu horario de traballo, outros usuarios verán cando está fóra da oficina cando reserven unha xuntanza."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se configura o seu horario de traballo, outros usuarios verán cando está fóra da oficina cando reserven unha xuntanza.",
+ "In a %1$s on %2$s for the entire day" : "Nun/ha %1$s o %2$s durante todo o día",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Nun/ha %1$s o %2$s entre %3$s e %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s o %3$s durante todo o día",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s o %3$s entre %4$s e %5$s",
+ "In a %1$s on %2$s" : "Nun/ha %1$s o %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Nun/ha %1$s o %2$s após o %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Nun/ha %1$s o %2$s após o %3$s e o %4$s",
+ "In %1$s %2$s on %3$s" : "En %1$s %2$s o %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "En %1$s %2$s o %3$s, após o %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "En %1$s %2$s o %3$s, após o %4$s e o %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/gl.json b/apps/dav/l10n/gl.json
index 0d9100acecd..d22cb5ecef3 100644
--- a/apps/dav/l10n/gl.json
+++ b/apps/dav/l10n/gl.json
@@ -70,10 +70,6 @@
"Description: %s" : "Descrición: %s",
"Where: %s" : "Onde: %s",
"%1$s via %2$s" : "%1$s mediante %2$s",
- "In a %1$s on %2$s for the entire day" : "Nun/ha %1$s o %2$s durante todo o día",
- "In a %1$s on %2$s between %3$s - %4$s" : "Nun/ha %1$s o %2$s entre %3$s e %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s o %3$s durante todo o día",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s o %3$s entre %4$s e %5$s",
"Could not generate when statement" : "Non foi posíbel xerar a declaración when (cando)",
"Every Day for the entire day" : "Todos os días durante todo o día",
"Every Day for the entire day until %1$s" : "Todos os días durante todo o día ata o %1$s",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Cada %1$d anos en %2$s, o %3$s entre %4$s e %5$s ata o %6$s",
"On specific dates for the entire day until %1$s" : "En datas concretas durante todo o día ata o %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "En datas concretas entre %1$s e %2$s ata o %3$s",
- "In a %1$s on %2$s" : "Nun/ha %1$s o %2$s",
- "In a %1$s on %2$s then on %3$s" : "Nun/ha %1$s o %2$s após o %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Nun/ha %1$s o %2$s após o %3$s e o %4$s",
- "In %1$s %2$s on %3$s" : "En %1$s %2$s o %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "En %1$s %2$s o %3$s, após o %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "En %1$s %2$s o %3$s, após o %4$s e o %5$s",
"Could not generate next recurrence statement" : "Non foi posíbel xerar a seguinte declaración de recorrencia",
"Cancelled: %1$s" : "Cancelado: %1$s",
"\"%1$s\" has been canceled" : "Cancelouse «%1$s»",
@@ -286,6 +276,16 @@
"Could not open file" : "Non foi posíbel abrir o ficheiro",
"Invalid chunk name" : "O nome do fragmento non é válido",
"Could not rename part file assembled from chunks" : "Non foi posíbel cambiar o nome do ficheiro de pezas ensamblados a partir de fragmentos",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se configura o seu horario de traballo, outros usuarios verán cando está fóra da oficina cando reserven unha xuntanza."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se configura o seu horario de traballo, outros usuarios verán cando está fóra da oficina cando reserven unha xuntanza.",
+ "In a %1$s on %2$s for the entire day" : "Nun/ha %1$s o %2$s durante todo o día",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Nun/ha %1$s o %2$s entre %3$s e %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s o %3$s durante todo o día",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s o %3$s entre %4$s e %5$s",
+ "In a %1$s on %2$s" : "Nun/ha %1$s o %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Nun/ha %1$s o %2$s após o %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Nun/ha %1$s o %2$s após o %3$s e o %4$s",
+ "In %1$s %2$s on %3$s" : "En %1$s %2$s o %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "En %1$s %2$s o %3$s, após o %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "En %1$s %2$s o %3$s, após o %4$s e o %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/hu.js b/apps/dav/l10n/hu.js
index d49268d330a..d03ce041b5b 100644
--- a/apps/dav/l10n/hu.js
+++ b/apps/dav/l10n/hu.js
@@ -72,8 +72,6 @@ OC.L10N.register(
"Description: %s" : "Leírás: %s",
"Where: %s" : "Hely: %s",
"%1$s via %2$s" : "%1$s – %2$s",
- "In %1$s %2$s on %3$s for the entire day" : "%1$s-en %2$s %3$s-kor az teljes napra",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s múlva, %3$s napon %4$s - %5$s",
"Could not generate when statement" : "Nem sikerlt létrehozni a mikor állítást",
"Every Day for the entire day" : "Minden Nap a teljes napra",
"Every Day for the entire day until %1$s" : "Minden Nap a teljes napon eddig %1$s",
@@ -274,6 +272,8 @@ OC.L10N.register(
"Could not open file" : "A fájl nem nyitható meg",
"Invalid chunk name" : "Érvénytelen darabnév",
"Could not rename part file assembled from chunks" : "Nem lehet átnevezni a darabokból összeállított részleges fájlt",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ha beállítja a munkaidejét, akkor más felhasználók a megbeszélések létrehozásakor látni fogják, hogy Ön mikor nem érhető el."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ha beállítja a munkaidejét, akkor más felhasználók a megbeszélések létrehozásakor látni fogják, hogy Ön mikor nem érhető el.",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s-en %2$s %3$s-kor az teljes napra",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s múlva, %3$s napon %4$s - %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/hu.json b/apps/dav/l10n/hu.json
index d5c7feac428..67f88d07487 100644
--- a/apps/dav/l10n/hu.json
+++ b/apps/dav/l10n/hu.json
@@ -70,8 +70,6 @@
"Description: %s" : "Leírás: %s",
"Where: %s" : "Hely: %s",
"%1$s via %2$s" : "%1$s – %2$s",
- "In %1$s %2$s on %3$s for the entire day" : "%1$s-en %2$s %3$s-kor az teljes napra",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s múlva, %3$s napon %4$s - %5$s",
"Could not generate when statement" : "Nem sikerlt létrehozni a mikor állítást",
"Every Day for the entire day" : "Minden Nap a teljes napra",
"Every Day for the entire day until %1$s" : "Minden Nap a teljes napon eddig %1$s",
@@ -272,6 +270,8 @@
"Could not open file" : "A fájl nem nyitható meg",
"Invalid chunk name" : "Érvénytelen darabnév",
"Could not rename part file assembled from chunks" : "Nem lehet átnevezni a darabokból összeállított részleges fájlt",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ha beállítja a munkaidejét, akkor más felhasználók a megbeszélések létrehozásakor látni fogják, hogy Ön mikor nem érhető el."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ha beállítja a munkaidejét, akkor más felhasználók a megbeszélések létrehozásakor látni fogják, hogy Ön mikor nem érhető el.",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s-en %2$s %3$s-kor az teljes napra",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s múlva, %3$s napon %4$s - %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/ja.js b/apps/dav/l10n/ja.js
index 667ea721ef4..c68b4b090e7 100644
--- a/apps/dav/l10n/ja.js
+++ b/apps/dav/l10n/ja.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "説明:%s",
"Where: %s" : "場所:%s",
"%1$s via %2$s" : "%1$s に %2$s から",
- "In a %1$s on %2$s for the entire day" : "一日中%2$sの%1$sで",
- "In a %1$s on %2$s between %3$s - %4$s" : "%3$sから%4$sの間の%2$sの%1$sで",
- "In %1$s %2$s on %3$s for the entire day" : "終日、%3$sの%1$s %2$sにて",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%4$s-%5$s間の%3$sで%1$s %2$sに",
+ "In the past on %1$s for the entire day" : "過去に%1$sで終日",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["終日%1$sの%n分"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["終日%1$sの%n時間"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["終日%1$sの%n日"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["終日%1$sの%n週間"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["終日%1$sの%nヶ月"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["終日%1$sの%n年間"],
+ "In the past on %1$s between %2$s - %3$s" : "過去%1$s、%2$s~%3$sの間",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n分"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n時間"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n日間"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n週間"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%nヶ月"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n年間"],
"Could not generate when statement" : "when文を生成できませんでした",
"Every Day for the entire day" : "毎日、終日",
"Every Day for the entire day until %1$s" : "%1$sまでの終日、毎日",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%1$d年ごとの%2$s %3$s %4$s~%5$sの間、%6$sまで",
"On specific dates for the entire day until %1$s" : "%1$sまでの特定の日付の終日",
"On specific dates between %1$s - %2$s until %3$s" : "%1$s~%2$sの間、%3$sまでの特定の日付",
- "In a %1$s on %2$s" : "%2$sの%1$s",
- "In a %1$s on %2$s then on %3$s" : "%2$sそして%3$sの%1$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%2$sそして%3$sと%4$sの%1$s",
- "In %1$s %2$s on %3$s" : "%3$sの%1$s %2$s",
- "In %1$s %2$s on %3$s then on %4$s" : "%3$sそして%4$sの%1$s %2$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%3$sそして%4$sと%5$sの%1$s %2$s",
+ "In the past on %1$s" : "過去%1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["%1$sの%n分間"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["%1$sの%n時間"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["%1$sの%n日間"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["%1$sの%n週間"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["%1$sの%nヶ月"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["%1$sの%n年間"],
+ "In the past on %1$s then on %2$s" : "過去%1$s、その後%2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["過去%1$sの%n分間、その後%2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["過去%1$sの%n時間、その後%2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["過去%1$sの%n日間、その後%2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["過去%1$sの%n週間、その後%2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["過去%1$sの%nヶ月、その後%2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["過去%1$sの%n年間、その後%2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "過去%1$s、その後%2$sと%3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["%1$sの%n分間、その後%2$sと%3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["%1$sの%n時間、その後%2$sと%3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["%1$sの%n日間、その後%2$sと%3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["%1$sの%n週間、その後%2$sと%3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["%1$sの%nヶ月、その後%2$sと%3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["%1$sの%n年間、その後%2$sと%3$s"],
"Could not generate next recurrence statement" : "次の再帰ステートメントを生成できませんでした",
"Cancelled: %1$s" : "キャンセル: %1$s",
"\"%1$s\" has been canceled" : "%1$sはキャンセルされました",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "ファイルを開くことができませんでした",
"Invalid chunk name" : "無効なチャンク名",
"Could not rename part file assembled from chunks" : "チャンクから構成されている部分ファイルの名前の変更ができませんでした",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "勤務時間を設定すると、他のユーザが会議を予約する際に、あなたがいつ不在であるかがわかります。"
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "勤務時間を設定すると、他のユーザが会議を予約する際に、あなたがいつ不在であるかがわかります。",
+ "In a %1$s on %2$s for the entire day" : "一日中%2$sの%1$sで",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%3$sから%4$sの間の%2$sの%1$sで",
+ "In %1$s %2$s on %3$s for the entire day" : "終日、%3$sの%1$s %2$sにて",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%4$s-%5$s間の%3$sで%1$s %2$sに",
+ "In a %1$s on %2$s" : "%2$sの%1$s",
+ "In a %1$s on %2$s then on %3$s" : "%2$sそして%3$sの%1$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%2$sそして%3$sと%4$sの%1$s",
+ "In %1$s %2$s on %3$s" : "%3$sの%1$s %2$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "%3$sそして%4$sの%1$s %2$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%3$sそして%4$sと%5$sの%1$s %2$s"
},
"nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/ja.json b/apps/dav/l10n/ja.json
index 110411d636b..f4e7fe80740 100644
--- a/apps/dav/l10n/ja.json
+++ b/apps/dav/l10n/ja.json
@@ -70,10 +70,20 @@
"Description: %s" : "説明:%s",
"Where: %s" : "場所:%s",
"%1$s via %2$s" : "%1$s に %2$s から",
- "In a %1$s on %2$s for the entire day" : "一日中%2$sの%1$sで",
- "In a %1$s on %2$s between %3$s - %4$s" : "%3$sから%4$sの間の%2$sの%1$sで",
- "In %1$s %2$s on %3$s for the entire day" : "終日、%3$sの%1$s %2$sにて",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%4$s-%5$s間の%3$sで%1$s %2$sに",
+ "In the past on %1$s for the entire day" : "過去に%1$sで終日",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["終日%1$sの%n分"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["終日%1$sの%n時間"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["終日%1$sの%n日"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["終日%1$sの%n週間"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["終日%1$sの%nヶ月"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["終日%1$sの%n年間"],
+ "In the past on %1$s between %2$s - %3$s" : "過去%1$s、%2$s~%3$sの間",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n分"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n時間"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n日間"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n週間"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%nヶ月"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["%2$s~%3$sの間の%1$sの%n年間"],
"Could not generate when statement" : "when文を生成できませんでした",
"Every Day for the entire day" : "毎日、終日",
"Every Day for the entire day until %1$s" : "%1$sまでの終日、毎日",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%1$d年ごとの%2$s %3$s %4$s~%5$sの間、%6$sまで",
"On specific dates for the entire day until %1$s" : "%1$sまでの特定の日付の終日",
"On specific dates between %1$s - %2$s until %3$s" : "%1$s~%2$sの間、%3$sまでの特定の日付",
- "In a %1$s on %2$s" : "%2$sの%1$s",
- "In a %1$s on %2$s then on %3$s" : "%2$sそして%3$sの%1$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%2$sそして%3$sと%4$sの%1$s",
- "In %1$s %2$s on %3$s" : "%3$sの%1$s %2$s",
- "In %1$s %2$s on %3$s then on %4$s" : "%3$sそして%4$sの%1$s %2$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%3$sそして%4$sと%5$sの%1$s %2$s",
+ "In the past on %1$s" : "過去%1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["%1$sの%n分間"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["%1$sの%n時間"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["%1$sの%n日間"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["%1$sの%n週間"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["%1$sの%nヶ月"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["%1$sの%n年間"],
+ "In the past on %1$s then on %2$s" : "過去%1$s、その後%2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["過去%1$sの%n分間、その後%2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["過去%1$sの%n時間、その後%2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["過去%1$sの%n日間、その後%2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["過去%1$sの%n週間、その後%2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["過去%1$sの%nヶ月、その後%2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["過去%1$sの%n年間、その後%2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "過去%1$s、その後%2$sと%3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["%1$sの%n分間、その後%2$sと%3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["%1$sの%n時間、その後%2$sと%3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["%1$sの%n日間、その後%2$sと%3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["%1$sの%n週間、その後%2$sと%3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["%1$sの%nヶ月、その後%2$sと%3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["%1$sの%n年間、その後%2$sと%3$s"],
"Could not generate next recurrence statement" : "次の再帰ステートメントを生成できませんでした",
"Cancelled: %1$s" : "キャンセル: %1$s",
"\"%1$s\" has been canceled" : "%1$sはキャンセルされました",
@@ -286,6 +311,16 @@
"Could not open file" : "ファイルを開くことができませんでした",
"Invalid chunk name" : "無効なチャンク名",
"Could not rename part file assembled from chunks" : "チャンクから構成されている部分ファイルの名前の変更ができませんでした",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "勤務時間を設定すると、他のユーザが会議を予約する際に、あなたがいつ不在であるかがわかります。"
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "勤務時間を設定すると、他のユーザが会議を予約する際に、あなたがいつ不在であるかがわかります。",
+ "In a %1$s on %2$s for the entire day" : "一日中%2$sの%1$sで",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%3$sから%4$sの間の%2$sの%1$sで",
+ "In %1$s %2$s on %3$s for the entire day" : "終日、%3$sの%1$s %2$sにて",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%4$s-%5$s間の%3$sで%1$s %2$sに",
+ "In a %1$s on %2$s" : "%2$sの%1$s",
+ "In a %1$s on %2$s then on %3$s" : "%2$sそして%3$sの%1$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%2$sそして%3$sと%4$sの%1$s",
+ "In %1$s %2$s on %3$s" : "%3$sの%1$s %2$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "%3$sそして%4$sの%1$s %2$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%3$sそして%4$sと%5$sの%1$s %2$s"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/nb.js b/apps/dav/l10n/nb.js
index b29e4698971..1cf5d9fc3c8 100644
--- a/apps/dav/l10n/nb.js
+++ b/apps/dav/l10n/nb.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Beskrivelse: %s",
"Where: %s" : "Hvor: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Om %1$s på %2$s for hele dagen",
- "In a %1$s on %2$s between %3$s - %4$s" : "Om %1$s på %2$s mellom %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s på %3$s for hele dagen",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s på %3$s mellom %4$s - %5$s",
"Could not generate when statement" : "Kunne ikke generere når-beskrivelse",
"Every Day for the entire day" : "Hver dag for hele dagen",
"Every Day for the entire day until %1$s" : "Hver dag for hele dagen til %1$s",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Hvert %1$d år i %2$s på den %3$s mellom %4$s - %5$s til %6$s",
"On specific dates for the entire day until %1$s" : "På bestemte datoer for hele dagen til %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "På bestemte datoer mellom %1$s - %2$s til %3$s",
- "In a %1$s on %2$s" : "Om %1$s på %2$s",
- "In a %1$s on %2$s then on %3$s" : "Om %1$s på %2$s så på %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Om %1$s på %2$s så på %3$s og %4$s",
- "In %1$s %2$s on %3$s" : "Om %1$s %2$s på %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "Om %1$s %2$s på %3$s så på %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Om %1$s %2$s på %3$s så på %4$s og %5$s",
"Could not generate next recurrence statement" : "Kan ikke generere neste gjentakelse-beskrivelse",
"Cancelled: %1$s" : "Kansellerte: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" har blitt kansellert",
@@ -285,6 +275,16 @@ OC.L10N.register(
"Could not open file" : "Kunne ikke åpne fil",
"Invalid chunk name" : "Ugyldig bitnavn",
"Could not rename part file assembled from chunks" : "Kunne ikke gi nytt navn til delfil satt sammen fra biter",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Hvis du konfigurerer arbeidstiden din, vil andre brukere se når du ikke er på kontoret når de bestiller et møte."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Hvis du konfigurerer arbeidstiden din, vil andre brukere se når du ikke er på kontoret når de bestiller et møte.",
+ "In a %1$s on %2$s for the entire day" : "Om %1$s på %2$s for hele dagen",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Om %1$s på %2$s mellom %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s på %3$s for hele dagen",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s på %3$s mellom %4$s - %5$s",
+ "In a %1$s on %2$s" : "Om %1$s på %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Om %1$s på %2$s så på %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Om %1$s på %2$s så på %3$s og %4$s",
+ "In %1$s %2$s on %3$s" : "Om %1$s %2$s på %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "Om %1$s %2$s på %3$s så på %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Om %1$s %2$s på %3$s så på %4$s og %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/nb.json b/apps/dav/l10n/nb.json
index 0ac9066d3fa..a214650ee11 100644
--- a/apps/dav/l10n/nb.json
+++ b/apps/dav/l10n/nb.json
@@ -70,10 +70,6 @@
"Description: %s" : "Beskrivelse: %s",
"Where: %s" : "Hvor: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Om %1$s på %2$s for hele dagen",
- "In a %1$s on %2$s between %3$s - %4$s" : "Om %1$s på %2$s mellom %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s på %3$s for hele dagen",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s på %3$s mellom %4$s - %5$s",
"Could not generate when statement" : "Kunne ikke generere når-beskrivelse",
"Every Day for the entire day" : "Hver dag for hele dagen",
"Every Day for the entire day until %1$s" : "Hver dag for hele dagen til %1$s",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Hvert %1$d år i %2$s på den %3$s mellom %4$s - %5$s til %6$s",
"On specific dates for the entire day until %1$s" : "På bestemte datoer for hele dagen til %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "På bestemte datoer mellom %1$s - %2$s til %3$s",
- "In a %1$s on %2$s" : "Om %1$s på %2$s",
- "In a %1$s on %2$s then on %3$s" : "Om %1$s på %2$s så på %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Om %1$s på %2$s så på %3$s og %4$s",
- "In %1$s %2$s on %3$s" : "Om %1$s %2$s på %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "Om %1$s %2$s på %3$s så på %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Om %1$s %2$s på %3$s så på %4$s og %5$s",
"Could not generate next recurrence statement" : "Kan ikke generere neste gjentakelse-beskrivelse",
"Cancelled: %1$s" : "Kansellerte: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" har blitt kansellert",
@@ -283,6 +273,16 @@
"Could not open file" : "Kunne ikke åpne fil",
"Invalid chunk name" : "Ugyldig bitnavn",
"Could not rename part file assembled from chunks" : "Kunne ikke gi nytt navn til delfil satt sammen fra biter",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Hvis du konfigurerer arbeidstiden din, vil andre brukere se når du ikke er på kontoret når de bestiller et møte."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Hvis du konfigurerer arbeidstiden din, vil andre brukere se når du ikke er på kontoret når de bestiller et møte.",
+ "In a %1$s on %2$s for the entire day" : "Om %1$s på %2$s for hele dagen",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Om %1$s på %2$s mellom %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s på %3$s for hele dagen",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s på %3$s mellom %4$s - %5$s",
+ "In a %1$s on %2$s" : "Om %1$s på %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Om %1$s på %2$s så på %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Om %1$s på %2$s så på %3$s og %4$s",
+ "In %1$s %2$s on %3$s" : "Om %1$s %2$s på %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "Om %1$s %2$s på %3$s så på %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Om %1$s %2$s på %3$s så på %4$s og %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/pt_BR.js b/apps/dav/l10n/pt_BR.js
index e19ba835955..d484b5f04bd 100644
--- a/apps/dav/l10n/pt_BR.js
+++ b/apps/dav/l10n/pt_BR.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Descrição: %s",
"Where: %s" : "Onde: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Em %1$s em %2$s durante todo o dia",
- "In a %1$s on %2$s between %3$s - %4$s" : "Em um %1$s sobre %2$s entre %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Em %1$s %2$s em %3$s durante todo o dia",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Em %1$s %2$s em %3$s entre %4$s - %5$s",
"Could not generate when statement" : "Não foi possível gerar a instrução Quando",
"Every Day for the entire day" : "Todos os dias durante todo o dia",
"Every Day for the entire day until %1$s" : "Todos os dias durante todo o dia até %1$s",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "A cada %1$d Anos em %2$s nos %3$s entre %4$s - %5$s até%6$s",
"On specific dates for the entire day until %1$s" : "Em datas específicas durante todo o dia até %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "Em datas específicas entre %1$s - %2$s até%3$s",
- "In a %1$s on %2$s" : "Em um %1$s em %2$s",
- "In a %1$s on %2$s then on %3$s" : "Em %1$s em %2$s e depois %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Em %1$s em %2$s, depois em %3$s e %4$s",
- "In %1$s %2$s on %3$s" : "Em %1$s %2$s em %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s em %3$s então em %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Em %1$s %2$s em %3$s depois em %4$s e %5$s",
"Could not generate next recurrence statement" : "Não foi possível gerar a próxima instrução de recorrência",
"Cancelled: %1$s" : "Cancelado: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" foi cancelado",
@@ -288,6 +278,16 @@ OC.L10N.register(
"Could not open file" : "Não pode abrir o arquivo",
"Invalid chunk name" : "Nome do bloco inválido",
"Could not rename part file assembled from chunks" : "Não foi possível renomear parte do arquivo montado a partir de pedaços",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se você configurar seu horário de trabalho, outros usuários verão quando você estiver fora do escritório quando marcarem uma reunião. "
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se você configurar seu horário de trabalho, outros usuários verão quando você estiver fora do escritório quando marcarem uma reunião. ",
+ "In a %1$s on %2$s for the entire day" : "Em %1$s em %2$s durante todo o dia",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Em um %1$s sobre %2$s entre %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Em %1$s %2$s em %3$s durante todo o dia",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Em %1$s %2$s em %3$s entre %4$s - %5$s",
+ "In a %1$s on %2$s" : "Em um %1$s em %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Em %1$s em %2$s e depois %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Em %1$s em %2$s, depois em %3$s e %4$s",
+ "In %1$s %2$s on %3$s" : "Em %1$s %2$s em %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s em %3$s então em %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Em %1$s %2$s em %3$s depois em %4$s e %5$s"
},
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/pt_BR.json b/apps/dav/l10n/pt_BR.json
index 2ec0872b96c..e50fdb779af 100644
--- a/apps/dav/l10n/pt_BR.json
+++ b/apps/dav/l10n/pt_BR.json
@@ -70,10 +70,6 @@
"Description: %s" : "Descrição: %s",
"Where: %s" : "Onde: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Em %1$s em %2$s durante todo o dia",
- "In a %1$s on %2$s between %3$s - %4$s" : "Em um %1$s sobre %2$s entre %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Em %1$s %2$s em %3$s durante todo o dia",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Em %1$s %2$s em %3$s entre %4$s - %5$s",
"Could not generate when statement" : "Não foi possível gerar a instrução Quando",
"Every Day for the entire day" : "Todos os dias durante todo o dia",
"Every Day for the entire day until %1$s" : "Todos os dias durante todo o dia até %1$s",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "A cada %1$d Anos em %2$s nos %3$s entre %4$s - %5$s até%6$s",
"On specific dates for the entire day until %1$s" : "Em datas específicas durante todo o dia até %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "Em datas específicas entre %1$s - %2$s até%3$s",
- "In a %1$s on %2$s" : "Em um %1$s em %2$s",
- "In a %1$s on %2$s then on %3$s" : "Em %1$s em %2$s e depois %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "Em %1$s em %2$s, depois em %3$s e %4$s",
- "In %1$s %2$s on %3$s" : "Em %1$s %2$s em %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s em %3$s então em %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Em %1$s %2$s em %3$s depois em %4$s e %5$s",
"Could not generate next recurrence statement" : "Não foi possível gerar a próxima instrução de recorrência",
"Cancelled: %1$s" : "Cancelado: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" foi cancelado",
@@ -286,6 +276,16 @@
"Could not open file" : "Não pode abrir o arquivo",
"Invalid chunk name" : "Nome do bloco inválido",
"Could not rename part file assembled from chunks" : "Não foi possível renomear parte do arquivo montado a partir de pedaços",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se você configurar seu horário de trabalho, outros usuários verão quando você estiver fora do escritório quando marcarem uma reunião. "
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se você configurar seu horário de trabalho, outros usuários verão quando você estiver fora do escritório quando marcarem uma reunião. ",
+ "In a %1$s on %2$s for the entire day" : "Em %1$s em %2$s durante todo o dia",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Em um %1$s sobre %2$s entre %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Em %1$s %2$s em %3$s durante todo o dia",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Em %1$s %2$s em %3$s entre %4$s - %5$s",
+ "In a %1$s on %2$s" : "Em um %1$s em %2$s",
+ "In a %1$s on %2$s then on %3$s" : "Em %1$s em %2$s e depois %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "Em %1$s em %2$s, depois em %3$s e %4$s",
+ "In %1$s %2$s on %3$s" : "Em %1$s %2$s em %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "In %1$s %2$s em %3$s então em %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "Em %1$s %2$s em %3$s depois em %4$s e %5$s"
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/sr.js b/apps/dav/l10n/sr.js
index d236afe25e0..0316ebecc19 100644
--- a/apps/dav/l10n/sr.js
+++ b/apps/dav/l10n/sr.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Опис: %s",
"Where: %s" : "Место: %s",
"%1$s via %2$s" : "%1$s преко %2$s",
- "In a %1$s on %2$s for the entire day" : "У %1$s дана %2$s током целог дана",
- "In a %1$s on %2$s between %3$s - %4$s" : "У %1$s дана %2$s од %3$s до %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "У %1$s %2$s дана %3$s током целог дана",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "У %1$s %2$s дана %3$s од %4$s до %5$s",
"Could not generate when statement" : "Не може да се генерише одредба када",
"Every Day for the entire day" : "Сваки дан током целог дана",
"Every Day for the entire day until %1$s" : "Сваки дан током целог дана, све до %1$s",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%2$s сваких %1$d година, дана %3$s од %4$s до %5$s све до %6$s",
"On specific dates for the entire day until %1$s" : "Одређених дана током целог дана, све до %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "Одређених дана од %1$s до %2$s све до %3$s",
- "In a %1$s on %2$s" : "За %1$s у %2$s",
- "In a %1$s on %2$s then on %3$s" : "За %1$s у %2$s, па онда %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s у %2$s, па онда %3$s и %4$s",
- "In %1$s %2$s on %3$s" : "За %1$s %2$s у %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "За %1$s %2$s у %3$s, па онда у %4$s ",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s %2$s у %3$s, па онда у %4$s и %5$s ",
"Could not generate next recurrence statement" : "Није могла да се генерише одредба следћег појављивања",
"Cancelled: %1$s" : "Отказано: %1$s",
"\"%1$s\" has been canceled" : "„%1$s” је отказано",
@@ -288,6 +278,16 @@ OC.L10N.register(
"Could not open file" : "Фајл не може да се отвори",
"Invalid chunk name" : "Неисправни назив комада",
"Could not rename part file assembled from chunks" : "Име делимичног фајла састављеног од комада не може да се промени",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако подесите своје радне сате, када буду заказивали састанак, остали корисници ће видети када сте ван канцеларије."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако подесите своје радне сате, када буду заказивали састанак, остали корисници ће видети када сте ван канцеларије.",
+ "In a %1$s on %2$s for the entire day" : "У %1$s дана %2$s током целог дана",
+ "In a %1$s on %2$s between %3$s - %4$s" : "У %1$s дана %2$s од %3$s до %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "У %1$s %2$s дана %3$s током целог дана",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "У %1$s %2$s дана %3$s од %4$s до %5$s",
+ "In a %1$s on %2$s" : "За %1$s у %2$s",
+ "In a %1$s on %2$s then on %3$s" : "За %1$s у %2$s, па онда %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s у %2$s, па онда %3$s и %4$s",
+ "In %1$s %2$s on %3$s" : "За %1$s %2$s у %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "За %1$s %2$s у %3$s, па онда у %4$s ",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s %2$s у %3$s, па онда у %4$s и %5$s "
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/dav/l10n/sr.json b/apps/dav/l10n/sr.json
index b760630713c..073e42f8ac7 100644
--- a/apps/dav/l10n/sr.json
+++ b/apps/dav/l10n/sr.json
@@ -70,10 +70,6 @@
"Description: %s" : "Опис: %s",
"Where: %s" : "Место: %s",
"%1$s via %2$s" : "%1$s преко %2$s",
- "In a %1$s on %2$s for the entire day" : "У %1$s дана %2$s током целог дана",
- "In a %1$s on %2$s between %3$s - %4$s" : "У %1$s дана %2$s од %3$s до %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "У %1$s %2$s дана %3$s током целог дана",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "У %1$s %2$s дана %3$s од %4$s до %5$s",
"Could not generate when statement" : "Не може да се генерише одредба када",
"Every Day for the entire day" : "Сваки дан током целог дана",
"Every Day for the entire day until %1$s" : "Сваки дан током целог дана, све до %1$s",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "%2$s сваких %1$d година, дана %3$s од %4$s до %5$s све до %6$s",
"On specific dates for the entire day until %1$s" : "Одређених дана током целог дана, све до %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "Одређених дана од %1$s до %2$s све до %3$s",
- "In a %1$s on %2$s" : "За %1$s у %2$s",
- "In a %1$s on %2$s then on %3$s" : "За %1$s у %2$s, па онда %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s у %2$s, па онда %3$s и %4$s",
- "In %1$s %2$s on %3$s" : "За %1$s %2$s у %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "За %1$s %2$s у %3$s, па онда у %4$s ",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s %2$s у %3$s, па онда у %4$s и %5$s ",
"Could not generate next recurrence statement" : "Није могла да се генерише одредба следћег појављивања",
"Cancelled: %1$s" : "Отказано: %1$s",
"\"%1$s\" has been canceled" : "„%1$s” је отказано",
@@ -286,6 +276,16 @@
"Could not open file" : "Фајл не може да се отвори",
"Invalid chunk name" : "Неисправни назив комада",
"Could not rename part file assembled from chunks" : "Име делимичног фајла састављеног од комада не може да се промени",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако подесите своје радне сате, када буду заказивали састанак, остали корисници ће видети када сте ван канцеларије."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако подесите своје радне сате, када буду заказивали састанак, остали корисници ће видети када сте ван канцеларије.",
+ "In a %1$s on %2$s for the entire day" : "У %1$s дана %2$s током целог дана",
+ "In a %1$s on %2$s between %3$s - %4$s" : "У %1$s дана %2$s од %3$s до %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "У %1$s %2$s дана %3$s током целог дана",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "У %1$s %2$s дана %3$s од %4$s до %5$s",
+ "In a %1$s on %2$s" : "За %1$s у %2$s",
+ "In a %1$s on %2$s then on %3$s" : "За %1$s у %2$s, па онда %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s у %2$s, па онда %3$s и %4$s",
+ "In %1$s %2$s on %3$s" : "За %1$s %2$s у %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "За %1$s %2$s у %3$s, па онда у %4$s ",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s %2$s у %3$s, па онда у %4$s и %5$s "
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/sv.js b/apps/dav/l10n/sv.js
index 7be6d9654ee..3e3ee103356 100644
--- a/apps/dav/l10n/sv.js
+++ b/apps/dav/l10n/sv.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Beskrivning: %s",
"Where: %s" : "Var: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Om en %1$s den %2$s, hela dagen",
- "In a %1$s on %2$s between %3$s - %4$s" : "Om en %1$s den %2$s mellan %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s den %3$s, hela dagen",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s den %3$s mellan %4$s - %5$s",
"Every Day for the entire day" : "Varje dag hela dagen",
"Every Day for the entire day until %1$s" : "Varje dag hela dagen tills den %1$s",
"Every Day between %1$s - %2$s" : "Varje dag mellan %1$s - %2$s",
@@ -111,12 +107,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Vart %1$d år i %2$s på den %3$s mellan %4$s - %5$s till %6$s",
"On specific dates for the entire day until %1$s" : "På specifika datum hela dagen fram till kl %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "På specifika datum mellan %1$s - %2$s tills %3$s",
- "In a %1$s on %2$s" : "I en %1$s på %2$s",
- "In a %1$s on %2$s then on %3$s" : "I en %1$s på %2$s sedan på %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "I en %1$s på %2$s sedan på %3$s och %4$s",
- "In %1$s %2$s on %3$s" : "I %1$s %2$s på %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s på %3$s sedan på %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s på %3$s sedan på %4$s och %5$s",
"Could not generate next recurrence statement" : "Kunde inte generera nästa händelseupprepning",
"Cancelled: %1$s" : "Avbruten: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" har avbrutits",
@@ -287,6 +277,16 @@ OC.L10N.register(
"Could not open file" : "Kunde inte öppna fil",
"Invalid chunk name" : "Ogiltigt delnamn",
"Could not rename part file assembled from chunks" : "Kunde inte ändra namn på temporära filen ihopsatt från delar",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Om du konfigurerar dina arbetstimmar kan andra användare se när du inte är på jobbet när de bokar ett möte."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Om du konfigurerar dina arbetstimmar kan andra användare se när du inte är på jobbet när de bokar ett möte.",
+ "In a %1$s on %2$s for the entire day" : "Om en %1$s den %2$s, hela dagen",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Om en %1$s den %2$s mellan %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s den %3$s, hela dagen",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s den %3$s mellan %4$s - %5$s",
+ "In a %1$s on %2$s" : "I en %1$s på %2$s",
+ "In a %1$s on %2$s then on %3$s" : "I en %1$s på %2$s sedan på %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "I en %1$s på %2$s sedan på %3$s och %4$s",
+ "In %1$s %2$s on %3$s" : "I %1$s %2$s på %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s på %3$s sedan på %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s på %3$s sedan på %4$s och %5$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/sv.json b/apps/dav/l10n/sv.json
index 905343045c2..1e5cb0da86f 100644
--- a/apps/dav/l10n/sv.json
+++ b/apps/dav/l10n/sv.json
@@ -70,10 +70,6 @@
"Description: %s" : "Beskrivning: %s",
"Where: %s" : "Var: %s",
"%1$s via %2$s" : "%1$s via %2$s",
- "In a %1$s on %2$s for the entire day" : "Om en %1$s den %2$s, hela dagen",
- "In a %1$s on %2$s between %3$s - %4$s" : "Om en %1$s den %2$s mellan %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s den %3$s, hela dagen",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s den %3$s mellan %4$s - %5$s",
"Every Day for the entire day" : "Varje dag hela dagen",
"Every Day for the entire day until %1$s" : "Varje dag hela dagen tills den %1$s",
"Every Day between %1$s - %2$s" : "Varje dag mellan %1$s - %2$s",
@@ -109,12 +105,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Vart %1$d år i %2$s på den %3$s mellan %4$s - %5$s till %6$s",
"On specific dates for the entire day until %1$s" : "På specifika datum hela dagen fram till kl %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "På specifika datum mellan %1$s - %2$s tills %3$s",
- "In a %1$s on %2$s" : "I en %1$s på %2$s",
- "In a %1$s on %2$s then on %3$s" : "I en %1$s på %2$s sedan på %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "I en %1$s på %2$s sedan på %3$s och %4$s",
- "In %1$s %2$s on %3$s" : "I %1$s %2$s på %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s på %3$s sedan på %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s på %3$s sedan på %4$s och %5$s",
"Could not generate next recurrence statement" : "Kunde inte generera nästa händelseupprepning",
"Cancelled: %1$s" : "Avbruten: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" har avbrutits",
@@ -285,6 +275,16 @@
"Could not open file" : "Kunde inte öppna fil",
"Invalid chunk name" : "Ogiltigt delnamn",
"Could not rename part file assembled from chunks" : "Kunde inte ändra namn på temporära filen ihopsatt från delar",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Om du konfigurerar dina arbetstimmar kan andra användare se när du inte är på jobbet när de bokar ett möte."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Om du konfigurerar dina arbetstimmar kan andra användare se när du inte är på jobbet när de bokar ett möte.",
+ "In a %1$s on %2$s for the entire day" : "Om en %1$s den %2$s, hela dagen",
+ "In a %1$s on %2$s between %3$s - %4$s" : "Om en %1$s den %2$s mellan %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "Om %1$s %2$s den %3$s, hela dagen",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "Om %1$s %2$s den %3$s mellan %4$s - %5$s",
+ "In a %1$s on %2$s" : "I en %1$s på %2$s",
+ "In a %1$s on %2$s then on %3$s" : "I en %1$s på %2$s sedan på %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "I en %1$s på %2$s sedan på %3$s och %4$s",
+ "In %1$s %2$s on %3$s" : "I %1$s %2$s på %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "I %1$s %2$s på %3$s sedan på %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "I %1$s %2$s på %3$s sedan på %4$s och %5$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/tr.js b/apps/dav/l10n/tr.js
index fa792cebaaf..141978db1f3 100644
--- a/apps/dav/l10n/tr.js
+++ b/apps/dav/l10n/tr.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Açıklama: %s",
"Where: %s" : "Şurada: %s",
"%1$s via %2$s" : "%1$s, %2$s aracılığıyla",
- "In a %1$s on %2$s for the entire day" : "Tüm gün boyunca %1$s içinde %2$s zamanında",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s içinde %2$s zamanında %3$sile %4$s arasında",
- "In %1$s %2$s on %3$s for the entire day" : "Tüm gün boyunca %1$s %2$s içinde %3$s zamanında",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s içinde %3$s zamanında %4$s ile %5$s arasında",
"Could not generate when statement" : "Zaman ifadesi oluşturulamadı",
"Every Day for the entire day" : "Her gün tüm gün boyunca",
"Every Day for the entire day until %1$s" : "%1$s zamanına kadar her gün tüm gün boyunca",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Her %1$d yılda bir %2$s ayında %3$s %4$s ile %5$s arasında %6$s zamanına kadar",
"On specific dates for the entire day until %1$s" : "Belirli tarihlerde tüm gün boyunca %1$s zamanına kadar",
"On specific dates between %1$s - %2$s until %3$s" : "Belirli günlerde %1$s ile %2$s arasında %3$s zamanına kadar",
- "In a %1$s on %2$s" : "%1$s içinde %2$s",
- "In a %1$s on %2$s then on %3$s" : "%1$s içinde %2$s ve %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s içinde %2$s, %3$s ve %4$s",
- "In %1$s %2$s on %3$s" : "%1$s %2$s içinde %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "%1$s %2$s içinde %3$s ve %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$s %2$s içinde %3$s, %4$s ve %5$s",
"Could not generate next recurrence statement" : "Sonraki yinelenme ifadesi oluşturulamadı",
"Cancelled: %1$s" : "İptal edildi: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" iptal edildi",
@@ -288,6 +278,16 @@ OC.L10N.register(
"Could not open file" : "Dosya açılamadı",
"Invalid chunk name" : "Parça adı geçersiz",
"Could not rename part file assembled from chunks" : "Parçalardan oluşturulan parça dosyası yeniden adlandırılamadı ",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Çalışma saatlerinizi ayarlarsanız, diğer kullanıcılar bir toplantı ayarladıklarında ofis dışında olduğunuzu görürler."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Çalışma saatlerinizi ayarlarsanız, diğer kullanıcılar bir toplantı ayarladıklarında ofis dışında olduğunuzu görürler.",
+ "In a %1$s on %2$s for the entire day" : "Tüm gün boyunca %1$s içinde %2$s zamanında",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s içinde %2$s zamanında %3$sile %4$s arasında",
+ "In %1$s %2$s on %3$s for the entire day" : "Tüm gün boyunca %1$s %2$s içinde %3$s zamanında",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s içinde %3$s zamanında %4$s ile %5$s arasında",
+ "In a %1$s on %2$s" : "%1$s içinde %2$s",
+ "In a %1$s on %2$s then on %3$s" : "%1$s içinde %2$s ve %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s içinde %2$s, %3$s ve %4$s",
+ "In %1$s %2$s on %3$s" : "%1$s %2$s içinde %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "%1$s %2$s içinde %3$s ve %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$s %2$s içinde %3$s, %4$s ve %5$s"
},
"nplurals=2; plural=(n > 1);");
diff --git a/apps/dav/l10n/tr.json b/apps/dav/l10n/tr.json
index 1a539b29251..cd460e2ad66 100644
--- a/apps/dav/l10n/tr.json
+++ b/apps/dav/l10n/tr.json
@@ -70,10 +70,6 @@
"Description: %s" : "Açıklama: %s",
"Where: %s" : "Şurada: %s",
"%1$s via %2$s" : "%1$s, %2$s aracılığıyla",
- "In a %1$s on %2$s for the entire day" : "Tüm gün boyunca %1$s içinde %2$s zamanında",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s içinde %2$s zamanında %3$sile %4$s arasında",
- "In %1$s %2$s on %3$s for the entire day" : "Tüm gün boyunca %1$s %2$s içinde %3$s zamanında",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s içinde %3$s zamanında %4$s ile %5$s arasında",
"Could not generate when statement" : "Zaman ifadesi oluşturulamadı",
"Every Day for the entire day" : "Her gün tüm gün boyunca",
"Every Day for the entire day until %1$s" : "%1$s zamanına kadar her gün tüm gün boyunca",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Her %1$d yılda bir %2$s ayında %3$s %4$s ile %5$s arasında %6$s zamanına kadar",
"On specific dates for the entire day until %1$s" : "Belirli tarihlerde tüm gün boyunca %1$s zamanına kadar",
"On specific dates between %1$s - %2$s until %3$s" : "Belirli günlerde %1$s ile %2$s arasında %3$s zamanına kadar",
- "In a %1$s on %2$s" : "%1$s içinde %2$s",
- "In a %1$s on %2$s then on %3$s" : "%1$s içinde %2$s ve %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s içinde %2$s, %3$s ve %4$s",
- "In %1$s %2$s on %3$s" : "%1$s %2$s içinde %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "%1$s %2$s içinde %3$s ve %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$s %2$s içinde %3$s, %4$s ve %5$s",
"Could not generate next recurrence statement" : "Sonraki yinelenme ifadesi oluşturulamadı",
"Cancelled: %1$s" : "İptal edildi: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" iptal edildi",
@@ -286,6 +276,16 @@
"Could not open file" : "Dosya açılamadı",
"Invalid chunk name" : "Parça adı geçersiz",
"Could not rename part file assembled from chunks" : "Parçalardan oluşturulan parça dosyası yeniden adlandırılamadı ",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Çalışma saatlerinizi ayarlarsanız, diğer kullanıcılar bir toplantı ayarladıklarında ofis dışında olduğunuzu görürler."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Çalışma saatlerinizi ayarlarsanız, diğer kullanıcılar bir toplantı ayarladıklarında ofis dışında olduğunuzu görürler.",
+ "In a %1$s on %2$s for the entire day" : "Tüm gün boyunca %1$s içinde %2$s zamanında",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s içinde %2$s zamanında %3$sile %4$s arasında",
+ "In %1$s %2$s on %3$s for the entire day" : "Tüm gün boyunca %1$s %2$s içinde %3$s zamanında",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s içinde %3$s zamanında %4$s ile %5$s arasında",
+ "In a %1$s on %2$s" : "%1$s içinde %2$s",
+ "In a %1$s on %2$s then on %3$s" : "%1$s içinde %2$s ve %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%1$s içinde %2$s, %3$s ve %4$s",
+ "In %1$s %2$s on %3$s" : "%1$s %2$s içinde %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "%1$s %2$s içinde %3$s ve %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1$s %2$s içinde %3$s, %4$s ve %5$s"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/ug.js b/apps/dav/l10n/ug.js
index e0e5749d7de..0aeea75479b 100644
--- a/apps/dav/l10n/ug.js
+++ b/apps/dav/l10n/ug.js
@@ -65,10 +65,6 @@ OC.L10N.register(
"Description: %s" : "چۈشەندۈرۈش:% s",
"Where: %s" : "قەيەردە:% s",
"%1$s via %2$s" : "%1 $ s ئارقىلىق%2 $ s",
- "In a %1$s on %2$s for the entire day" : "پۈتۈن كۈن ئۈچۈن%2 $ s دىكى%1 $ s ئىچىدە",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1 $ s دىكى%2 $ s دىكى%3 $ s -%4 $ s ئارىلىقىدا",
- "In %1$s %2$s on %3$s for the entire day" : "%1 $ s%2 $ s پۈتۈن كۈن%3 $ s",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1 $ s%2 $ s%3 $ s دىكى%4 $ s -%5 $ s ئارىلىقىدا",
"Could not generate when statement" : "بايان قىلغاندا ھاسىل قىلالمىدى",
"Every Day for the entire day" : "ھەر بىر كۈن پۈتۈن بىر كۈن",
"Every Day for the entire day until %1$s" : "ھەر بىر كۈن پۈتۈن كۈن%1 $ s غىچە",
@@ -105,12 +101,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "ھەر%1 $ d يىللار%2 $ s دىكى%3 $ s دىكى%4 $ s -%5 $ s ئارىلىقىدىكى%6 $ s",
"On specific dates for the entire day until %1$s" : "پۈتۈن كۈندىكى كونكرېت كۈنلەردە%1 $ s غىچە",
"On specific dates between %1$s - %2$s until %3$s" : "كونكرېت كۈنلەردە%1 $ s -%2 $ s ئارىلىقىدا%3 $ s غىچە",
- "In a %1$s on %2$s" : "%2 $ s دىكى%1 $ s",
- "In a %1$s on %2$s then on %3$s" : "%2 $ s دىكى%1 $ s دە ئاندىن%3 $ s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%2 $ s دىكى%1 $ s ئاندىن%3 $ s ۋە%4 $ s",
- "In %1$s %2$s on %3$s" : "%3 $ s دىكى%1 $ s%2 $ s",
- "In %1$s %2$s on %3$s then on %4$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s ۋە%5 $ s",
"Could not generate next recurrence statement" : "كېيىنكى تەكرارلىنىش باياناتىنى ھاسىل قىلالمىدى",
"Cancelled: %1$s" : "ئەمەلدىن قالدۇرۇلدى:%1 $ s",
"\"%1$s\" has been canceled" : "\"%1 $ s\" ئەمەلدىن قالدۇرۇلدى",
@@ -277,6 +267,16 @@ OC.L10N.register(
"Could not open file" : "ھۆججەت ئاچالمىدى",
"Invalid chunk name" : "ئىناۋەتسىز",
"Could not rename part file assembled from chunks" : "بۆلەكلەردىن يىغىلغان قىسمەن ھۆججەتنىڭ نامىنى ئۆزگەرتەلمىدى",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "ئەگەر خىزمەت ۋاقتىڭىزنى تەڭشىسىڭىز ، باشقا ئىشلەتكۈچىلەر يىغىن زاكاز قىلغاندا ئىشخانىدىن چىققان ۋاقتىڭىزنى كۆرىدۇ."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "ئەگەر خىزمەت ۋاقتىڭىزنى تەڭشىسىڭىز ، باشقا ئىشلەتكۈچىلەر يىغىن زاكاز قىلغاندا ئىشخانىدىن چىققان ۋاقتىڭىزنى كۆرىدۇ.",
+ "In a %1$s on %2$s for the entire day" : "پۈتۈن كۈن ئۈچۈن%2 $ s دىكى%1 $ s ئىچىدە",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1 $ s دىكى%2 $ s دىكى%3 $ s -%4 $ s ئارىلىقىدا",
+ "In %1$s %2$s on %3$s for the entire day" : "%1 $ s%2 $ s پۈتۈن كۈن%3 $ s",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1 $ s%2 $ s%3 $ s دىكى%4 $ s -%5 $ s ئارىلىقىدا",
+ "In a %1$s on %2$s" : "%2 $ s دىكى%1 $ s",
+ "In a %1$s on %2$s then on %3$s" : "%2 $ s دىكى%1 $ s دە ئاندىن%3 $ s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%2 $ s دىكى%1 $ s ئاندىن%3 $ s ۋە%4 $ s",
+ "In %1$s %2$s on %3$s" : "%3 $ s دىكى%1 $ s%2 $ s",
+ "In %1$s %2$s on %3$s then on %4$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s ۋە%5 $ s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/ug.json b/apps/dav/l10n/ug.json
index fbab7f0333f..fbca8c62df7 100644
--- a/apps/dav/l10n/ug.json
+++ b/apps/dav/l10n/ug.json
@@ -63,10 +63,6 @@
"Description: %s" : "چۈشەندۈرۈش:% s",
"Where: %s" : "قەيەردە:% s",
"%1$s via %2$s" : "%1 $ s ئارقىلىق%2 $ s",
- "In a %1$s on %2$s for the entire day" : "پۈتۈن كۈن ئۈچۈن%2 $ s دىكى%1 $ s ئىچىدە",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1 $ s دىكى%2 $ s دىكى%3 $ s -%4 $ s ئارىلىقىدا",
- "In %1$s %2$s on %3$s for the entire day" : "%1 $ s%2 $ s پۈتۈن كۈن%3 $ s",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1 $ s%2 $ s%3 $ s دىكى%4 $ s -%5 $ s ئارىلىقىدا",
"Could not generate when statement" : "بايان قىلغاندا ھاسىل قىلالمىدى",
"Every Day for the entire day" : "ھەر بىر كۈن پۈتۈن بىر كۈن",
"Every Day for the entire day until %1$s" : "ھەر بىر كۈن پۈتۈن كۈن%1 $ s غىچە",
@@ -103,12 +99,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "ھەر%1 $ d يىللار%2 $ s دىكى%3 $ s دىكى%4 $ s -%5 $ s ئارىلىقىدىكى%6 $ s",
"On specific dates for the entire day until %1$s" : "پۈتۈن كۈندىكى كونكرېت كۈنلەردە%1 $ s غىچە",
"On specific dates between %1$s - %2$s until %3$s" : "كونكرېت كۈنلەردە%1 $ s -%2 $ s ئارىلىقىدا%3 $ s غىچە",
- "In a %1$s on %2$s" : "%2 $ s دىكى%1 $ s",
- "In a %1$s on %2$s then on %3$s" : "%2 $ s دىكى%1 $ s دە ئاندىن%3 $ s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "%2 $ s دىكى%1 $ s ئاندىن%3 $ s ۋە%4 $ s",
- "In %1$s %2$s on %3$s" : "%3 $ s دىكى%1 $ s%2 $ s",
- "In %1$s %2$s on %3$s then on %4$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s ۋە%5 $ s",
"Could not generate next recurrence statement" : "كېيىنكى تەكرارلىنىش باياناتىنى ھاسىل قىلالمىدى",
"Cancelled: %1$s" : "ئەمەلدىن قالدۇرۇلدى:%1 $ s",
"\"%1$s\" has been canceled" : "\"%1 $ s\" ئەمەلدىن قالدۇرۇلدى",
@@ -275,6 +265,16 @@
"Could not open file" : "ھۆججەت ئاچالمىدى",
"Invalid chunk name" : "ئىناۋەتسىز",
"Could not rename part file assembled from chunks" : "بۆلەكلەردىن يىغىلغان قىسمەن ھۆججەتنىڭ نامىنى ئۆزگەرتەلمىدى",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "ئەگەر خىزمەت ۋاقتىڭىزنى تەڭشىسىڭىز ، باشقا ئىشلەتكۈچىلەر يىغىن زاكاز قىلغاندا ئىشخانىدىن چىققان ۋاقتىڭىزنى كۆرىدۇ."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "ئەگەر خىزمەت ۋاقتىڭىزنى تەڭشىسىڭىز ، باشقا ئىشلەتكۈچىلەر يىغىن زاكاز قىلغاندا ئىشخانىدىن چىققان ۋاقتىڭىزنى كۆرىدۇ.",
+ "In a %1$s on %2$s for the entire day" : "پۈتۈن كۈن ئۈچۈن%2 $ s دىكى%1 $ s ئىچىدە",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1 $ s دىكى%2 $ s دىكى%3 $ s -%4 $ s ئارىلىقىدا",
+ "In %1$s %2$s on %3$s for the entire day" : "%1 $ s%2 $ s پۈتۈن كۈن%3 $ s",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1 $ s%2 $ s%3 $ s دىكى%4 $ s -%5 $ s ئارىلىقىدا",
+ "In a %1$s on %2$s" : "%2 $ s دىكى%1 $ s",
+ "In a %1$s on %2$s then on %3$s" : "%2 $ s دىكى%1 $ s دە ئاندىن%3 $ s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "%2 $ s دىكى%1 $ s ئاندىن%3 $ s ۋە%4 $ s",
+ "In %1$s %2$s on %3$s" : "%3 $ s دىكى%1 $ s%2 $ s",
+ "In %1$s %2$s on %3$s then on %4$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "%1 $ s%2 $ s بولسا%3 $ s ئاندىن%4 $ s ۋە%5 $ s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/uk.js b/apps/dav/l10n/uk.js
index 4c7390e2a05..177340f6c1a 100644
--- a/apps/dav/l10n/uk.js
+++ b/apps/dav/l10n/uk.js
@@ -72,10 +72,6 @@ OC.L10N.register(
"Description: %s" : "Опис: %s",
"Where: %s" : "Місце: %s",
"%1$s via %2$s" : "%1$s через %2$s",
- "In a %1$s on %2$s for the entire day" : "За %2$s, %1$s, впродовж усього дня",
- "In a %1$s on %2$s between %3$s - %4$s" : "За %1$s, %2$s, між %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "За %1$s, %2$s, о %3$s впродовж усього дня",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "За %1$s, %2$s, о %3$s між %4$s- %5$s",
"Could not generate when statement" : "Не вдалося створити оператор \"коли\"",
"Every Day for the entire day" : "Щодня впродовж усього дня",
"Every Day for the entire day until %1$s" : "Щодня впродовж усього дня до %1$s",
@@ -112,12 +108,6 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Що %1$d роки в %2$s, %3$s, між %4$s - %5$s до %6$s",
"On specific dates for the entire day until %1$s" : "У визначені дати впродовж усього дня до %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "У визначені дати між %1$s - %2$s до %3$s",
- "In a %1$s on %2$s" : "За %1$s, %2$s",
- "In a %1$s on %2$s then on %3$s" : "За %1$s, %2$s, потім %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s, %2$s, потім %3$s та %4$s",
- "In %1$s %2$s on %3$s" : "За %1$s %2$s, %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "За %1$s, %2$s, %3$s та %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s, %2$s, %3$s, потім %4$s та %5$s",
"Could not generate next recurrence statement" : "Не вдалося створити оператор наступного повторення",
"Cancelled: %1$s" : "Скасовано: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" скасовано",
@@ -207,6 +197,8 @@ OC.L10N.register(
"Could not rename part file to final file, canceled by hook" : "Не вдалося перейменувати файл частини на остаточний файл, скасовано підхопленням",
"Could not rename part file to final file" : "Не вдалося перейменувати файл частини на остаточний файл",
"Failed to check file size: %1$s" : "Не вдалося перевірити розмір файлу: %1$s",
+ "Could not open file: %1$s, file does seem to exist" : "Неможливо відкрити файл: %1$s, хоча файл скоріше за все присутній",
+ "Could not open file: %1$s, file doesn't seem to exist" : "Неможливо відкрити файл: %1$s, скоріше за все файл відсутній",
"Encryption not ready: %1$s" : "Шифрування не готове: %1$s",
"Failed to open file: %1$s" : "Не вдалося відкрити файл: %1$s",
"Failed to unlink: %1$s" : "Не вдалося від’єднати: %1$s",
@@ -286,6 +278,16 @@ OC.L10N.register(
"Could not open file" : "Не вдалося відкрити файл",
"Invalid chunk name" : "Недійсна назва блоку",
"Could not rename part file assembled from chunks" : "Не вдалося перейменувати файл частини, зібраний із фрагментів",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Будь ласка, налаштуйте ваш робочий час, щоби інші користувачі могли бачити, коли ви відсутні під час бронювання зустрічей."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Будь ласка, налаштуйте ваш робочий час, щоби інші користувачі могли бачити, коли ви відсутні під час бронювання зустрічей.",
+ "In a %1$s on %2$s for the entire day" : "За %2$s, %1$s, впродовж усього дня",
+ "In a %1$s on %2$s between %3$s - %4$s" : "За %1$s, %2$s, між %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "За %1$s, %2$s, о %3$s впродовж усього дня",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "За %1$s, %2$s, о %3$s між %4$s- %5$s",
+ "In a %1$s on %2$s" : "За %1$s, %2$s",
+ "In a %1$s on %2$s then on %3$s" : "За %1$s, %2$s, потім %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s, %2$s, потім %3$s та %4$s",
+ "In %1$s %2$s on %3$s" : "За %1$s %2$s, %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "За %1$s, %2$s, %3$s та %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s, %2$s, %3$s, потім %4$s та %5$s"
},
"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
diff --git a/apps/dav/l10n/uk.json b/apps/dav/l10n/uk.json
index ca3e1a6f1bf..187b0c3e3ee 100644
--- a/apps/dav/l10n/uk.json
+++ b/apps/dav/l10n/uk.json
@@ -70,10 +70,6 @@
"Description: %s" : "Опис: %s",
"Where: %s" : "Місце: %s",
"%1$s via %2$s" : "%1$s через %2$s",
- "In a %1$s on %2$s for the entire day" : "За %2$s, %1$s, впродовж усього дня",
- "In a %1$s on %2$s between %3$s - %4$s" : "За %1$s, %2$s, між %3$s - %4$s",
- "In %1$s %2$s on %3$s for the entire day" : "За %1$s, %2$s, о %3$s впродовж усього дня",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "За %1$s, %2$s, о %3$s між %4$s- %5$s",
"Could not generate when statement" : "Не вдалося створити оператор \"коли\"",
"Every Day for the entire day" : "Щодня впродовж усього дня",
"Every Day for the entire day until %1$s" : "Щодня впродовж усього дня до %1$s",
@@ -110,12 +106,6 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "Що %1$d роки в %2$s, %3$s, між %4$s - %5$s до %6$s",
"On specific dates for the entire day until %1$s" : "У визначені дати впродовж усього дня до %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "У визначені дати між %1$s - %2$s до %3$s",
- "In a %1$s on %2$s" : "За %1$s, %2$s",
- "In a %1$s on %2$s then on %3$s" : "За %1$s, %2$s, потім %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s, %2$s, потім %3$s та %4$s",
- "In %1$s %2$s on %3$s" : "За %1$s %2$s, %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "За %1$s, %2$s, %3$s та %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s, %2$s, %3$s, потім %4$s та %5$s",
"Could not generate next recurrence statement" : "Не вдалося створити оператор наступного повторення",
"Cancelled: %1$s" : "Скасовано: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" скасовано",
@@ -205,6 +195,8 @@
"Could not rename part file to final file, canceled by hook" : "Не вдалося перейменувати файл частини на остаточний файл, скасовано підхопленням",
"Could not rename part file to final file" : "Не вдалося перейменувати файл частини на остаточний файл",
"Failed to check file size: %1$s" : "Не вдалося перевірити розмір файлу: %1$s",
+ "Could not open file: %1$s, file does seem to exist" : "Неможливо відкрити файл: %1$s, хоча файл скоріше за все присутній",
+ "Could not open file: %1$s, file doesn't seem to exist" : "Неможливо відкрити файл: %1$s, скоріше за все файл відсутній",
"Encryption not ready: %1$s" : "Шифрування не готове: %1$s",
"Failed to open file: %1$s" : "Не вдалося відкрити файл: %1$s",
"Failed to unlink: %1$s" : "Не вдалося від’єднати: %1$s",
@@ -284,6 +276,16 @@
"Could not open file" : "Не вдалося відкрити файл",
"Invalid chunk name" : "Недійсна назва блоку",
"Could not rename part file assembled from chunks" : "Не вдалося перейменувати файл частини, зібраний із фрагментів",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Будь ласка, налаштуйте ваш робочий час, щоби інші користувачі могли бачити, коли ви відсутні під час бронювання зустрічей."
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Будь ласка, налаштуйте ваш робочий час, щоби інші користувачі могли бачити, коли ви відсутні під час бронювання зустрічей.",
+ "In a %1$s on %2$s for the entire day" : "За %2$s, %1$s, впродовж усього дня",
+ "In a %1$s on %2$s between %3$s - %4$s" : "За %1$s, %2$s, між %3$s - %4$s",
+ "In %1$s %2$s on %3$s for the entire day" : "За %1$s, %2$s, о %3$s впродовж усього дня",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "За %1$s, %2$s, о %3$s між %4$s- %5$s",
+ "In a %1$s on %2$s" : "За %1$s, %2$s",
+ "In a %1$s on %2$s then on %3$s" : "За %1$s, %2$s, потім %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "За %1$s, %2$s, потім %3$s та %4$s",
+ "In %1$s %2$s on %3$s" : "За %1$s %2$s, %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "За %1$s, %2$s, %3$s та %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "За %1$s, %2$s, %3$s, потім %4$s та %5$s"
},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
} \ No newline at end of file
diff --git a/apps/dav/l10n/zh_HK.js b/apps/dav/l10n/zh_HK.js
index ea56ec81a9e..1b7f0156dd5 100644
--- a/apps/dav/l10n/zh_HK.js
+++ b/apps/dav/l10n/zh_HK.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "描述:%s",
"Where: %s" : "地點:%s",
"%1$s via %2$s" : "%1$s 由 %2$s",
- "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
- "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In the past on %1$s for the entire day" : "在過去 %1$s 的整天",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["將在 %n 分鐘之後於 %1$s 整天進行"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["將在 %n 小時之後於 %1$s 整天進行"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["將在 %n 天之後於 %1$s 整天進行"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["將在 %n 星期之後於 %1$s 整天進行"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["將在 %n 個月之後於 %1$s 整天進行"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["將在 %n 年之後於 %1$s 整天進行"],
+ "In the past on %1$s between %2$s - %3$s" : "於已經過去的 %1$s %2$s - %3$s 之間進行",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["將在 %n 分鐘之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["將在 %n 小時之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["將在 %n 天之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["將在 %n 星期之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["將在 %n 個月之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["將在 %n 年之後於 %1$s %2$s - %3$s 之間進行"],
"Could not generate when statement" : "無法產生 when 陳述",
"Every Day for the entire day" : "每天一整天",
"Every Day for the entire day until %1$s" : "每天一整天,直至 %1$s",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "每 %1$d 年於 %2$s 的 %3$s,在 %4$s - %5$s 之間,直至 %6$s",
"On specific dates for the entire day until %1$s" : "在特定日期的整天,直至 %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "在 %1$s - %2$s 之間的特定日期,直至 %3$s",
- "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
- "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
- "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s",
+ "In the past on %1$s" : "於已經過去的 %1$s 進行",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["將在 %n 分鐘之後於 %1$s 進行"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["將在 %n 小時之後於 %1$s 進行"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["將在 %n 天之後於 %1$s 進行"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["將在 %n 星期之後於 %1$s 進行"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["將在 %n 個月之後於 %1$s 進行"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["將在 %n 年之後於 %1$s 進行"],
+ "In the past on %1$s then on %2$s" : "在過去的 %1$s,然後在 %2$s 進行",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["將在 %n 分鐘之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["將在 %n 小時之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["將在 %n 天之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["將在 %n 星期之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["將在 %n 個月之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["將在 %n 年之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "In the past on %1$s then on %2$s and %3$s" : "在過去的 %1$s 進行,然後在 %2$s 及 %3$s 再次進行",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["將在 %n 分鐘之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["將在 %n 小時之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["將在 %n 天之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["將在 %n 星期之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["將在 %n 個月之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["將在 %n 年之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
"Could not generate next recurrence statement" : "無法產生下一個重複語句",
"Cancelled: %1$s" : "已取消:%1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" 已被取消",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "無法開啟檔案",
"Invalid chunk name" : "無效的區塊名稱",
"Could not rename part file assembled from chunks" : "無法重新命名從區塊組合成的部份檔案",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了您的工作時間,其他用戶在預約會議時就會知道您何時不在辦公室。"
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了您的工作時間,其他用戶在預約會議時就會知道您何時不在辦公室。",
+ "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
+ "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
+ "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s"
},
"nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/zh_HK.json b/apps/dav/l10n/zh_HK.json
index d7a408ce638..46b0bcbc73a 100644
--- a/apps/dav/l10n/zh_HK.json
+++ b/apps/dav/l10n/zh_HK.json
@@ -70,10 +70,20 @@
"Description: %s" : "描述:%s",
"Where: %s" : "地點:%s",
"%1$s via %2$s" : "%1$s 由 %2$s",
- "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
- "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In the past on %1$s for the entire day" : "在過去 %1$s 的整天",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["將在 %n 分鐘之後於 %1$s 整天進行"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["將在 %n 小時之後於 %1$s 整天進行"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["將在 %n 天之後於 %1$s 整天進行"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["將在 %n 星期之後於 %1$s 整天進行"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["將在 %n 個月之後於 %1$s 整天進行"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["將在 %n 年之後於 %1$s 整天進行"],
+ "In the past on %1$s between %2$s - %3$s" : "於已經過去的 %1$s %2$s - %3$s 之間進行",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["將在 %n 分鐘之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["將在 %n 小時之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["將在 %n 天之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["將在 %n 星期之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["將在 %n 個月之後於 %1$s %2$s - %3$s 之間進行"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["將在 %n 年之後於 %1$s %2$s - %3$s 之間進行"],
"Could not generate when statement" : "無法產生 when 陳述",
"Every Day for the entire day" : "每天一整天",
"Every Day for the entire day until %1$s" : "每天一整天,直至 %1$s",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "每 %1$d 年於 %2$s 的 %3$s,在 %4$s - %5$s 之間,直至 %6$s",
"On specific dates for the entire day until %1$s" : "在特定日期的整天,直至 %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "在 %1$s - %2$s 之間的特定日期,直至 %3$s",
- "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
- "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
- "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s",
+ "In the past on %1$s" : "於已經過去的 %1$s 進行",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["將在 %n 分鐘之後於 %1$s 進行"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["將在 %n 小時之後於 %1$s 進行"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["將在 %n 天之後於 %1$s 進行"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["將在 %n 星期之後於 %1$s 進行"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["將在 %n 個月之後於 %1$s 進行"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["將在 %n 年之後於 %1$s 進行"],
+ "In the past on %1$s then on %2$s" : "在過去的 %1$s,然後在 %2$s 進行",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["將在 %n 分鐘之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["將在 %n 小時之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["將在 %n 天之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["將在 %n 星期之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["將在 %n 個月之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["將在 %n 年之後於 %1$s 進行,然後在 %2$s 再次進行"],
+ "In the past on %1$s then on %2$s and %3$s" : "在過去的 %1$s 進行,然後在 %2$s 及 %3$s 再次進行",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["將在 %n 分鐘之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["將在 %n 小時之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["將在 %n 天之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["將在 %n 星期之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["將在 %n 個月之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["將在 %n 年之後於 %1$s 進行,然後在 %2$s 及 %3$s再次進行"],
"Could not generate next recurrence statement" : "無法產生下一個重複語句",
"Cancelled: %1$s" : "已取消:%1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" 已被取消",
@@ -286,6 +311,16 @@
"Could not open file" : "無法開啟檔案",
"Invalid chunk name" : "無效的區塊名稱",
"Could not rename part file assembled from chunks" : "無法重新命名從區塊組合成的部份檔案",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了您的工作時間,其他用戶在預約會議時就會知道您何時不在辦公室。"
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了您的工作時間,其他用戶在預約會議時就會知道您何時不在辦公室。",
+ "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
+ "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
+ "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/dav/l10n/zh_TW.js b/apps/dav/l10n/zh_TW.js
index f250e7eb754..ebc468daba1 100644
--- a/apps/dav/l10n/zh_TW.js
+++ b/apps/dav/l10n/zh_TW.js
@@ -72,10 +72,20 @@ OC.L10N.register(
"Description: %s" : "描述:%s",
"Where: %s" : "地點:%s",
"%1$s via %2$s" : "%1$s 經由 %2$s",
- "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
- "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In the past on %1$s for the entire day" : "在過去 %1$s 的整天",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 分鐘"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 小時"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 天"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 週"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 分鐘"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 年"],
+ "In the past on %1$s between %2$s - %3$s" : "在過去的 %1$s,在 %2$s - %3$s 之間",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 分鐘內,在 %2$s - %3$s 之間"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 小時內,在 %2$s - %3$s 之間"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 天內,在 %2$s - %3$s 之間"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 週內,在 %2$s - %3$s 之間"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 月內,在 %2$s - %3$s 之間"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 年內,在 %2$s - %3$s 之間"],
"Could not generate when statement" : "無法產生 when 陳述",
"Every Day for the entire day" : "每天一整天",
"Every Day for the entire day until %1$s" : "每天一整天,直到 %1$s",
@@ -112,12 +122,27 @@ OC.L10N.register(
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "每 %1$d 年於 %2$s 的 %3$s,在 %4$s - %5$s 之間,直到 %6$s",
"On specific dates for the entire day until %1$s" : "在特定日期的整天,直到 %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "在 %1$s - %2$s 之間的特定日期,直到 %3$s",
- "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
- "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
- "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s",
+ "In the past on %1$s" : "過去在 %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["將在 %n 分鐘之後於 %1$s 進行"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["將在 %n 小時之後於 %1$s 進行"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["將在 %n 天之後於 %1$s 進行"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["將在 %n 週之後於 %1$s 進行"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["將在 %n 個月之後於 %1$s 進行"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["將在 %n 年之後於 %1$s 進行"],
+ "In the past on %1$s then on %2$s" : "在過去的 %1$s,然後在 %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["在 %1$s 分鐘內,然後在 %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["在 %1$s 小時內,然後在 %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["在 %1$s 天內,然後在 %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["在 %1$s 週內,然後在 %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["在 %1$s 月內,然後在 %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["在 %1$s 年內,然後在 %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "在過去的 %1$s,然後在 %2$s 與 %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 分鐘內,然後在 %2$s 與 %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 小時內,然後在 %2$s 與 %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 天內,然後在 %2$s 與 %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 週內,然後在 %2$s 與 %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 月內,然後在 %2$s 與 %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 年內,然後在 %2$s 與 %3$s"],
"Could not generate next recurrence statement" : "無法產生下一個重複陳述",
"Cancelled: %1$s" : "已取消:%1$s",
"\"%1$s\" has been canceled" : "「%1$s」已取消",
@@ -288,6 +313,16 @@ OC.L10N.register(
"Could not open file" : "無法開啟檔案",
"Invalid chunk name" : "無效的片段名稱",
"Could not rename part file assembled from chunks" : "無法重新命名從片段組合成的部份檔案",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了工作時間,其他使用者在預約會議時就會知道您何時不會在辦公室。"
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了工作時間,其他使用者在預約會議時就會知道您何時不會在辦公室。",
+ "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
+ "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
+ "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s"
},
"nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/zh_TW.json b/apps/dav/l10n/zh_TW.json
index 90d2150aacf..7217a5bdaa5 100644
--- a/apps/dav/l10n/zh_TW.json
+++ b/apps/dav/l10n/zh_TW.json
@@ -70,10 +70,20 @@
"Description: %s" : "描述:%s",
"Where: %s" : "地點:%s",
"%1$s via %2$s" : "%1$s 經由 %2$s",
- "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
- "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
- "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
- "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In the past on %1$s for the entire day" : "在過去 %1$s 的整天",
+ "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 分鐘"],
+ "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 小時"],
+ "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 天"],
+ "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 週"],
+ "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 分鐘"],
+ "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["在 %1$s 的整天內,%n 年"],
+ "In the past on %1$s between %2$s - %3$s" : "在過去的 %1$s,在 %2$s - %3$s 之間",
+ "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 分鐘內,在 %2$s - %3$s 之間"],
+ "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 小時內,在 %2$s - %3$s 之間"],
+ "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 天內,在 %2$s - %3$s 之間"],
+ "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 週內,在 %2$s - %3$s 之間"],
+ "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 月內,在 %2$s - %3$s 之間"],
+ "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["於 %1$s 的 %n 年內,在 %2$s - %3$s 之間"],
"Could not generate when statement" : "無法產生 when 陳述",
"Every Day for the entire day" : "每天一整天",
"Every Day for the entire day until %1$s" : "每天一整天,直到 %1$s",
@@ -110,12 +120,27 @@
"Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "每 %1$d 年於 %2$s 的 %3$s,在 %4$s - %5$s 之間,直到 %6$s",
"On specific dates for the entire day until %1$s" : "在特定日期的整天,直到 %1$s",
"On specific dates between %1$s - %2$s until %3$s" : "在 %1$s - %2$s 之間的特定日期,直到 %3$s",
- "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
- "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
- "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
- "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
- "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
- "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s",
+ "In the past on %1$s" : "過去在 %1$s",
+ "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["將在 %n 分鐘之後於 %1$s 進行"],
+ "_In a hour on %1$s_::_In %n hours on %1$s_" : ["將在 %n 小時之後於 %1$s 進行"],
+ "_In a day on %1$s_::_In %n days on %1$s_" : ["將在 %n 天之後於 %1$s 進行"],
+ "_In a week on %1$s_::_In %n weeks on %1$s_" : ["將在 %n 週之後於 %1$s 進行"],
+ "_In a month on %1$s_::_In %n months on %1$s_" : ["將在 %n 個月之後於 %1$s 進行"],
+ "_In a year on %1$s_::_In %n years on %1$s_" : ["將在 %n 年之後於 %1$s 進行"],
+ "In the past on %1$s then on %2$s" : "在過去的 %1$s,然後在 %2$s",
+ "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["在 %1$s 分鐘內,然後在 %2$s"],
+ "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["在 %1$s 小時內,然後在 %2$s"],
+ "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["在 %1$s 天內,然後在 %2$s"],
+ "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["在 %1$s 週內,然後在 %2$s"],
+ "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["在 %1$s 月內,然後在 %2$s"],
+ "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["在 %1$s 年內,然後在 %2$s"],
+ "In the past on %1$s then on %2$s and %3$s" : "在過去的 %1$s,然後在 %2$s 與 %3$s",
+ "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 分鐘內,然後在 %2$s 與 %3$s"],
+ "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 小時內,然後在 %2$s 與 %3$s"],
+ "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 天內,然後在 %2$s 與 %3$s"],
+ "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 週內,然後在 %2$s 與 %3$s"],
+ "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 月內,然後在 %2$s 與 %3$s"],
+ "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["於 %1$s 的 %n 年內,然後在 %2$s 與 %3$s"],
"Could not generate next recurrence statement" : "無法產生下一個重複陳述",
"Cancelled: %1$s" : "已取消:%1$s",
"\"%1$s\" has been canceled" : "「%1$s」已取消",
@@ -286,6 +311,16 @@
"Could not open file" : "無法開啟檔案",
"Invalid chunk name" : "無效的片段名稱",
"Could not rename part file assembled from chunks" : "無法重新命名從片段組合成的部份檔案",
- "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了工作時間,其他使用者在預約會議時就會知道您何時不會在辦公室。"
+ "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "若您設定了工作時間,其他使用者在預約會議時就會知道您何時不會在辦公室。",
+ "In a %1$s on %2$s for the entire day" : "%1$s 的 %2$s 整天",
+ "In a %1$s on %2$s between %3$s - %4$s" : "%1$s 的 %2$s 於 %3$s - %4$s 之間",
+ "In %1$s %2$s on %3$s for the entire day" : "%1$s %2$s 的 %3$s 整天",
+ "In %1$s %2$s on %3$s between %4$s - %5$s" : "%1$s %2$s 的 %3$s 於 %4$s - %5$s 之間",
+ "In a %1$s on %2$s" : "在 %1$s 的 %2$s",
+ "In a %1$s on %2$s then on %3$s" : "在 %1$s 的 %2$s,然後 %3$s",
+ "In a %1$s on %2$s then on %3$s and %4$s" : "在 %1$s 的 %2$s,然後 %3$s 與 %4$s",
+ "In %1$s %2$s on %3$s" : "在 %1$s %2$s 的 %3$s",
+ "In %1$s %2$s on %3$s then on %4$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s",
+ "In %1$s %2$s on %3$s then on %4$s and %5$s" : "在 %1$s %2$s 的 %3$s,然後 %4$s 與 %5$s"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipService.php b/apps/dav/lib/CalDAV/Schedule/IMipService.php
index e0d51edc177..2ff097bb1b7 100644
--- a/apps/dav/lib/CalDAV/Schedule/IMipService.php
+++ b/apps/dav/lib/CalDAV/Schedule/IMipService.php
@@ -45,8 +45,9 @@ class IMipService {
private L10NFactory $l10nFactory,
private ITimeFactory $timeFactory,
) {
- $default = $this->l10nFactory->findGenericLanguage();
- $this->l10n = $this->l10nFactory->get('dav', $default);
+ $language = $this->l10nFactory->findGenericLanguage();
+ $locale = $this->l10nFactory->findLocale($language);
+ $this->l10n = $this->l10nFactory->get('dav', $language, $locale);
}
/**
@@ -188,6 +189,9 @@ class IMipService {
* @return string
*/
public function generateWhenStringSingular(EventReader $er): string {
+ // initialize
+ $startTime = null;
+ $endTime = null;
// calculate time difference from now to start of event
$occurring = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
// extract start date
@@ -202,15 +206,91 @@ class IMipService {
// TRANSLATORS
// Indicates when a calendar event will happen, shown on invitation emails
// Output produced in order:
- // In a day/week/month/year on July 1, 2024 for the entire day
- // In a day/week/month/year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
- // In 2 days/weeks/months/years on July 1, 2024 for the entire day
- // In 2 days/weeks/months/years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
- return match ([($occurring[0] > 1), !empty($endTime)]) {
- [false, false] => $this->l10n->t('In a %1$s on %2$s for the entire day', [$occurring[1], $startDate]),
- [false, true] => $this->l10n->t('In a %1$s on %2$s between %3$s - %4$s', [$occurring[1], $startDate, $startTime, $endTime]),
- [true, false] => $this->l10n->t('In %1$s %2$s on %3$s for the entire day', [$occurring[0], $occurring[1], $startDate]),
- [true, true] => $this->l10n->t('In %1$s %2$s on %3$s between %4$s - %5$s', [$occurring[0], $occurring[1], $startDate, $startTime, $endTime]),
+ // In a minute/hour/day/week/month/year on July 1, 2024 for the entire day
+ // In a minute/hour/day/week/month/year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
+ // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 for the entire day
+ // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
+ return match ([$occurring['scale'], $endTime !== null]) {
+ ['past', false] => $this->l10n->t(
+ 'In the past on %1$s for the entire day',
+ [$startDate]
+ ),
+ ['minute', false] => $this->l10n->n(
+ 'In a minute on %1$s for the entire day',
+ 'In %n minutes on %1$s for the entire day',
+ $occurring['interval'],
+ [$startDate]
+ ),
+ ['hour', false] => $this->l10n->n(
+ 'In a hour on %1$s for the entire day',
+ 'In %n hours on %1$s for the entire day',
+ $occurring['interval'],
+ [$startDate]
+ ),
+ ['day', false] => $this->l10n->n(
+ 'In a day on %1$s for the entire day',
+ 'In %n days on %1$s for the entire day',
+ $occurring['interval'],
+ [$startDate]
+ ),
+ ['week', false] => $this->l10n->n(
+ 'In a week on %1$s for the entire day',
+ 'In %n weeks on %1$s for the entire day',
+ $occurring['interval'],
+ [$startDate]
+ ),
+ ['month', false] => $this->l10n->n(
+ 'In a month on %1$s for the entire day',
+ 'In %n months on %1$s for the entire day',
+ $occurring['interval'],
+ [$startDate]
+ ),
+ ['year', false] => $this->l10n->n(
+ 'In a year on %1$s for the entire day',
+ 'In %n years on %1$s for the entire day',
+ $occurring['interval'],
+ [$startDate]
+ ),
+ ['past', true] => $this->l10n->t(
+ 'In the past on %1$s between %2$s - %3$s',
+ [$startDate, $startTime, $endTime]
+ ),
+ ['minute', true] => $this->l10n->n(
+ 'In a minute on %1$s between %2$s - %3$s',
+ 'In %n minutes on %1$s between %2$s - %3$s',
+ $occurring['interval'],
+ [$startDate, $startTime, $endTime]
+ ),
+ ['hour', true] => $this->l10n->n(
+ 'In a hour on %1$s between %2$s - %3$s',
+ 'In %n hours on %1$s between %2$s - %3$s',
+ $occurring['interval'],
+ [$startDate, $startTime, $endTime]
+ ),
+ ['day', true] => $this->l10n->n(
+ 'In a day on %1$s between %2$s - %3$s',
+ 'In %n days on %1$s between %2$s - %3$s',
+ $occurring['interval'],
+ [$startDate, $startTime, $endTime]
+ ),
+ ['week', true] => $this->l10n->n(
+ 'In a week on %1$s between %2$s - %3$s',
+ 'In %n weeks on %1$s between %2$s - %3$s',
+ $occurring['interval'],
+ [$startDate, $startTime, $endTime]
+ ),
+ ['month', true] => $this->l10n->n(
+ 'In a month on %1$s between %2$s - %3$s',
+ 'In %n months on %1$s between %2$s - %3$s',
+ $occurring['interval'],
+ [$startDate, $startTime, $endTime]
+ ),
+ ['year', true] => $this->l10n->n(
+ 'In a year on %1$s between %2$s - %3$s',
+ 'In %n years on %1$s between %2$s - %3$s',
+ $occurring['interval'],
+ [$startDate, $startTime, $endTime]
+ ),
default => $this->l10n->t('Could not generate when statement')
};
}
@@ -247,9 +327,8 @@ class IMipService {
// initialize
$interval = (int)$er->recurringInterval();
- $startTime = '';
- $endTime = '';
- $conclusion = '';
+ $startTime = null;
+ $conclusion = null;
// time of the day
if (!$er->entireDay()) {
$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
@@ -272,7 +351,7 @@ class IMipService {
// Every 3 Days for the entire day until July 13, 2024
// Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)
// Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
- return match ([($interval > 1), !empty($startTime), !empty($conclusion)]) {
+ return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
[false, false, false] => $this->l10n->t('Every Day for the entire day'),
[false, false, true] => $this->l10n->t('Every Day for the entire day until %1$s', [$conclusion]),
[false, true, false] => $this->l10n->t('Every Day between %1$s - %2$s', [$startTime, $endTime]),
@@ -299,9 +378,8 @@ class IMipService {
// initialize
$interval = (int)$er->recurringInterval();
- $startTime = '';
- $endTime = '';
- $conclusion = '';
+ $startTime = null;
+ $conclusion = null;
// days of the week
$days = implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
// time of the day
@@ -326,7 +404,7 @@ class IMipService {
// Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024
// Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
// Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
- return match ([($interval > 1), !empty($startTime), !empty($conclusion)]) {
+ return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
[false, false, false] => $this->l10n->t('Every Week on %1$s for the entire day', [$days]),
[false, false, true] => $this->l10n->t('Every Week on %1$s for the entire day until %2$s', [$days, $conclusion]),
[false, true, false] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
@@ -353,9 +431,8 @@ class IMipService {
// initialize
$interval = (int)$er->recurringInterval();
- $startTime = '';
- $endTime = '';
- $conclusion = '';
+ $startTime = null;
+ $conclusion = null;
// days of month
if ($er->recurringPattern() === 'R') {
$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' ' .
@@ -393,7 +470,7 @@ class IMipService {
// Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
// Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
// Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
- return match ([($interval > 1), !empty($startTime), !empty($conclusion)]) {
+ return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
[false, false, false] => $this->l10n->t('Every Month on the %1$s for the entire day', [$days]),
[false, false, true] => $this->l10n->t('Every Month on the %1$s for the entire day until %2$s', [$days, $conclusion]),
[false, true, false] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
@@ -419,9 +496,8 @@ class IMipService {
// initialize
$interval = (int)$er->recurringInterval();
- $startTime = '';
- $endTime = '';
- $conclusion = '';
+ $startTime = null;
+ $conclusion = null;
// months of year
$months = implode(', ', array_map(function ($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
// days of month
@@ -461,7 +537,7 @@ class IMipService {
// Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
// Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
// Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
- return match ([($interval > 1), !empty($startTime), !empty($conclusion)]) {
+ return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
[false, false, false] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day', [$months, $days]),
[false, false, true] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day until %3$s', [$months, $days, $conclusion]),
[false, true, false] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s', [$months, $days, $startTime, $endTime]),
@@ -485,9 +561,8 @@ class IMipService {
*/
public function generateWhenStringRecurringFixed(EventReader $er): string {
// initialize
- $startTime = '';
- $endTime = '';
- $conclusion = '';
+ $startTime = null;
+ $conclusion = null;
// time of the day
if (!$er->entireDay()) {
$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
@@ -502,7 +577,7 @@ class IMipService {
// Output produced in order:
// On specific dates for the entire day until July 13, 2024
// On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
- return match (!empty($startTime)) {
+ return match ($startTime !== null) {
false => $this->l10n->t('On specific dates for the entire day until %1$s', [$conclusion]),
true => $this->l10n->t('On specific dates between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
};
@@ -519,6 +594,10 @@ class IMipService {
*/
public function generateOccurringString(EventReader $er): string {
+ // initialize
+ $occurrence = null;
+ $occurrence2 = null;
+ $occurrence3 = null;
// reset to initial occurrence
$er->recurrenceRewind();
// forward to current date
@@ -545,19 +624,133 @@ class IMipService {
// TRANSLATORS
// Indicates when a calendar event will happen, shown on invitation emails
// Output produced in order:
- // In a day/week/month/year on July 1, 2024
- // In a day/week/month/year on July 1, 2024 then on July 3, 2024
- // In a day/week/month/year on July 1, 2024 then on July 3, 2024 and July 5, 2024
- // In 2 days/weeks/months/years on July 1, 2024
- // In 2 days/weeks/months/years on July 1, 2024 then on July 3, 2024
- // In 2 days/weeks/months/years on July 1, 2024 then on July 3, 2024 and July 5, 2024
- return match ([($occurrenceIn[0] > 1), !empty($occurrence2), !empty($occurrence3)]) {
- [false, false, false] => $this->l10n->t('In a %1$s on %2$s', [$occurrenceIn[1], $occurrence]),
- [false, true, false] => $this->l10n->t('In a %1$s on %2$s then on %3$s', [$occurrenceIn[1], $occurrence, $occurrence2]),
- [false, true, true] => $this->l10n->t('In a %1$s on %2$s then on %3$s and %4$s', [$occurrenceIn[1], $occurrence, $occurrence2, $occurrence3]),
- [true, false, false] => $this->l10n->t('In %1$s %2$s on %3$s', [$occurrenceIn[0], $occurrenceIn[1], $occurrence]),
- [true, true, false] => $this->l10n->t('In %1$s %2$s on %3$s then on %4$s', [$occurrenceIn[0], $occurrenceIn[1], $occurrence, $occurrence2]),
- [true, true, true] => $this->l10n->t('In %1$s %2$s on %3$s then on %4$s and %5$s', [$occurrenceIn[0], $occurrenceIn[1], $occurrence, $occurrence2, $occurrence3]),
+ // In a minute/hour/day/week/month/year on July 1, 2024
+ // In a minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024
+ // In a minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024 and July 5, 2024
+ // In 2 minutes/hours/days/weeks/months/years on July 1, 2024
+ // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024
+ // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024 and July 5, 2024
+ return match ([$occurrenceIn['scale'], $occurrence2 !== null, $occurrence3 !== null]) {
+ ['past', false, false] => $this->l10n->t(
+ 'In the past on %1$s',
+ [$occurrence]
+ ),
+ ['minute', false, false] => $this->l10n->n(
+ 'In a minute on %1$s',
+ 'In %n minutes on %1$s',
+ $occurrenceIn['interval'],
+ [$occurrence]
+ ),
+ ['hour', false, false] => $this->l10n->n(
+ 'In a hour on %1$s',
+ 'In %n hours on %1$s',
+ $occurrenceIn['interval'],
+ [$occurrence]
+ ),
+ ['day', false, false] => $this->l10n->n(
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ $occurrenceIn['interval'],
+ [$occurrence]
+ ),
+ ['week', false, false] => $this->l10n->n(
+ 'In a week on %1$s',
+ 'In %n weeks on %1$s',
+ $occurrenceIn['interval'],
+ [$occurrence]
+ ),
+ ['month', false, false] => $this->l10n->n(
+ 'In a month on %1$s',
+ 'In %n months on %1$s',
+ $occurrenceIn['interval'],
+ [$occurrence]
+ ),
+ ['year', false, false] => $this->l10n->n(
+ 'In a year on %1$s',
+ 'In %n years on %1$s',
+ $occurrenceIn['interval'],
+ [$occurrence]
+ ),
+ ['past', true, false] => $this->l10n->t(
+ 'In the past on %1$s then on %2$s',
+ [$occurrence, $occurrence2]
+ ),
+ ['minute', true, false] => $this->l10n->n(
+ 'In a minute on %1$s then on %2$s',
+ 'In %n minutes on %1$s then on %2$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2]
+ ),
+ ['hour', true, false] => $this->l10n->n(
+ 'In a hour on %1$s then on %2$s',
+ 'In %n hours on %1$s then on %2$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2]
+ ),
+ ['day', true, false] => $this->l10n->n(
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2]
+ ),
+ ['week', true, false] => $this->l10n->n(
+ 'In a week on %1$s then on %2$s',
+ 'In %n weeks on %1$s then on %2$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2]
+ ),
+ ['month', true, false] => $this->l10n->n(
+ 'In a month on %1$s then on %2$s',
+ 'In %n months on %1$s then on %2$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2]
+ ),
+ ['year', true, false] => $this->l10n->n(
+ 'In a year on %1$s then on %2$s',
+ 'In %n years on %1$s then on %2$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2]
+ ),
+ ['past', true, true] => $this->l10n->t(
+ 'In the past on %1$s then on %2$s and %3$s',
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
+ ['minute', true, true] => $this->l10n->n(
+ 'In a minute on %1$s then on %2$s and %3$s',
+ 'In %n minutes on %1$s then on %2$s and %3$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
+ ['hour', true, true] => $this->l10n->n(
+ 'In a hour on %1$s then on %2$s and %3$s',
+ 'In %n hours on %1$s then on %2$s and %3$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
+ ['day', true, true] => $this->l10n->n(
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
+ ['week', true, true] => $this->l10n->n(
+ 'In a week on %1$s then on %2$s and %3$s',
+ 'In %n weeks on %1$s then on %2$s and %3$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
+ ['month', true, true] => $this->l10n->n(
+ 'In a month on %1$s then on %2$s and %3$s',
+ 'In %n months on %1$s then on %2$s and %3$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
+ ['year', true, true] => $this->l10n->n(
+ 'In a year on %1$s then on %2$s and %3$s',
+ 'In %n years on %1$s then on %2$s and %3$s',
+ $occurrenceIn['interval'],
+ [$occurrence, $occurrence2, $occurrence3]
+ ),
default => $this->l10n->t('Could not generate next recurrence statement')
};
@@ -965,30 +1158,30 @@ class IMipService {
public function minimizeInterval(\DateInterval $dateInterval): array {
// evaluate if time interval is in the past
if ($dateInterval->invert == 1) {
- return [1, 'the past'];
+ return ['interval' => 1, 'scale' => 'past'];
}
// evaluate interval parts and return smallest time period
if ($dateInterval->y > 0) {
$interval = $dateInterval->y;
- $scale = ($dateInterval->y > 1) ? 'years' : 'year';
+ $scale = 'year';
} elseif ($dateInterval->m > 0) {
$interval = $dateInterval->m;
- $scale = ($dateInterval->m > 1) ? 'months' : 'month';
+ $scale = 'month';
} elseif ($dateInterval->d >= 7) {
$interval = (int)($dateInterval->d / 7);
- $scale = ((int)($dateInterval->d / 7) > 1) ? 'weeks' : 'week';
+ $scale = 'week';
} elseif ($dateInterval->d > 0) {
$interval = $dateInterval->d;
- $scale = ($dateInterval->d > 1) ? 'days' : 'day';
+ $scale = 'day';
} elseif ($dateInterval->h > 0) {
$interval = $dateInterval->h;
- $scale = ($dateInterval->h > 1) ? 'hours' : 'hour';
+ $scale = 'hour';
} else {
$interval = $dateInterval->i;
- $scale = 'minutes';
+ $scale = 'minute';
}
- return [$interval, $scale];
+ return ['interval' => $interval, 'scale' => $scale];
}
/**
diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php
index eeeebe16b88..abb3f578d04 100644
--- a/apps/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@@ -138,7 +138,7 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
if ($result === null) {
$result = [];
}
-
+
// iterate through items and html decode values
foreach ($result as $key => $value) {
$result[$key] = urldecode($value);
@@ -197,12 +197,12 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
}
// process request
$this->processICalendarChange($currentObject, $vCal, $addresses, [], $modified);
-
+
if ($currentObject) {
// Destroy circular references so PHP will GC the object.
$currentObject->destroy();
}
-
+
} catch (SameOrganizerForAllComponentsException $e) {
$this->handleSameOrganizerException($e, $vCal, $calendarPath);
}
@@ -430,12 +430,20 @@ EOF;
} else {
// Otherwise if we have really nothing, create a new calendar
if ($currentCalendarDeleted) {
- // If the calendar exists but is deleted, we need to purge it first
- // This may cause some issues in a non synchronous database setup
+ // If the calendar exists but is in the trash bin, we try to rename its uri
+ // so that we can create the new one and still restore the previous one
+ // otherwise we just purge the calendar by removing it before recreating it
$calendar = $this->getCalendar($calendarHome, $uri);
if ($calendar instanceof Calendar) {
- $calendar->disableTrashbin();
- $calendar->delete();
+ $backend = $calendarHome->getCalDAVBackend();
+ if ($backend instanceof CalDavBackend) {
+ // If the CalDAV backend supports moving calendars
+ $this->moveCalendar($backend, $principalUrl, $uri, $uri . '-back-' . time());
+ } else {
+ // Otherwise just purge the calendar
+ $calendar->disableTrashbin();
+ $calendar->delete();
+ }
}
}
$this->createCalendar($calendarHome, $principalUrl, $uri, $displayName);
@@ -572,7 +580,7 @@ EOF;
$homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
/** @var Calendar $node */
foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
-
+
if (!$node instanceof ICalendar) {
continue;
}
@@ -704,6 +712,10 @@ EOF;
]);
}
+ private function moveCalendar(CalDavBackend $calDavBackend, string $principalUri, string $oldUri, string $newUri): void {
+ $calDavBackend->moveCalendar($oldUri, $principalUri, $principalUri, $newUri);
+ }
+
/**
* Try to handle the given exception gracefully or throw it if necessary.
*
diff --git a/apps/dav/lib/Command/FixCalendarSyncCommand.php b/apps/dav/lib/Command/FixCalendarSyncCommand.php
index bb269c92e15..cb31355c10d 100644
--- a/apps/dav/lib/Command/FixCalendarSyncCommand.php
+++ b/apps/dav/lib/Command/FixCalendarSyncCommand.php
@@ -43,7 +43,7 @@ class FixCalendarSyncCommand extends Command {
$user = $this->userManager->get($userArg);
if ($user === null) {
$output->writeln("<error>User $userArg does not exist</error>");
- return 1;
+ return self::FAILURE;
}
$this->fixUserCalendars($user);
@@ -54,7 +54,8 @@ class FixCalendarSyncCommand extends Command {
});
$progress->finish();
}
- return 0;
+ $output->writeln('');
+ return self::SUCCESS;
}
private function fixUserCalendars(IUser $user, ?ProgressBar $progress = null): void {
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index ded3f321e13..a879e264459 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -203,6 +203,11 @@ class FilesPlugin extends ServerPlugin {
if (!$sourceNodeFileInfo->isDeletable()) {
throw new Forbidden($source . ' cannot be deleted');
}
+
+ // The source is not allowed to be the parent of the target
+ if (str_starts_with($source, $target . '/')) {
+ throw new Forbidden($source . ' cannot be moved to it\'s parent');
+ }
}
/**
diff --git a/apps/dav/lib/Migration/Version1027Date20230504122946.php b/apps/dav/lib/Migration/Version1027Date20230504122946.php
index f294cf192c2..89c192a8419 100644
--- a/apps/dav/lib/Migration/Version1027Date20230504122946.php
+++ b/apps/dav/lib/Migration/Version1027Date20230504122946.php
@@ -33,7 +33,7 @@ class Version1027Date20230504122946 extends SimpleMigrationStep {
* @param array $options
*/
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
- if ($this->userManager->countSeenUsers() > 100 || array_sum($this->userManager->countUsers()) > 100) {
+ if ($this->userManager->countSeenUsers() > 100 || $this->userManager->countUsersTotal(100) >= 100) {
$this->config->setAppValue('dav', 'needs_system_address_book_sync', 'yes');
$output->info('Could not sync system address books during update - too many user records have been found. Please call occ dav:sync-system-addressbook manually.');
return;
diff --git a/apps/dav/lib/ServerFactory.php b/apps/dav/lib/ServerFactory.php
index 7a3f0b27747..f632ee6015d 100644
--- a/apps/dav/lib/ServerFactory.php
+++ b/apps/dav/lib/ServerFactory.php
@@ -10,10 +10,15 @@ declare(strict_types=1);
namespace OCA\DAV;
use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
+use OCA\DAV\Connector\Sabre\Server;
class ServerFactory {
public function createInviationResponseServer(bool $public): InvitationResponseServer {
return new InvitationResponseServer(false);
}
+
+ public function createAttendeeAvailabilityServer(): Server {
+ return (new InvitationResponseServer(false))->getServer();
+ }
}
diff --git a/apps/dav/lib/SystemTag/SystemTagList.php b/apps/dav/lib/SystemTag/SystemTagList.php
index 63e69db0eda..546467f562e 100644
--- a/apps/dav/lib/SystemTag/SystemTagList.php
+++ b/apps/dav/lib/SystemTag/SystemTagList.php
@@ -54,6 +54,7 @@ class SystemTagList implements Element {
SystemTagPlugin::ID_PROPERTYNAME => $tag->getId(),
SystemTagPlugin::USERASSIGNABLE_PROPERTYNAME => $tag->isUserAssignable() ? 'true' : 'false',
SystemTagPlugin::USERVISIBLE_PROPERTYNAME => $tag->isUserVisible() ? 'true' : 'false',
+ SystemTagPlugin::COLOR_PROPERTYNAME => $tag->getColor() ?? '',
]);
$writer->write($tag->getName());
$writer->endElement();
diff --git a/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap b/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
index 1849a0a8739..4227a88aa51 100644
--- a/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
+++ b/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
@@ -4,18 +4,18 @@ exports[`CalDavSettings > interactions 1`] = `
<div>
<div
class="settings-section settings-section--limit-width"
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
<h2
class="settings-section__name"
- data-v-0974f50a=""
+ data-v-6f6953b5=""
>
Calendar server
<a
aria-label="External documentation for Calendar server"
class="settings-section__info"
- data-v-0974f50a=""
+ data-v-6f6953b5=""
href="https://docs.nextcloud.com/server/23/go.php?to=user-sync-calendars"
rel="noreferrer nofollow"
target="_blank"
@@ -24,7 +24,7 @@ exports[`CalDavSettings > interactions 1`] = `
<span
aria-hidden="true"
class="material-design-icon help-circle-icon"
- data-v-0974f50a=""
+ data-v-6f6953b5=""
role="img"
>
<svg
@@ -46,8 +46,8 @@ exports[`CalDavSettings > interactions 1`] = `
<!---->
<p
class="settings-hint"
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Also install the
<a
@@ -67,28 +67,28 @@ exports[`CalDavSettings > interactions 1`] = `
.
</p>
<p
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-0974f50a=""
+ data-v-194d90ea=""
data-v-6b8d4c30=""
- data-v-ff5243c5=""
+ data-v-6f6953b5=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendInvitations-label"
class="checkbox-radio-switch__input"
- data-v-ff5243c5=""
+ data-v-194d90ea=""
id="caldavSendInvitations"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
+ data-v-194d90ea=""
data-v-38a6f3e5=""
- data-v-ff5243c5=""
id="caldavSendInvitations-label"
>
<span
@@ -127,8 +127,8 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
</span>
<em
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Please make sure to properly set up
<a
@@ -140,28 +140,28 @@ exports[`CalDavSettings > interactions 1`] = `
</em>
</p>
<p
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
<span
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-0974f50a=""
+ data-v-194d90ea=""
data-v-6b8d4c30=""
- data-v-ff5243c5=""
+ data-v-6f6953b5=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavGenerateBirthdayCalendar-label"
class="checkbox-radio-switch__input"
- data-v-ff5243c5=""
+ data-v-194d90ea=""
id="caldavGenerateBirthdayCalendar"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
+ data-v-194d90ea=""
data-v-38a6f3e5=""
- data-v-ff5243c5=""
id="caldavGenerateBirthdayCalendar-label"
>
<span
@@ -200,45 +200,45 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
</span>
<em
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Birthday calendars will be generated by a background job.
</em>
<br
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
/>
<em
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Hence they will not be available immediately after enabling but will show up after some time.
</em>
</p>
<p
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-0974f50a=""
+ data-v-194d90ea=""
data-v-6b8d4c30=""
- data-v-ff5243c5=""
+ data-v-6f6953b5=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendEventReminders-label"
class="checkbox-radio-switch__input"
- data-v-ff5243c5=""
+ data-v-194d90ea=""
id="caldavSendEventReminders"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
+ data-v-194d90ea=""
data-v-38a6f3e5=""
- data-v-ff5243c5=""
id="caldavSendEventReminders-label"
>
<span
@@ -277,8 +277,8 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
</span>
<em
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Please make sure to properly set up
<a
@@ -289,40 +289,40 @@ exports[`CalDavSettings > interactions 1`] = `
.
</em>
<br
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
/>
<em
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Notifications are sent via background jobs, so these must occur often enough.
</em>
</p>
<p
class="indented"
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-0974f50a=""
+ data-v-194d90ea=""
data-v-6b8d4c30=""
- data-v-ff5243c5=""
+ data-v-6f6953b5=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendEventRemindersToSharedGroupMembers-label"
class="checkbox-radio-switch__input"
- data-v-ff5243c5=""
+ data-v-194d90ea=""
id="caldavSendEventRemindersToSharedGroupMembers"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
+ data-v-194d90ea=""
data-v-38a6f3e5=""
- data-v-ff5243c5=""
id="caldavSendEventRemindersToSharedGroupMembers-label"
>
<span
@@ -361,36 +361,36 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
</span>
<em
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
Reminders are always sent to organizers and attendees.
</em>
</p>
<p
class="indented"
- data-v-0974f50a=""
data-v-6b8d4c30=""
+ data-v-6f6953b5=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-0974f50a=""
+ data-v-194d90ea=""
data-v-6b8d4c30=""
- data-v-ff5243c5=""
+ data-v-6f6953b5=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendEventRemindersPush-label"
class="checkbox-radio-switch__input"
- data-v-ff5243c5=""
+ data-v-194d90ea=""
id="caldavSendEventRemindersPush"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
+ data-v-194d90ea=""
data-v-38a6f3e5=""
- data-v-ff5243c5=""
id="caldavSendEventRemindersPush-label"
>
<span
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php
index f1c003625b2..abf8cfe3177 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -180,8 +181,14 @@ class IMipServiceTest extends TestCase {
};
}
);
- $this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s between %3$s - %4$s', ['day', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)']
+ $this->l10n->method('n')->willReturnMap([
+ [
+ 'In a day on %1$s between %2$s - %3$s',
+ 'In %n days on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ]
]);
// construct time factory return(s)
$this->timeFactory->method('getDateTime')->willReturnCallback(
@@ -222,8 +229,14 @@ class IMipServiceTest extends TestCase {
};
}
);
- $this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s between %3$s - %4$s', ['day', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)']
+ $this->l10n->method('n')->willReturnMap([
+ [
+ 'In a day on %1$s between %2$s - %3$s',
+ 'In %n days on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ]
]);
// construct time factory return(s)
$this->timeFactory->method('getDateTime')->willReturnCallback(
@@ -349,44 +362,327 @@ class IMipServiceTest extends TestCase {
}
);
$this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s for the entire day', ['day', 'July 1, 2024'], 'In a day on July 1, 2024 for the entire day'],
- ['In a %1$s on %2$s between %3$s - %4$s', ['day', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In %1$s %2$s on %3$s for the entire day', [2, 'days', 'July 1, 2024'], 'In 2 days on July 1, 2024 for the entire day'],
- ['In %1$s %2$s on %3$s between %4$s - %5$s', [2, 'days', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In 2 days on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In a %1$s on %2$s for the entire day', ['week', 'July 1, 2024'], 'In a week on July 1, 2024 for the entire day'],
- ['In a %1$s on %2$s between %3$s - %4$s', ['week', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In a week on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In %1$s %2$s on %3$s for the entire day', [2, 'weeks', 'July 1, 2024'], 'In 2 weeks on July 1, 2024 for the entire day'],
- ['In %1$s %2$s on %3$s between %4$s - %5$s', [2, 'weeks', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In 2 weeks on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In a %1$s on %2$s for the entire day', ['month', 'July 1, 2024'], 'In a month on July 1, 2024 for the entire day'],
- ['In a %1$s on %2$s between %3$s - %4$s', ['month', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In a month on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In %1$s %2$s on %3$s for the entire day', [2, 'months', 'July 1, 2024'], 'In 2 months on July 1, 2024 for the entire day'],
- ['In %1$s %2$s on %3$s between %4$s - %5$s', [2, 'months', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In 2 months on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In a %1$s on %2$s for the entire day', ['year', 'July 1, 2024'], 'In a year on July 1, 2024 for the entire day'],
- ['In a %1$s on %2$s between %3$s - %4$s', ['year', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In a year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'],
- ['In %1$s %2$s on %3$s for the entire day', [2, 'years', 'July 1, 2024'], 'In 2 years on July 1, 2024 for the entire day'],
- ['In %1$s %2$s on %3$s between %4$s - %5$s', [2, 'years', 'July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'], 'In 2 years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)']
+ [
+ 'In the past on %1$s for the entire day',
+ ['July 1, 2024'],
+ 'In the past on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In the past on %1$s between %2$s - %3$s',
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ ]);
+ $this->l10n->method('n')->willReturnMap([
+ // singular entire day
+ [
+ 'In a minute on %1$s for the entire day',
+ 'In %n minutes on %1$s for the entire day',
+ 1,
+ ['July 1, 2024'],
+ 'In a minute on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a hour on %1$s for the entire day',
+ 'In %n hours on %1$s for the entire day',
+ 1,
+ ['July 1, 2024'],
+ 'In a hour on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a day on %1$s for the entire day',
+ 'In %n days on %1$s for the entire day',
+ 1,
+ ['July 1, 2024'],
+ 'In a day on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a week on %1$s for the entire day',
+ 'In %n weeks on %1$s for the entire day',
+ 1,
+ ['July 1, 2024'],
+ 'In a week on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a month on %1$s for the entire day',
+ 'In %n months on %1$s for the entire day',
+ 1,
+ ['July 1, 2024'],
+ 'In a month on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a year on %1$s for the entire day',
+ 'In %n years on %1$s for the entire day',
+ 1,
+ ['July 1, 2024'],
+ 'In a year on July 1, 2024 for the entire day'
+ ],
+ // plural entire day
+ [
+ 'In a minute on %1$s for the entire day',
+ 'In %n minutes on %1$s for the entire day',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 minutes on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a hour on %1$s for the entire day',
+ 'In %n hours on %1$s for the entire day',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 hours on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a day on %1$s for the entire day',
+ 'In %n days on %1$s for the entire day',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 days on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a week on %1$s for the entire day',
+ 'In %n weeks on %1$s for the entire day',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 weeks on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a month on %1$s for the entire day',
+ 'In %n months on %1$s for the entire day',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 months on July 1, 2024 for the entire day'
+ ],
+ [
+ 'In a year on %1$s for the entire day',
+ 'In %n years on %1$s for the entire day',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 years on July 1, 2024 for the entire day'
+ ],
+ // singular partial day
+ [
+ 'In a minute on %1$s between %2$s - %3$s',
+ 'In %n minutes on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a minute on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a hour on %1$s between %2$s - %3$s',
+ 'In %n hours on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a hour on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a day on %1$s between %2$s - %3$s',
+ 'In %n days on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a day on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a week on %1$s between %2$s - %3$s',
+ 'In %n weeks on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a week on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a month on %1$s between %2$s - %3$s',
+ 'In %n months on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a month on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a year on %1$s between %2$s - %3$s',
+ 'In %n years on %1$s between %2$s - %3$s',
+ 1,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In a year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ // plural partial day
+ [
+ 'In a minute on %1$s between %2$s - %3$s',
+ 'In %n minutes on %1$s between %2$s - %3$s',
+ 2,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In 2 minutes on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a hour on %1$s between %2$s - %3$s',
+ 'In %n hours on %1$s between %2$s - %3$s',
+ 2,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In 2 hours on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a day on %1$s between %2$s - %3$s',
+ 'In %n days on %1$s between %2$s - %3$s',
+ 2,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In 2 days on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a week on %1$s between %2$s - %3$s',
+ 'In %n weeks on %1$s between %2$s - %3$s',
+ 2,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In 2 weeks on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a month on %1$s between %2$s - %3$s',
+ 'In %n months on %1$s between %2$s - %3$s',
+ 2,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In 2 months on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
+ [
+ 'In a year on %1$s between %2$s - %3$s',
+ 'In %n years on %1$s between %2$s - %3$s',
+ 2,
+ ['July 1, 2024', '8:00 AM', '9:00 AM (America/Toronto)'],
+ 'In 2 years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)'
+ ],
]);
// construct time factory return(s)
$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
+ // past interval test dates
+ (new \DateTime('20240702T170000', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240703T170000', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240702T170000', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240703T170000', (new \DateTimeZone('America/Toronto')))),
+ // minute interval test dates
+ (new \DateTime('20240701T075900', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240630T235900', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240701T075800', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240630T235800', (new \DateTimeZone('America/Toronto')))),
+ // hour interval test dates
+ (new \DateTime('20240701T070000', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240630T230000', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240701T060000', (new \DateTimeZone('America/Toronto')))),
+ (new \DateTime('20240630T220000', (new \DateTimeZone('America/Toronto')))),
+ // day interval test dates
(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240628T170000', (new \DateTimeZone('America/Toronto')))),
+ // week interval test dates
(new \DateTime('20240621T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240621T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240614T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240614T170000', (new \DateTimeZone('America/Toronto')))),
+ // month interval test dates
(new \DateTime('20240530T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240530T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240430T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20240430T170000', (new \DateTimeZone('America/Toronto')))),
+ // year interval test dates
(new \DateTime('20230630T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20230630T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20220630T170000', (new \DateTimeZone('America/Toronto')))),
(new \DateTime('20220630T170000', (new \DateTimeZone('America/Toronto'))))
);
+ /** test partial day event in 1 day in the past*/
+ $vCalendar = clone $this->vCalendar1a;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test entire day event in 1 day in the past*/
+ $vCalendar = clone $this->vCalendar2;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In the past on July 1, 2024 for the entire day',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test partial day event in 2 days in the past*/
+ $vCalendar = clone $this->vCalendar1a;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In the past on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test entire day event in 2 days in the past*/
+ $vCalendar = clone $this->vCalendar2;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In the past on July 1, 2024 for the entire day',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test partial day event in 1 minute*/
+ $vCalendar = clone $this->vCalendar1a;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In a minute on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test entire day event in 1 minute*/
+ $vCalendar = clone $this->vCalendar2;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In a minute on July 1, 2024 for the entire day',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test partial day event in 2 minutes*/
+ $vCalendar = clone $this->vCalendar1a;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In 2 minutes on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test entire day event in 2 minutes*/
+ $vCalendar = clone $this->vCalendar2;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In 2 minutes on July 1, 2024 for the entire day',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test partial day event in 1 hour*/
+ $vCalendar = clone $this->vCalendar1a;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In a hour on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test entire day event in 1 hour*/
+ $vCalendar = clone $this->vCalendar2;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In a hour on July 1, 2024 for the entire day',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test partial day event in 2 hours*/
+ $vCalendar = clone $this->vCalendar1a;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In 2 hours on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)',
+ $this->service->generateWhenString($eventReader)
+ );
+
+ /** test entire day event in 2 hours*/
+ $vCalendar = clone $this->vCalendar2;
+ $eventReader = new EventReader($vCalendar, $vCalendar->VEVENT[0]->UID->getValue());
+ $this->assertEquals(
+ 'In 2 hours on July 1, 2024 for the entire day',
+ $this->service->generateWhenString($eventReader)
+ );
+
/** test patrial day event in 1 day*/
$vCalendar = clone $this->vCalendar1a;
// construct event reader
@@ -1260,15 +1556,53 @@ class IMipServiceTest extends TestCase {
};
}
);
- $this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s', ['day', 'July 1, 2024'], 'In a day on July 1, 2024'],
- ['In a %1$s on %2$s then on %3$s', ['day', 'July 1, 2024', 'July 3, 2024'], 'In a day on July 1, 2024 then on July 3, 2024'],
- ['In a %1$s on %2$s then on %3$s and %4$s', ['day', 'July 1, 2024', 'July 3, 2024', 'July 5, 2024'], 'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'],
- ['In %1$s %2$s on %3$s', [2, 'days', 'July 1, 2024'], 'In 2 days on July 1, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s', [2, 'days', 'July 1, 2024', 'July 3, 2024'], 'In 2 days on July 1, 2024 then on July 3, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s and %5$s', [2, 'days', 'July 1, 2024', 'July 3, 2024', 'July 5, 2024'], 'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'],
+ $this->l10n->method('n')->willReturnMap([
+ // singular
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 1,
+ ['July 1, 2024'],
+ 'In a day on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 1,
+ ['July 1, 2024', 'July 3, 2024'],
+ 'In a day on July 1, 2024 then on July 3, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 1,
+ ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+ 'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+ ],
+ // plural
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 days on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 2,
+ ['July 1, 2024', 'July 3, 2024'],
+ 'In 2 days on July 1, 2024 then on July 3, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 2,
+ ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+ 'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+ ],
]);
-
+
// construct time factory return(s)
$this->timeFactory->method('getDateTime')->willReturnOnConsecutiveCalls(
(new \DateTime('20240629T170000', (new \DateTimeZone('America/Toronto')))),
@@ -1364,13 +1698,51 @@ class IMipServiceTest extends TestCase {
};
}
);
- $this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s', ['day', 'July 1, 2024'], 'In a day on July 1, 2024'],
- ['In a %1$s on %2$s then on %3$s', ['day', 'July 1, 2024', 'July 3, 2024'], 'In a day on July 1, 2024 then on July 3, 2024'],
- ['In a %1$s on %2$s then on %3$s and %4$s', ['day', 'July 1, 2024', 'July 3, 2024', 'July 5, 2024'], 'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'],
- ['In %1$s %2$s on %3$s', [2, 'days', 'July 1, 2024'], 'In 2 days on July 1, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s', [2, 'days', 'July 1, 2024', 'July 3, 2024'], 'In 2 days on July 1, 2024 then on July 3, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s and %5$s', [2, 'days', 'July 1, 2024', 'July 3, 2024', 'July 5, 2024'], 'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'],
+ $this->l10n->method('n')->willReturnMap([
+ // singular
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 1,
+ ['July 1, 2024'],
+ 'In a day on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 1,
+ ['July 1, 2024', 'July 3, 2024'],
+ 'In a day on July 1, 2024 then on July 3, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 1,
+ ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+ 'In a day on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+ ],
+ // plural
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 days on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 2,
+ ['July 1, 2024', 'July 3, 2024'],
+ 'In 2 days on July 1, 2024 then on July 3, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 2,
+ ['July 1, 2024', 'July 3, 2024', 'July 5, 2024'],
+ 'In 2 days on July 1, 2024 then on July 3, 2024 and July 5, 2024'
+ ],
]);
// construct time factory return(s)
@@ -1477,13 +1849,51 @@ class IMipServiceTest extends TestCase {
};
}
);
- $this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s', ['day', 'July 1, 2024'], 'In a day on July 1, 2024'],
- ['In a %1$s on %2$s then on %3$s', ['day', 'July 1, 2024', 'July 5, 2024'], 'In a day on July 1, 2024 then on July 5, 2024'],
- ['In a %1$s on %2$s then on %3$s and %4$s', ['day', 'July 1, 2024', 'July 5, 2024', 'July 7, 2024'], 'In a day on July 1, 2024 then on July 5, 2024 and July 7, 2024'],
- ['In %1$s %2$s on %3$s', [2, 'days', 'July 1, 2024'], 'In 2 days on July 1, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s', [2, 'days', 'July 1, 2024', 'July 5, 2024'], 'In 2 days on July 1, 2024 then on July 5, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s and %5$s', [2, 'days', 'July 1, 2024', 'July 5, 2024', 'July 7, 2024'], 'In 2 days on July 1, 2024 then on July 5, 2024 and July 7, 2024'],
+ $this->l10n->method('n')->willReturnMap([
+ // singular
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 1,
+ ['July 1, 2024'],
+ 'In a day on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 1,
+ ['July 1, 2024', 'July 5, 2024'],
+ 'In a day on July 1, 2024 then on July 5, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 1,
+ ['July 1, 2024', 'July 5, 2024', 'July 7, 2024'],
+ 'In a day on July 1, 2024 then on July 5, 2024 and July 7, 2024'
+ ],
+ // plural
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 days on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 2,
+ ['July 1, 2024', 'July 5, 2024'],
+ 'In 2 days on July 1, 2024 then on July 5, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 2,
+ ['July 1, 2024', 'July 5, 2024', 'July 7, 2024'],
+ 'In 2 days on July 1, 2024 then on July 5, 2024 and July 7, 2024'
+ ],
]);
// construct time factory return(s)
@@ -1623,13 +2033,51 @@ class IMipServiceTest extends TestCase {
};
}
);
- $this->l10n->method('t')->willReturnMap([
- ['In a %1$s on %2$s', ['day', 'July 1, 2024'], 'In a day on July 1, 2024'],
- ['In a %1$s on %2$s then on %3$s', ['day', 'July 1, 2024', 'July 5, 2024'], 'In a day on July 1, 2024 then on July 5, 2024'],
- ['In a %1$s on %2$s then on %3$s and %4$s', ['day', 'July 1, 2024', 'July 5, 2024', 'July 9, 2024'], 'In a day on July 1, 2024 then on July 5, 2024 and July 9, 2024'],
- ['In %1$s %2$s on %3$s', [2, 'days', 'July 1, 2024'], 'In 2 days on July 1, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s', [2, 'days', 'July 1, 2024', 'July 5, 2024'], 'In 2 days on July 1, 2024 then on July 5, 2024'],
- ['In %1$s %2$s on %3$s then on %4$s and %5$s', [2, 'days', 'July 1, 2024', 'July 5, 2024', 'July 9, 2024'], 'In 2 days on July 1, 2024 then on July 5, 2024 and July 9, 2024'],
+ $this->l10n->method('n')->willReturnMap([
+ // singular
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 1,
+ ['July 1, 2024'],
+ 'In a day on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 1,
+ ['July 1, 2024', 'July 5, 2024'],
+ 'In a day on July 1, 2024 then on July 5, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 1,
+ ['July 1, 2024', 'July 5, 2024', 'July 9, 2024'],
+ 'In a day on July 1, 2024 then on July 5, 2024 and July 9, 2024'
+ ],
+ // plural
+ [
+ 'In a day on %1$s',
+ 'In %n days on %1$s',
+ 2,
+ ['July 1, 2024'],
+ 'In 2 days on July 1, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s',
+ 'In %n days on %1$s then on %2$s',
+ 2,
+ ['July 1, 2024', 'July 5, 2024'],
+ 'In 2 days on July 1, 2024 then on July 5, 2024'
+ ],
+ [
+ 'In a day on %1$s then on %2$s and %3$s',
+ 'In %n days on %1$s then on %2$s and %3$s',
+ 2,
+ ['July 1, 2024', 'July 5, 2024', 'July 9, 2024'],
+ 'In 2 days on July 1, 2024 then on July 5, 2024 and July 9, 2024'
+ ],
]);
// construct time factory return(s)
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
index 8d20fd5f9df..f656a0fa33c 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
@@ -353,7 +353,7 @@ class PluginTest extends TestCase {
'{DAV:}displayname' => $displayName,
]);
- $calendarHomeObject->expects($this->once())
+ $calendarHomeObject->expects($this->exactly($deleted ? 2 : 1))
->method('getCalDAVBackend')
->with()
->willReturn($calendarBackend);
diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
index 7510340aa57..18cef58207d 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -42,7 +42,7 @@ class TestViewDirectory extends View {
return $this->deletables[$path];
}
- public function rename($path1, $path2) {
+ public function rename($path1, $path2, array $options = []) {
return $this->canRename;
}