Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 402 → Rev 401

/trunk/Scribus/scribus/profiles/Makefile.am
4,10 → 4,10
EXTRA_DIST = Readme
 
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(libdir)/scribus/profiles/
$(INSTALL_DATA) $(srcdir)/Readme $(DESTDIR)$(libdir)/scribus/profiles/ReadMe
$(mkinstalldirs) $(libdir)/scribus/profiles/
$(INSTALL_DATA) $(srcdir)/Readme $(libdir)/scribus/profiles/ReadMe
 
uninstall-local:
-rm -f $(DESTDIR)$(libdir)/scribus/profiles/ReadMe
-rm -f $(libdir)/scribus/profiles/ReadMe
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/dicts/hyph_af.dic
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: trunk/Scribus/scribus/dicts/Makefile.am
===================================================================
--- trunk/Scribus/scribus/dicts/Makefile.am (revision 402)
+++ trunk/Scribus/scribus/dicts/Makefile.am (revision 401)
@@ -1,12 +1,10 @@
####### kdevelop will overwrite this part!!! (begin)##########
-EXTRA_DIST = hyph_af.dic hyph_sl.dic hyph_sv.dic hyph_lt.dic hyph_ga.dic hyph_fi.dic hyph_el.dic hyph_cs.dic hyph_de.dic hyph_en.dic hyph_es.dic hyph_fr.dic hyph_it.dic hyph_ru.dic hyph_da.dic hyph_sk.dic hyph_hu.dic hyph_pt.dic hyph_nl.dic hyph_uk.dic hyph_ca.dic
+EXTRA_DIST = hyph_sl.dic hyph_sv.dic hyph_lt.dic hyph_ga.dic hyph_fi.dic hyph_el.dic hyph_cs.dic hyph_de.dic hyph_en.dic hyph_es.dic hyph_fr.dic hyph_it.dic hyph_ru.dic hyph_da.dic hyph_sk.dic hyph_hu.dic hyph_pt.dic hyph_nl.dic hyph_uk.dic hyph_ca.dic
install-data-local:
$(mkinstalldirs) $(libdir)/scribus/dicts/
- $(INSTALL_DATA) $(srcdir)/hyph_af.dic $(libdir)/scribus/dicts/hyph_af.dic
- $(mkinstalldirs) $(libdir)/scribus/dicts/
$(INSTALL_DATA) $(srcdir)/hyph_lt.dic $(libdir)/scribus/dicts/hyph_lt.dic
$(mkinstalldirs) $(libdir)/scribus/dicts/
$(INSTALL_DATA) $(srcdir)/hyph_sl.dic $(libdir)/scribus/dicts/hyph_sl.dic
@@ -50,7 +48,6 @@
$(INSTALL_DATA) $(srcdir)/hyph_ga.dic $(libdir)/scribus/dicts/hyph_ga.dic
uninstall-local:
- -rm -f $(libdir)/scribus/dicts/hyph_af.dic
-rm -f $(libdir)/scribus/dicts/hyph_lt.dic
-rm -f $(libdir)/scribus/dicts/hyph_sl.dic
-rm -f $(libdir)/scribus/dicts/hyph_sv.dic
/trunk/Scribus/scribus/libabout/about.cpp
56,7 → 56,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("02").arg("September").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("29").arg("August").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
3176,7 → 3176,8
if (!ss->IsScribus(FName))
{
delete ss;
QMessageBox::warning(this, tr("Warning"), tr("File %1 is not in Scribus format").arg(FName), tr("OK"));
//next line to add only after strings are no longer frozen
//QMessageBox::warning(this, tr("Warning"), tr("File %1 is not in Scribus format").arg(FName), tr("OK"));
return false;
}
doc=new ScribusDoc();
8314,7 → 8315,6
QStringList L_Lithuanian;
QStringList L_Swedish;
QStringList L_Slovenian;
QStringList L_Afrikaans;
L_German.clear();
L_Polish.clear();
L_English.clear();
8336,7 → 8336,6
L_Lithuanian.clear();
L_Swedish.clear();
L_Slovenian.clear();
L_Afrikaans.clear();
QDir d2(pfad, "*.*", QDir::Name, QDir::Files | QDir::NoSymLinks);
if ((d2.exists()) && (d2.count() != 0))
{
8433,10 → 8432,6
translatedLang = trans->findMessage("ScribusApp", "Slovenian", "").translation();
if (translatedLang != "")
L_Slovenian.append(translatedLang);
translatedLang = "";
translatedLang = trans->findMessage("ScribusApp", "Afrikaans", "").translation();
if (translatedLang != "")
L_Afrikaans.append(translatedLang);
delete trans;
}
}
8462,7 → 8457,6
InstLang.insert("Lithuanian", L_Lithuanian);
InstLang.insert("Swedish", L_Swedish);
InstLang.insert("Slovenian", L_Slovenian);
InstLang.insert("Afrikaans", L_Afrikaans);
QString datein = "";
QString lang = QString(QTextCodec::locale()).left(2);
LangTransl.clear();
8516,8 → 8510,6
datein = tr("Swedish");
if (d[dc] == "hyph_sl.dic")
datein = tr("Slovenian");
if (d[dc] == "hyph_af.dic")
datein = tr("Afrikaans");
QString tDatein = datein;
datein = GetLang(datein);
LangTransl.insert(datein, tDatein);
/trunk/Scribus/scribus/hyphen.c
471,9 → 471,9
hyphens[offset + k] = match[k];
}
 
/* KBH: we need this to make sure we keep looking in a word
for patterns even if the current character is not known in state 0
since patterns for hyphenation may occur anywhere in the word */
// KBH: we need this to make sure we keep looking in a word
// for patterns even if the current character is not known in state 0
// since patterns for hyphenation may occur anywhere in the word
try_next_letter: ;
 
}
/trunk/Scribus/ChangeLogCVS
1,8 → 1,5
Changes since 1.2
 
03.09.2004
* feature #1024: Added Hyphenation Patterns for Afrikaans
 
29.08.2004
* bug # 869: oriantation setting wrong displayed
* bug #1009: SuSE Patches for scribus
10,7 → 7,6
* feature #1010: Update of russian translation. many fixes
* feature #1013: middle mouse button refreshes screen when you use it to paste text
* feature #1017: Norwegian Bokmaal Translation for 1.2
* bug # 869: oriantation setting wrong displayed
 
28.08.2004
* feature # 500: Create new documentation website for 1.2 release