• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision27046 (tree)
Zeit2015-12-14 04:11:55
Autorstefankueng

Log Message

Merged revision(s) r27044, r27045 from trunk:
* As of Win8.1, msgothic has been replaced with yugothic. On Win10, msgothic isn't installed anymore. So try yugothic as well if msgothic fails.
* update pot file with UI changes.

Ändern Zusammenfassung

Diff

--- branches/1.9.x/Languages/TortoiseUI.pot (revision 27045)
+++ branches/1.9.x/Languages/TortoiseUI.pot (revision 27046)
@@ -7022,7 +7022,7 @@
70227022 msgstr ""
70237023
70247024 #. Resource IDs: (2504)
7025-msgid "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All (*.*)|*.*||"
7025+msgid "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif, *.webp)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif;*.webp|All (*.*)|*.*||"
70267026 msgstr ""
70277027
70287028 #. Resource IDs: (3930)
--- branches/1.9.x/doc/xsl/fonts/createmetrics.bat (revision 27045)
+++ branches/1.9.x/doc/xsl/fonts/createmetrics.bat (revision 27046)
@@ -43,6 +43,7 @@
4343 %CMD% %FONT_DIR%\couri.ttf couri.xml
4444 %CMD% %FONT_DIR%\iqraa.ttf iqraa.xml
4545 %CMD% %FONT_DIR%\msgothic.ttf msgothic.xml
46+%CMD% %FONT_DIR%\yugothic.ttf msgothic.xml
4647 %CMD% %FONT_DIR%\msmincho.ttf msmincho.xml
4748 %CMD% %FONT_DIR%\msyh.ttf msyh.xml
4849 %CMD% %FONT_DIR%\msyhbd.ttf msyhbd.xml
@@ -55,7 +56,9 @@
5556
5657 :: in case the ttf isn't available, try the ttc
5758 %CMD% -ttcname "MS Gothic" %FONT_DIR%\msgothic.ttc msgothic.xml
59+%CMD% -ttcname "MS Gothic" %FONT_DIR%\yugothr.ttc msgothic.xml
5860 %CMD% -ttcname "MS Mincho" %FONT_DIR%\msmincho.ttc msmincho.xml
61+%CMD% -ttcname "MS Mincho" %FONT_DIR%\YuGothB.ttc msmincho.xml
5962 %CMD% -ttcname "MS YaHei" %FONT_DIR%\msyh.ttc msyh.xml
6063 %CMD% -ttcname "MS YaHei Bold" %FONT_DIR%\msyhbd.ttc msyhbd.xml
6164 %CMD% -ttcname "SimHei" %FONT_DIR%\simhei.ttc simhei.xml
Show on old repository browser