Merge branch '1.5-dev'

This commit is contained in:
Julian Depetris Chauvin 2013-09-23 15:09:09 -03:00
commit 7f112ea2e9
4 changed files with 4258 additions and 1 deletions

View file

@ -450,7 +450,8 @@ TRANSLATIONS += locale/ru_RU.ts \
locale/ko_KR.ts \
locale/nl_NL.ts \
locale/sr_SR.ts \
locale/sv_SE.ts
locale/sv_SE.ts \
locale/tk_TM.ts
# Build version file
!isEmpty( hasGit ) {

View file

@ -967,6 +967,7 @@
<QtTranslate Include="locale\sr_SR.ts" />
<QtTranslate Include="locale\sv_SE.ts" />
<QtTranslate Include="locale\tg_TJ.ts" />
<QtTranslate Include="locale\tk_TM.ts" />
<QtTranslate Include="locale\tr_TR.ts" />
<QtTranslate Include="locale\uk_UA.ts" />
<QtTranslate Include="locale\vi_VN.ts" />

View file

@ -1553,6 +1553,9 @@
<QtTranslate Include="locale\sv_SE.ts">
<Filter>Translations</Filter>
</QtTranslate>
<QtTranslate Include="locale\tk_TM.ts">
<Filter>Translations</Filter>
</QtTranslate>
</ItemGroup>
<ItemGroup>
<QtMOCCompile Include="qtsingleapplication\src\qtlocalpeer.h">

4252
locale/tk_TM.ts Normal file

File diff suppressed because it is too large Load diff