# Conflicts: # resources/l10n/fr.lproj/Localizable.strings # resources/l10n/he.lproj/Localizable.strings # resources/l10n/it.lproj/Localizable.strings # resources/l10n/ja.lproj/Localizable.strings # resources/l10n/pt.lproj/Localizable.strings # resources/l10n/sv.lproj/Localizable.strings