diff -Nru orthcal-1.4/bin/OrthCal.pl orthcal-1.4/bin/OrthCal.pl --- orthcal-1.4/bin/OrthCal.pl 2012-10-22 08:39:20.000000000 +0000 +++ orthcal-1.4/bin/OrthCal.pl 2012-11-29 18:41:50.000000000 +0000 @@ -33,7 +33,7 @@ my $indicator = 'OrthCal_ind.py'; if ( `ps -e | grep OrthCal` !~ /$indicator/ ) { - system "/opt/extras.ubuntu.com/orthcal/bin/OrthCal_ind.py&"; + system '/opt/extras.ubuntu.com/orthcal/bin/OrthCal_ind.py&'; exit; } @@ -218,7 +218,7 @@ @{ $slist->{data} } = ( [ 'orthodoxwiki.org', 'English', "\t+" ], [ 'saint.gr', 'Ελληνικά', "\t+" ], - [ 'drevo-info.ru', 'русский', "\t+" ] + [ 'drevo-info.ru', 'русский', "\t+" ], ); my $username = getpwuid $<; my $source; @@ -439,7 +439,7 @@ { $feasts = '✙✙ ' . $movable{$Dd} . ' ✙✙✙' . "\n" . $feasts; } -$feasts = " ✙ " . $feasts; +$feasts = ' ✙ ' . $feasts; $feasts =~ s/\n(\w|[<"])/\n \✙ $1/g; my $occurences = ( $feasts =~ tr/\n// ); @@ -751,17 +751,17 @@ if ( $old_year <= $custom_year ) { $result = - $d->get("The date of Pascha in ") + $d->get('The date of Pascha in ') . $Eastery - . $d->get(" is:") + . $d->get(' is:') . " $Easterd/$Easterm."; } else { $result = - $d->get("The date of Pascha in ") + $d->get('The date of Pascha in ') . $Eastery - . $d->get(" was:") + . $d->get(' was:') . " $Easterd/$Easterm."; } @@ -862,7 +862,11 @@ if ( $feast_name =~ /\n?(.*$query.*)\n?/i && $query !~ /^\s*$/ ) { - my $feast_name = $1; + $feast_name = $1; + if ( $feast_name ~~ @hits ) + { + $feast_name .= q{ }; + } push @hits, $feast_name; $hits{$feast_name} = "$month/$day"; } diff -Nru orthcal-1.4/debian/bzr-builder.manifest orthcal-1.4/debian/bzr-builder.manifest --- orthcal-1.4/debian/bzr-builder.manifest 2012-10-22 08:39:20.000000000 +0000 +++ orthcal-1.4/debian/bzr-builder.manifest 2012-11-29 18:41:51.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~35 -lp:orthcal revid:dgkontopoulos@member.fsf.org-20121022082915-rbhp0omh1x3zaoxk +# bzr-builder format 0.3 deb-version {debupstream}-1~36 +lp:orthcal revid:dgkontopoulos@member.fsf.org-20121129183452-1k9s9w2az8yqahpf diff -Nru orthcal-1.4/debian/changelog orthcal-1.4/debian/changelog --- orthcal-1.4/debian/changelog 2012-10-22 08:39:20.000000000 +0000 +++ orthcal-1.4/debian/changelog 2012-11-29 18:41:51.000000000 +0000 @@ -1,11 +1,11 @@ -orthcal (1.4-0~35~raring1) raring; urgency=low +orthcal (1.4-1~36~raring1) raring; urgency=low * Auto build. - -- Dimitrios - Georgios Kontopoulos Mon, 22 Oct 2012 08:39:20 +0000 + -- Dimitrios - Georgios Kontopoulos Thu, 29 Nov 2012 18:41:51 +0000 -orthcal (1.4-0extras12.10) quantal; urgency=low +orthcal (1.4-1extras12.10) quantal; urgency=low - * New features: Russian content, support for Russian and Romanian. + * Fixed a bug in the feasts search utility and added new versions of translations. - -- Dimitrios - Georgios Kontopoulos Mon, 22 Oct 2012 11:28:00 +0300 + -- Dimitrios - Georgios Kontopoulos Thu, 29 Nov 2012 20:34:00 +0300 diff -Nru orthcal-1.4/extras-orthcal.desktop orthcal-1.4/extras-orthcal.desktop --- orthcal-1.4/extras-orthcal.desktop 2012-10-22 08:39:20.000000000 +0000 +++ orthcal-1.4/extras-orthcal.desktop 2012-11-29 18:41:50.000000000 +0000 @@ -21,7 +21,7 @@ Name=Today's Feasts (Julian/Old Calendar) Name[el]=Σημερινές Εορτές (Ιουλιανό/Παλαιό Ημερολόγιο) Name[es]=Feriados de hoy (viejo calendario/juliano) -Name[ru]=Сегодняшние праздники (Юлиансккий календарь / старый стиль) +Name[ru]=Сегодняшние праздники (Юлианский календарь / старый стиль) Name[ro]=Sărbătorile zilei (Calendarul Iulian/Vechi) Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl Julian OnlyShowIn=Unity; Binary files /tmp/hS8EHBqhrC/orthcal-1.4/translations/locale/ro/LC_MESSAGES/OrthCal.mo and /tmp/uDRFNUCBpO/orthcal-1.4/translations/locale/ro/LC_MESSAGES/OrthCal.mo differ Binary files /tmp/hS8EHBqhrC/orthcal-1.4/translations/locale/ru/LC_MESSAGES/OrthCal_ind.mo and /tmp/uDRFNUCBpO/orthcal-1.4/translations/locale/ru/LC_MESSAGES/OrthCal_ind.mo differ