Fix bad merge
authorAlexander Slovesnik <unghost@mozilla-russia.org>
Tue, 10 Jun 2014 22:35:02 +0400
changeset 3008 41be3e24ae1deb9bc4a95a4cc08f11a5075aae89
parent 3007 0a1ef76d9c3914ab900032d373853446f12544d9
child 3009 9958f55f3e53b5c9cbe2cf7cfe2a7911418300e1
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 22:07:11 +0000
Fix bad merge
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.properties
calendar/chrome/lightning/lightning.properties
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -113,20 +113,45 @@ ordinalWeekdayOrder=%1$S %2$S
 # #2 - interval
 # e.g. "every Monday, Tuesday and the second Sunday of every month"
 monthlyEveryOfEveryNounclass1=каждый %1$S каждого месяца;каждый %1$S каждого #2 месяца
 monthlyEveryOfEveryNounclass2=каждую %1$S каждого месяца;каждую %1$S каждого #2 месяца
 monthlyEveryOfEveryNounclass3=каждое %1$S каждого месяца;каждое %1$S каждого #2 месяца
 
 # LOCALIZATION NOTE (monthlyDaysOfNth_ordSymbol):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
-# %1$S - day of month
-# #2 - month interval
-# e.g. "day 3 of every 2 months"
-monthlyDayOfNth=в %1$S день каждого месяца;в %1$S день каждого #2 месяца
+# Allows to insert a string, a character or a symbol after the numbers of a day
+# in a monthly rule monthlyDaysOfNth in order to give to each day number the
+# meaning of ordinal number (e.g.  1 -> 1st; 2 -> 2nd etc.).
+# Use a single string if the symbol used is the same for every monthday, otherwise
+# write a sequence of _31_ strings (one for every monthday) separated with commas.
+# If your language doesn't require that in monthlyDaysOfNth, leave it empty.
+# e.g.
+# monthlyDaysOfNth_ordSymbol=.
+#    -> "Occurs days 1., 2., 10. and 11. of every 2 months"
+# monthlyDaysOfNth_ordSymbol=st,nd,rd,th,th,th,th,th,th,th,th,th,th,th,th,
+#                            th,th,th,th,th,st,nd,rd,th,th,th,th,th,th,th,st
+#    -> "Occurs days 1st, 2nd, 10th and 11th of every 2 months"
+monthlyDaysOfNth_ordSymbol=-й
+
+# LOCALIZATION NOTE (monthlyDaysOfNth_day):
+# Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
+# %1$S - day of month or a sequence of days of month, eventually with ordinal symbol
+#        coming from monthlyDaysOfNth_ordSymbol, separated with commas;
+# e.g. "days 3, 6 and 9" or "days 3rd, 6th and 9th"
+monthlyDaysOfNth_day=день %1$S;дни %1$S
+
+# LOCALIZATION NOTE (monthlyDaysOfNth):
+# Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
+# %1$S - it's the strig monthlyDaysOfNth_day: day of month or a sequence of days
+#        of month, eventually with ordinal symbol, separated with commas;
+# #2   - monthly interval
+# e.g. "days 3, 6, 9 and 12 of every 3 months"
+monthlyDaysOfNth=%1$S каждого месяца;%1$S каждого #2 месяца
+
 
 # LOCALIZATION NOTE (monthlyLastDayOfNth):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
 # %1$S - day of month
 # #2 - month interval
 # e.g. "the last day of every 3 months"
 monthlyLastDayOfNth=в последний день месяца;в последний день каждого #1 месяца
 
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -31,17 +31,17 @@ warningUntilBeforeStart=Введённая вами дата раньше даты начала события
 # The name of the calendar provided with the application by default
 homeCalendarName=Мой календарь
 
 # The name given to a calendar if an opened calendar has an empty filename
 untitledCalendarName=Календарь без названия
 
 # Event status: Tentative, Confirmed, Cancelled
 # ToDo task status: NeedsAction, InProcess, Completed, Cancelled
-statusTentative     =Возможно
+statusTentative     =Уточняется
 statusConfirmed     =Подтверждено
 eventStatusCancelled=Отменено
 todoStatusCancelled =Отменено
 statusNeedsAction   =Необходимы действия
 statusInProcess     =Выполняется
 statusCompleted     =Выполнена
 
 # Task priority, these should match the priority.level.* labels in calendar.dtd
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -62,9 +62,8 @@ itipRequestUpdatedSubject=Обновлённое приглашение на событие: %1$S
 itipRequestBody=%1$S приглашает Вас на %2$S
 itipCancelSubject=Событие отменено: %1$S
 itipCancelBody=%1$S отменил это событие: « %2$S »
 
 confirmProcessInvitation=Вы недавно удалили этот пункт, вы уверены, что вы хотите обработать это приглашение?
 confirmProcessInvitationTitle=Обработать пришлашение?
 
 invitationsLink.label=Приглашения: %1$S
-