diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-07 16:13:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-07 16:16:24 +0200 |
| commit | 8eb8dcb1af39cd6129031becc52fa4d6222166e3 (patch) | |
| tree | cde424a4717514eb790788cb414483ded8fe7fe0 /translations/designer_uk.ts | |
| parent | 408146a45cf9026e95666af626a90f33d890db34 (diff) | |
| parent | 1224b6890e0b0971e5eeea9f52d806f1890de0ed (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
translations/assistant_ru.ts
translations/assistant_uk.ts
translations/designer_ru.ts
translations/designer_uk.ts
translations/linguist_ru.ts
translations/linguist_uk.ts
translations/qtbase_fi.ts
translations/qtbase_ru.ts
translations/qtbase_uk.ts
Change-Id: I033f8d700d76360068cb9307d986092fd31cd685
Diffstat (limited to 'translations/designer_uk.ts')
| -rw-r--r-- | translations/designer_uk.ts | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/translations/designer_uk.ts b/translations/designer_uk.ts index 5e9ebc6..1ce82ef 100644 --- a/translations/designer_uk.ts +++ b/translations/designer_uk.ts @@ -3173,10 +3173,6 @@ Do you want overwrite the template?</source> <source>%1<br/>Copyright (C) 2015 The Qt Company Ltd.</source> <translation>%1<br/>Copyright (C) 2015 The Qt Company Ltd та/або її дочірні компанії.</translation> </message> - <message> - <source>%1<br/>Copyright (C) 2015 The Qt Company Ltd.</source> - <translation type="obsolete">%1<br/>Copyright (C) 2015 The Qt Company Ltd та/або її дочірні компанії.</translation> - </message> </context> <context> <name>WidgetDataBase</name> |