Commit graph

3 commits

Author SHA1 Message Date
Danmei Chen
4bf9105c30 support weblate translations 2020-12-03 21:33:01 +01:00
Gautier Pelloux-Prayer
b6d7b48d2e i10n: add Settings page to translatable resources 2015-04-20 14:39:55 +02:00
Yann Diorcet
233f22e5d7 Merge branch 'master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk
2013-01-15 12:58:42 +01:00