summaryrefslogtreecommitdiffstats
path: root/translations/linguist_sl.ts
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
commit5422e929cad04633a06c156cba96cfcd69262522 (patch)
treeafb3c9b76c05d80238a1ff76f4e8f4019fac1651 /translations/linguist_sl.ts
parentac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff)
parenta0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff)
downloadQt-5422e929cad04633a06c156cba96cfcd69262522.zip
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: configure src/network/bearer/bearer.pri
Diffstat (limited to 'translations/linguist_sl.ts')
-rw-r--r--translations/linguist_sl.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/translations/linguist_sl.ts b/translations/linguist_sl.ts
index 27ca8d1..4499133 100644
--- a/translations/linguist_sl.ts
+++ b/translations/linguist_sl.ts
@@ -912,7 +912,7 @@ Options:
<translation type="unfinished"></translation>
</message>
<message>
- <source>Illegal escape squence</source>
+ <source>Illegal escape sequence</source>
<translation type="unfinished"></translation>
</message>
<message>