Commit 1434b29
committed
Merge branch 'l10n_main'
# Conflicts:
# src/libs/application/uishell/share/translations/uishell_ja_JP.ts
# src/libs/application/uishell/share/translations/uishell_zh_CN.ts
# src/libs/application/uishell/share/translations/uishell_zh_TW.ts
# src/plugins/audio/res/translations/org.diffscope.audio_ja_JP.ts
# src/plugins/audio/res/translations/org.diffscope.audio_zh_CN.ts
# src/plugins/audio/res/translations/org.diffscope.audio_zh_TW.ts
# src/plugins/coreplugin/res/translations/org.diffscope.core_ja_JP.ts
# src/plugins/coreplugin/res/translations/org.diffscope.core_zh_CN.ts
# src/plugins/coreplugin/res/translations/org.diffscope.core_zh_TW.ts
# src/plugins/importexportmanager/res/translations/org.diffscope.importexportmanager_ja_JP.ts
# src/plugins/importexportmanager/res/translations/org.diffscope.importexportmanager_zh_CN.ts
# src/plugins/importexportmanager/res/translations/org.diffscope.importexportmanager_zh_TW.ts
# src/plugins/libresvipformatconverter/res/translations/org.diffscope.libresvipformatconverter_ja_JP.ts
# src/plugins/libresvipformatconverter/res/translations/org.diffscope.libresvipformatconverter_zh_CN.ts
# src/plugins/libresvipformatconverter/res/translations/org.diffscope.libresvipformatconverter_zh_TW.ts
# src/plugins/maintenance/res/translations/org.diffscope.maintenance_ja_JP.ts
# src/plugins/maintenance/res/translations/org.diffscope.maintenance_zh_CN.ts
# src/plugins/maintenance/res/translations/org.diffscope.maintenance_zh_TW.ts
# src/plugins/midiformatconverter/res/translations/org.diffscope.midiformatconverter_ja_JP.ts
# src/plugins/midiformatconverter/res/translations/org.diffscope.midiformatconverter_zh_CN.ts
# src/plugins/midiformatconverter/res/translations/org.diffscope.midiformatconverter_zh_TW.ts
# src/plugins/visualeditor/res/translations/org.diffscope.visualeditor_ja_JP.ts
# src/plugins/visualeditor/res/translations/org.diffscope.visualeditor_zh_CN.ts
# src/plugins/visualeditor/res/translations/org.diffscope.visualeditor_zh_TW.ts
# src/plugins/welcomewizard/res/translations/org.diffscope.welcomewizard_ja_JP.ts
# src/plugins/welcomewizard/res/translations/org.diffscope.welcomewizard_zh_CN.ts
# src/plugins/welcomewizard/res/translations/org.diffscope.welcomewizard_zh_TW.tsFile tree
36 files changed
+16082
-10419
lines changed- src
- plugins
- audio/res/translations
- coreplugin/res/translations
- importexportmanager/res/translations
- libresvipformatconverter/res/translations
- maintenance/res/translations
- midiformatconverter/res/translations
- visualeditor/res/translations
- welcomewizard/res/translations
36 files changed
+16082
-10419
lines changedLines changed: 584 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 346 additions & 346 deletions
Large diffs are not rendered by default.
Lines changed: 346 additions & 346 deletions
Large diffs are not rendered by default.
Lines changed: 346 additions & 346 deletions
Large diffs are not rendered by default.
Lines changed: 511 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 325 additions & 325 deletions
Large diffs are not rendered by default.
Lines changed: 325 additions & 325 deletions
Large diffs are not rendered by default.
Lines changed: 325 additions & 325 deletions
Large diffs are not rendered by default.
Lines changed: 3517 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 2194 additions & 2189 deletions
Large diffs are not rendered by default.
0 commit comments