- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 28657: Remove broken FTE bridge from Tor Browser
by boklm＠torproject.org 29 Nov '18

29 Nov '18

commit b7b964117cc26d1e06e7805ba5f4a538402aed89 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 29 09:51:18 2018 +0000 Bug 28657: Remove broken FTE bridge from Tor Browser --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index ad34891..ec76ce7 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -9,9 +9,8 @@ pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:389 pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Use our Orbot for proxying our connections
by gk＠torproject.org 29 Nov '18

29 Nov '18

commit 2ffe1e523e67c62a5bc160cfa8d09030cbdf5267 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Nov 14 17:39:03 2018 +0000 Bug 28051 - Use our Orbot for proxying our connections --- mobile/android/app/000-tor-browser-android.js | 3 --- .../geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index c329fcdee5f7..e7e337276acb 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -54,9 +54,6 @@ pref("media.realtime_decoder.enabled", false); pref("general.useragent.updates.enabled", false); pref("general.useragent.updates.url", ""); -// Override this because Orbot uses 9050 as the default -pref("network.proxy.socks_port", 9050); - // Do not allow the user to install extensions from web pref("xpinstall.enabled", false); pref("extensions.enabledScopes", 1); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index f05716fe1d09..41c2c7e705a1 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -30,8 +30,8 @@ import java.util.List; public class ProxySelector { private static final String TOR_PROXY_ADDRESS = "127.0.0.1"; - private static final int TOR_SOCKS_PROXY_PORT = 9050; - private static final int TOR_HTTP_PROXY_PORT = 8118; + private static final int TOR_SOCKS_PROXY_PORT = 9150; + private static final int TOR_HTTP_PROXY_PORT = 8218; public static URLConnection openConnectionWithProxy(URI uri) throws IOException { java.net.ProxySelector ps = java.net.ProxySelector.getDefault();

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Open Orbot when the notification is tapped
by gk＠torproject.org 29 Nov '18

29 Nov '18

commit 8e5290a7ff9c70dde87e055256717feb342a8645 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Nov 14 17:40:15 2018 +0000 Bug 28051 - Open Orbot when the notification is tapped --- .../base/java/org/mozilla/gecko/LauncherActivity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java index e8f8facc24c6..4cd94ed538c7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java @@ -45,6 +45,9 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN; import org.mozilla.gecko.deeplink.DeepLinkContract; +import org.torproject.android.OrbotMainActivity; +import org.torproject.android.service.TorServiceConstants; + /** * Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app). */ @@ -67,6 +70,9 @@ public class LauncherActivity extends Activity { } else if (isWebAppIntent(safeIntent)) { dispatchWebAppIntent(); + } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) { + dispatchOrbotIntent(); + // If it's not a view intent, it won't be a custom tabs intent either. Just launch! } else if (!isViewIntentWithURL(safeIntent)) { dispatchNormalIntent(); @@ -116,6 +122,18 @@ public class LauncherActivity extends Activity { startActivity(intent); } + private void dispatchOrbotIntent() { + final String orbotStartAction = "android.intent.action.MAIN"; + final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); + + //When we launch Orbot, we want a new task. + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + + startActivity(intent); + } + private void dispatchUrlIntent(@NonNull String url) { Intent intent = new Intent(getIntent()); intent.setData(Uri.parse(url));

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Stop the background service when we're quitting
by gk＠torproject.org 29 Nov '18

29 Nov '18

commit 4514386c95b57153ca550d710c117efe5a3acf93 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Nov 14 17:39:45 2018 +0000 Bug 28051 - Stop the background service when we're quitting If the user swips away the app, then initiate quitting as if the user selected Quit from the menu. --- mobile/android/base/java/org/mozilla/gecko/GeckoApp.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 802d8adafbeb..42a4f191d525 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -91,6 +91,8 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.torproject.android.service.TorService; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -596,6 +598,9 @@ public abstract class GeckoApp extends GeckoActivity EventDispatcher.getInstance().dispatch("Browser:Quit", res); + Intent torService = new Intent(this, TorService.class); + stopService(torService); + // We don't call shutdown here because this creates a race condition which // can cause the clearing of private data to fail. Instead, we shut down the // UI only after we're done sanitizing. @@ -2166,6 +2171,11 @@ public abstract class GeckoApp extends GeckoActivity GeckoApplication.shutdown(!mRestartOnShutdown ? null : new Intent( Intent.ACTION_MAIN, /* uri */ null, getApplicationContext(), getClass())); } + + if (isFinishing()) { + Log.i(LOGTAG, "onDestroy() is finishing."); + quitAndClear(); + } } public void showSDKVersionError() {

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Launch Orbot if it isn't running in the background
by gk＠torproject.org 29 Nov '18

29 Nov '18

commit 078d1f89036764b9486cd4de841ad2bfcd748ac0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Nov 14 17:38:08 2018 +0000 Bug 28051 - Launch Orbot if it isn't running in the background --- .../base/java/org/mozilla/gecko/BrowserApp.java | 64 ++++++---------------- .../java/org/mozilla/gecko/GeckoApplication.java | 10 ++++ .../main/java/org/mozilla/gecko/GeckoAppShell.java | 11 ---- 3 files changed, 26 insertions(+), 59 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 5efd83398775..814b46f24295 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -181,7 +181,8 @@ import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.GeckoSession; -import info.guardianproject.netcipher.proxy.OrbotHelper; +import org.torproject.android.OrbotMainActivity; +import org.torproject.android.service.TorServiceConstants; import java.io.File; import java.io.FileNotFoundException; @@ -239,6 +240,7 @@ public class BrowserApp extends GeckoApp public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003; + public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001; public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE"; @@ -267,6 +269,8 @@ public class BrowserApp extends GeckoApp private HomeScreen mHomeScreen; private TabsPanel mTabsPanel; + private boolean mOrbotNeedsStart = true; + private boolean showSplashScreen = false; private SplashScreen splashScreen; /** @@ -1278,45 +1282,11 @@ public class BrowserApp extends GeckoApp } } - private BroadcastReceiver torStatusReceiver = new BroadcastReceiver() { - - @Override - public void onReceive(Context context, Intent intent) { - if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) { - GeckoAppShell.setTorStatus(intent); - } - } - }; - public void checkStartOrbot() { - if (!OrbotHelper.isOrbotInstalled(this)) { - final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this); - - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.install_orbot); - builder.setMessage(R.string.you_must_have_orbot); - builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - startActivity(installOrbotIntent); - } - }); - builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - } - }); - builder.show(); - } else { - /* run in thread so Tor status updates will be received while the - * Gecko event sync is blocking the main thread */ - HandlerThread handlerThread = new HandlerThread("torStatusReceiver"); - handlerThread.start(); - Looper looper = handlerThread.getLooper(); - Handler handler = new Handler(looper); - registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS), - null, handler); - OrbotHelper.requestStartTor(this); + if (mOrbotNeedsStart) { + final String orbotStartAction = "android.intent.action.MAIN"; + final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); + startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null); } } @@ -1358,15 +1328,6 @@ public class BrowserApp extends GeckoApp for (BrowserAppDelegate delegate : delegates) { delegate.onPause(this); } - - if (torStatusReceiver != null) - { - try { - unregisterReceiver(torStatusReceiver); - } catch (IllegalArgumentException e) { - Log.w(LOGTAG, "Tor status receiver couldn't be unregistered", e); - } - } } @Override @@ -1801,6 +1762,8 @@ public class BrowserApp extends GeckoApp NotificationHelper.destroy(); GeckoNetworkManager.destroy(); + mOrbotNeedsStart = true; + super.onDestroy(); } @@ -3018,6 +2981,11 @@ public class BrowserApp extends GeckoApp TabQueueHelper.processTabQueuePromptResponse(resultCode, this); break; + case ACTIVITY_RESULT_ORBOT_LAUNCH: + Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH"); + mOrbotNeedsStart = false; + break; + default: for (final BrowserAppDelegate delegate : delegates) { delegate.onActivityResult(this, requestCode, resultCode, data); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index e896134e0af9..b8e4985332a9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -62,6 +62,9 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.UUID; +import org.torproject.android.service.util.Prefs; +import org.torproject.android.settings.Languages; + public class GeckoApplication extends Application implements HapticFeedbackDelegate { private static final String LOG_TAG = "GeckoApplication"; @@ -319,6 +322,13 @@ public class GeckoApplication extends Application "Profile:Create", null); + // Give Orbot the base Context + Prefs.setContext(context); + + // Initialize Orbot's Language settings + Languages.setup(BrowserApp.class, R.string.menu_settings); + Languages.setLanguage(this, Prefs.getDefaultLocale(), true); + super.onCreate(); } diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java index f67603f853e2..34ba3315f295 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java @@ -1895,15 +1895,4 @@ public class GeckoAppShell public static String getDefaultLocale() { return Locale.getDefault().toString(); } - - public static void setTorStatus(Intent intent) { - sTorStatus = intent.getStringExtra(OrbotHelper.EXTRA_STATUS); - if (OrbotHelper.STATUS_ON.equals(sTorStatus)) { - sendPendingUrlIntents(); - } - } - - public static String getTorStatus() { - return sTorStatus; - } }

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Integrate Orbot and add dependencies
by gk＠torproject.org 29 Nov '18

29 Nov '18

commit 0bb30b64417fa0789edc6b8d9d8ff6c684a42a78 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Nov 14 17:36:53 2018 +0000 Bug 28051 - Integrate Orbot and add dependencies --- build.gradle | 4 ++++ mobile/android/app/build.gradle | 11 +++++++++++ mobile/android/base/AndroidManifest.xml.in | 1 + mobile/android/config/proguard/proguard.cfg | 13 +++++++++++++ 4 files changed, 29 insertions(+) diff --git a/build.gradle b/build.gradle index a080e15b2fac..6cf2d4cc0e7a 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,10 @@ allprojects { url repository } } + // These are needed for Orbot's dependencies + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url 'https://jitpack.io' } + jcenter() } } diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 7c515bbe65a7..d0060901b6b3 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -225,6 +225,9 @@ dependencies { implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" + implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar') + implementation files('orbotservice-release.aar') + implementation files('jsocksAndroid-release.aar') if (mozconfig.substs.MOZ_NATIVE_DEVICES) { implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" @@ -262,6 +265,14 @@ dependencies { // Including the Robotium JAR directly can cause issues with dexing. androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4' + + // Orbot + implementation 'com.github.delight-im:Android-Languages:v1.0.1' + implementation 'pl.bclogic:pulsator4droid:1.0.3' + + // Orbotservice + implementation 'org.torproject:tor-android-binary:0.3.4.9' + implementation 'com.jrummyapps:android-shell:1.0.1' } // TODO: (bug 1261486): This impl is not robust - diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index c4ea9a37683e..0e5f4edaf814 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -24,6 +24,7 @@ #include FennecManifest_permissions.xml.in <application android:label="@string/moz_app_displayname" + tools:replace="android:label" android:icon="@drawable/icon" android:logo="@drawable/logo" android:name="@MOZ_ANDROID_APPLICATION_CLASS@" diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 0be8a745e44b..5d94788a18af 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -165,6 +165,19 @@ # See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic… -dontnote android.support.** +# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META… +# JSR 305 annotations are for embedding nullability information. +-dontwarn javax.annotation.** + +# A resource is loaded with a relative path so the package of this class must be preserved. +-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase + +# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. +-dontwarn org.codehaus.mojo.animal_sniffer.* + +# OkHttp platform used only on JVM and when Conscrypt dependency is available. +-dontwarn okhttp3.internal.platform.ConscryptPlatform + -include "adjust-keeps.cfg" -include "leakcanary-keeps.cfg"

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Use Orbot's notification-builder wrapper class
by gk＠torproject.org 29 Nov '18

29 Nov '18

commit e6c7c8b6022a3d9e5c1dab2966ab45b467d84630 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 23 20:39:24 2018 +0000 Bug 28051 - Use Orbot's notification-builder wrapper class This allows for notifications on all supported versions of Android. --- .../gecko/notifications/NotificationClient.java | 39 ++++++++++++++++++++-- .../gecko/notifications/NotificationHelper.java | 5 +-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java index d8392a801e13..b2312b8780d2 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java @@ -7,12 +7,15 @@ package org.mozilla.gecko.notifications; import android.app.Activity; import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationManagerCompat; import android.util.Log; @@ -28,6 +31,8 @@ import org.mozilla.gecko.NotificationListener; import org.mozilla.gecko.R; import org.mozilla.gecko.util.BitmapUtils; +import org.torproject.android.service.util.NotificationBuilderCompat; + /** * Client for posting notifications. */ @@ -37,8 +42,11 @@ public final class NotificationClient implements NotificationListener { /* package */ static final String CLOSE_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".NOTIFICATION_CLOSE"; /* package */ static final String PERSISTENT_INTENT_EXTRA = "persistentIntent"; + private static final String NOTIFICATION_CHANNEL_ID = NotificationBuilderCompat.DEFAULT_CHANNEL_ID; + private final Context mContext; private final NotificationManagerCompat mNotificationManager; + private NotificationManager mNativeNotificationManager; private final HashMap<String, Notification> mNotifications = new HashMap<>(); @@ -57,6 +65,8 @@ public final class NotificationClient implements NotificationListener { public NotificationClient(Context context) { mContext = context.getApplicationContext(); mNotificationManager = NotificationManagerCompat.from(mContext); + + createNotificationChannel(); } @Override // NotificationListener @@ -72,6 +82,31 @@ public final class NotificationClient implements NotificationListener { showNotification(name, cookie, title, text, host, imageUrl, data != null ? data : ""); } + /* Only create the notification channel if we're running on Android O or later. + * The notification channel is required for notifications on new Android versions. + */ + private void createNotificationChannel() { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { + return; + } + + NotificationManager mNativeNotificationManager = + (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE); + + CharSequence name = mContext.getString(R.string.app_name); + String description = mContext.getString(R.string.app_description); + int importance = NotificationManager.IMPORTANCE_LOW; + + NotificationChannel mChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance); + mChannel.setDescription(description); + mChannel.enableLights(false); + mChannel.enableVibration(false); + mChannel.setShowBadge(false); + mChannel.setLockscreenVisibility(Notification.VISIBILITY_SECRET); + + mNativeNotificationManager.createNotificationChannel(mChannel); + } + private void showNotification(String name, String cookie, String title, String text, String host, String imageUrl, String persistentData) { @@ -142,7 +177,7 @@ public final class NotificationClient implements NotificationListener { private void add(final String name, final String imageUrl, final String host, final String alertTitle, final String alertText, final PendingIntent contentIntent, final PendingIntent deleteIntent) { - final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext) + final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext) .setContentTitle(alertTitle) .setContentText(alertText) .setSmallIcon(R.drawable.ic_status_logo) @@ -150,7 +185,7 @@ public final class NotificationClient implements NotificationListener { .setDeleteIntent(deleteIntent) .setAutoCancel(true) .setDefaults(Notification.DEFAULT_SOUND) - .setStyle(new NotificationCompat.BigTextStyle() + .setStyle(new Notification.BigTextStyle() .bigText(alertText) .setSummaryText(host)); diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java index 34ea99882d9a..35366609da49 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java @@ -32,10 +32,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.Bitmap; import android.net.Uri; -import android.support.v4.app.NotificationCompat; import android.support.v4.util.SimpleArrayMap; import android.util.Log; +import org.torproject.android.service.util.NotificationBuilderCompat; + public final class NotificationHelper implements BundleEventListener { public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction"; @@ -233,7 +234,7 @@ public final class NotificationHelper implements BundleEventListener { private void showNotification(final GeckoBundle message) { ThreadUtils.assertOnUiThread(); - final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext); + final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext); // These attributes are required final String id = message.getString(ID_ATTR);

1 0

[tor-launcher/master] Translations updatte
by gk＠torproject.org 28 Nov '18

28 Nov '18

commit 3a3dc1797bf5c9975ed2a35acf3c6c82c8ee39d5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 28 21:43:57 2018 +0000 Translations updatte --- src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/da/torlauncher.properties | 8 +-- src/chrome/locale/el/network-settings.dtd | 16 +++--- src/chrome/locale/es/torlauncher.properties | 2 +- src/chrome/locale/fa/torlauncher.properties | 22 ++++----- src/chrome/locale/gu/torlauncher.properties | 2 +- src/chrome/locale/hr-HR/network-settings.dtd | 36 +++++++------- src/chrome/locale/hr/network-settings.dtd | 74 ++++++++++++++-------------- src/chrome/locale/hr/torlauncher.properties | 14 +++--- src/chrome/locale/ja/network-settings.dtd | 4 +- src/chrome/locale/ka/network-settings.dtd | 2 +- src/chrome/locale/ka/torlauncher.properties | 4 +- src/chrome/locale/mk/network-settings.dtd | 38 +++++++------- src/chrome/locale/mk/torlauncher.properties | 58 +++++++++++----------- src/chrome/locale/nl/network-settings.dtd | 2 +- src/chrome/locale/nl/torlauncher.properties | 2 +- src/chrome/locale/pl/network-settings.dtd | 34 ++++++------- src/chrome/locale/pl/torlauncher.properties | 28 +++++------ src/chrome/locale/sv/network-settings.dtd | 4 +- src/chrome/locale/sv/torlauncher.properties | 4 +- src/chrome/locale/ur/network-settings.dtd | 2 +- src/chrome/locale/ur/torlauncher.properties | 6 +-- 22 files changed, 182 insertions(+), 182 deletions(-) diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 53fc3a1..1e76823 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Zkopírovat protokol Toru do schránky"> <!ENTITY torsettings.proxyHelpTitle "Nápověda k proxy"> -<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být potřeba lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě."> +<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být vyžadována lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě."> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních uzlech"> <!ENTITY torsettings.bridgeHelp1 "Mosty jsou neveřejné uzly, které znesnadňují blokování sítě Tor.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index a036c91..c959ed1 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -6,10 +6,10 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor. torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor Browser vil ikke være i stand til at forbinde til noget som helst websted før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor. -torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. +torlauncher.tor_controlconn_failed=Kunne ikke oprette forbindelse til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. -torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor-netværket +torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere en forbindelse til Tor-netværket. torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S @@ -18,8 +18,8 @@ torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes. torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes. torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode. -torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S -torlauncher.failed_to_save_settings=Kunne ikke gemme Tor indstillingerne.⏎\n⏎\n%S +torlauncher.failed_to_get_settings=Kan ikke hente Tor-indstillingerne..\n\n%S +torlauncher.failed_to_save_settings=Kan ikke gemme Tor-indstillingerne.\n\n%S torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører. torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at konfigurere Tor til at bruge en proxy som forbindelse til internettet. diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index eacb515..a5b525b 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -9,7 +9,7 @@  -<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor"> +<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor."> <!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connect "Σύνδεση"> @@ -39,14 +39,14 @@ <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> <!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου"> -<!ENTITY torsettings.useBridges.default "Επιλέξτε μία ενταγμένη γέφυρα"> -<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μία γέφυρα"> -<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε μίας γέφυρας από το torproject.org"> +<!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge"> +<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε ενός bridge από το torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Πληκτρολογήστε τους χαρακτήρες της εικόνας"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Πάρτε μία νέα πρόκληση."> <!ENTITY torsettings.useBridges.captchaSubmit "Υποβολή"> -<!ENTITY torsettings.useBridges.custom "Δώστε μου μία γέφυρα που να την γνωρίζω"> -<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες γέφυρας από έγκυρη πηγή"> +<!ENTITY torsettings.useBridges.custom "Δώστε μου ένα bridge που να το γνωρίζω"> +<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες bridge από έγκυρη πηγή."> <!ENTITY torsettings.useBridges.placeholder "πληκτρολογήστε διεύθυνση:πύλη (μία σε κάθε σειρά)"> <!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. "> <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> -<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor."> -<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ άλλες όχι.  Αν δεν είστε σίγουρος για το ποιες γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Τα bridges είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor."> +<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποια bridges λειτουργούν σε κάποιες χώρες, ενώ σε άλλες όχι.  Αν δεν είστε σίγουρος για το ποια bridges λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 365318a..31ffb6a 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -25,7 +25,7 @@ torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejec torlauncher.error_proxy_addr_missing=Tiene que especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet. torlauncher.error_proxy_type_missing=Debe seleccionar el tipo de 'proxy'. torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges'). -torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados. +torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados. torlauncher.error_bridgedb_bridges_missing=Por favor solicita un puente. torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias. diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index 533c491..169d5e2 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پ torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید. torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید. torlauncher.error_default_bridges_type_missing=نوع انتقال باید برای پل‌ها مشخص گردد. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=لطفا یک پل درخواست کنید. torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجود نیست. لطفا تنظیمات را اصلاح کنید. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(در چین کار می‌کند) +torlauncher.bridge_suffix.meek-azure=(در چین کار می‌کند) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=درخواست یک پل... +torlauncher.request_a_new_bridge=درخواست یک پل جدید... torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.captcha_prompt=برای درخواست یک پل کپچا را حل کنید. +torlauncher.bad_captcha_solution=راه حل درست نیست. لطفا دوباره تلاش کنید. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=متاسفم. در حال حاضر هیچ کدام از پل‌ها در دسترس نیستند. torlauncher.connect=اتصال torlauncher.restart_tor=تور را ریستارت کنید. @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن torlauncher.bootstrapWarning.pt_missing=انتقال جایگزین مفقود است. -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با کارساز از دست رفت. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به کارساز امکان پذیر نمی‌باشد. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=اتصال به پروکسی امکان پذیر نمی‌باشد. diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties index 0f0bdee..f6bc2fe 100644 --- a/src/chrome/locale/gu/torlauncher.properties +++ b/src/chrome/locale/gu/torlauncher.properties @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=બહાર નીકળો torlauncher.done=થઈ ગયું torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 2c0ffd8..e4dc474 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Postavke Tor mreže"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "Poveži se na Tor"> <!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">  <!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Kliknite "Spoji" kako biste se spojili na Tor."> +<!ENTITY torSettings.configurePrompt "Kliknite "Podesi" kako biste promijenili postavke mreže ako ste u državi koja cenzurira Tor (kao Egipat, Kina, Turska) ili ako se spajate preko privatne mreže za koju je potreban proxy."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connect "Spoji"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Opcionalno"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na Internet"> <!ENTITY torsettings.useProxy.type "Tip proxya:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxya"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Predaj"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj državi"> +<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most"> +<!ENTITY torsettings.useBridges.default.placeholder "odaberite most"> +<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobij novi izazov"> +<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji"> +<!ENTITY torsettings.useBridges.custom "Pruži mi most koji poznajem"> +<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu iz povjerenog izvora"> +<!ENTITY torsettings.useBridges.placeholder "vrsta adresa:port (jedan po liniji)"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxyem"> +<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema."> <!ENTITY torsettings.bridgeHelpTitle "Pomoć za releje mostove"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 1c89cc2..6783163 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -1,60 +1,60 @@ -<!ENTITY torsettings.dialog.title "Postavke Tor Mreže"> +<!ENTITY torsettings.dialog.title "Postavke Tor mreže"> <!ENTITY torsettings.wizard.title.default "Spoji se na Tor"> -<!ENTITY torsettings.wizard.title.configure "Postavke Tor Mreže"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže"> +<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Jezik Tor preglednika"> +<!ENTITY torlauncher.localePicker.prompt "Odaberite jezik">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfiguriraj"> +<!ENTITY torSettings.connectPrompt "Za povezivanje s Tor-om kliknite "Poveži se""> +<!ENTITY torSettings.configurePrompt "Ako ste u zemlji koja cenzurira Tor (kao Egipat, Kina, Turska) ili ste spojeni preko privatne mreže za koju je potrebno proxy, kliknite "Podesi" kako biste promijenili postavke mreže."> +<!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connect "Poveži se">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "Čekanje na pokretanje Tor-a…"> +<!ENTITY torsettings.restartTor "Ponovno pokreni Tor"> +<!ENTITY torsettings.reconfigTor "Ponovno podesi"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Obriši postavke i poveži se"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Neobavezno"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet"> +<!ENTITY torsettings.useProxy.type "Tip proxy-a:"> +<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Priključak:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj"> +<!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Korisničko ime:"> <!ENTITY torsettings.useProxy.password "Lozinka:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Unesi"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova."> +<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi:"> +<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji"> +<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most"> +<!ENTITY torsettings.useBridges.default.placeholder "odaberite most"> +<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobijte novi izazov"> +<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji"> +<!ENTITY torsettings.useBridges.custom "Pružaj mi most koji poznajem"> +<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu sa pouzdanog izvora."> +<!ENTITY torsettings.useBridges.placeholder "tip adresa:port (jedna po retku)"> + +<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> + +<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxy-em"> +<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema."> + +<!ENTITY torsettings.bridgeHelpTitle "Pomoć s mostovima"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index c6143af..1424083 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -3,12 +3,12 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_exited_during_startup=Tor je prekinut tijekom pokretanja. Ovo može biti zbog pogreške u vašoj torrc datoteci, pogreške u Tor-u ili u drugom programu na vašem sistemu, ili zbog neispravnog hardvera. Dok ne riješite temeljni problem i ponovno pokrenete Tor, Tor preglednik se neće pokrenuti. +torlauncher.tor_exited=Tor je neočekivano prekinut. To može biti zbog greške u samom Tor-u, drugom programu na vašem sistemu ili zbog neispravnog hardvera. Dok ponovno ne pokrenete Tor, Tor preglednik neće moči pristupiti web stranicama. Ako se problem nastavi, pošaljite kopiju vašeg Tor zapisnika timu za podršku. +torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti vaše kartice preglednika. +torlauncher.tor_controlconn_failed=Povezivanje na kontrolni port Tor-a nije uspjelo. +torlauncher.tor_failed_to_start=Pokretanje Tor-a nije uspjelo. +torlauncher.tor_control_failed=Uzimanje kontrole nad Tor-om nije uspjelo torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). @@ -42,7 +42,7 @@ torlauncher.no_meek=This browser is not configured for meek, which is needed to torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=Poveži se -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Ponovno pokreni Tor torlauncher.quit=Izlaz torlauncher.quit_win=Izlaz torlauncher.done=Gotovo diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 4a51455..25d2d09 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -11,7 +11,7 @@ <!ENTITY torSettings.connectPrompt "「接続」をクリックすると Tor に接続します。"> <!ENTITY torSettings.configurePrompt "Tor による通信を検閲する国（エジプト、中国、トルコ等）にいる場合やプロキシを要求するプライベートネットワークから接続する場合、「設定」をクリックしてネットワーク設定を調整します。"> -<!ENTITY torSettings.configure "構成"> +<!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connect "接続">  @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> <!ENTITY torsettings.proxyHelpTitle "プロキシヘルプ"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "会社、学校、大学等のネットワークを通して接続する場合、ローカルプロクシが必要になる場合があります。 プロクシが必要であるかどうかわからない場合は、他のブラウザのインターネット設定を見るか、システムのネットワーク設定を確認してください。"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> <!ENTITY torsettings.bridgeHelp1 "ブリッジとはTorネットワークへの接続をブロックすることを難しくするためのリストされていないリレーです。  それぞれの種類のブリッジは検閲を避けるための異なる手法を利用しています。  obfsのものはあなたのトラフィックをランダムなノイズのように見せかけ，meekのものはあなたのトラフィックをTorではなくそのサービスへの接続であるように見せかけます。"> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 72017f1..e1b18ac 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -49,7 +49,7 @@ <!ENTITY torsettings.useBridges.label "გადამცემი ხიდის მონაცემების მითითება სანდო წყაროდან."> <!ENTITY torsettings.useBridges.placeholder "აკრიფეთ მისამართი:პორტი (თითო ცალკე ხაზზე)"> -<!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების დაკოპირება"> +<!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების ასლი"> <!ENTITY torsettings.proxyHelpTitle "პროქსი — დახმარება"> <!ENTITY torsettings.proxyHelp1 "ადგილობრივი პროქსი მაშინაა საჭირო, როცა ინტერნეტს უკავშირდებით კომპანიის, სკოლის ან უნივერსიტეტის ქსელის გავლით. თუ დარწმუნებული არ ხართ პროქსის საჭიროებაში, გადახედეთ ინტერნეტის პარამეტრებს სხვა ბრაუზერში ან იხილეთ სისტემის ქსელის პარამეტრები."> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 48a7acf..457c46f 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -50,7 +50,7 @@ torlauncher.done=შესრულებულია torlauncher.forAssistance=დახმარებისთვის დაუკავშირდით %S torlauncher.forAssistance2=დახმარებისთვის ეწვიეთ %S -torlauncher.copiedNLogMessages=დაკოპირება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად. +torlauncher.copiedNLogMessages=ასლის აღება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად. torlauncher.bootstrapStatus.conn_dir=გადამცემთა ცნობართან დაკავშირება torlauncher.bootstrapStatus.handshake_dir=დაშიფრული კავშირის დამყარება ცნობართან @@ -68,7 +68,7 @@ torlauncher.bootstrapWarning.connectrefused=კავშირი უარყ torlauncher.bootstrapWarning.misc=სხვადასხვა torlauncher.bootstrapWarning.resourcelimit=არასაკმარისი რესურსები torlauncher.bootstrapWarning.identity=მოწმობა არ ემთხვევა -torlauncher.bootstrapWarning.timeout=კავშირის ვადა +torlauncher.bootstrapWarning.timeout=კავშირის დაყოვნება torlauncher.bootstrapWarning.noroute=მისამართი არაა აღნიშნული torlauncher.bootstrapWarning.ioerror=წაკითხვა/ჩაწერის შეცდომა torlauncher.bootstrapWarning.pt_missing=მისაერთებელი გადამყვანი ვერ მოიძებნა diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 6885070..7a258c5 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor мрежни поставки"> <!ENTITY torsettings.wizard.title.default "Поврзи се на Tor"> <!ENTITY torsettings.wizard.title.configure "Tor мрежни поставки"> -<!ENTITY torsettings.wizard.title.connecting "Воспоставување на конекција"> +<!ENTITY torsettings.wizard.title.connecting "Воспоставување на поврзување">  <!ENTITY torlauncher.localePicker.title "Tor Browser јазик"> @@ -9,19 +9,19 @@  -<!ENTITY torSettings.connectPrompt "Кликнете "Конектирај" да се конектирате на Tor."> -<!ENTITY torSettings.configurePrompt "Кликни на "Постави" да ги поставите мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси."> -<!ENTITY torSettings.configure "Постави"> -<!ENTITY torSettings.connect "Конектирај"> +<!ENTITY torSettings.connectPrompt "Кликнете "Поврзи" да се поврзете на Tor."> +<!ENTITY torSettings.configurePrompt "Кликни на "Конфигурирај" да ги конфигурирате мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси."> +<!ENTITY torSettings.configure "Конфигурирај"> +<!ENTITY torSettings.connect "Поврзи">  <!ENTITY torsettings.startingTor "Почекај за стартување на Tor..."> -<!ENTITY torsettings.restartTor "Повторно стартување на Tor"> -<!ENTITY torsettings.reconfigTor "Промени поставки"> +<!ENTITY torsettings.restartTor "Рестартирај го Tor"> +<!ENTITY torsettings.reconfigTor "Пре-конфигурирај"> -<!ENTITY torsettings.discardSettings.prompt "Имате поставено Tor мостови или имате внесено локални прокси поставки.  Директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани."> -<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и конектирај се"> +<!ENTITY torsettings.discardSettings.prompt "Имате конфигурирано Tor мостови или имате внесено локални прокси поставки.  За директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани."> +<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и поврзи се"> <!ENTITY torsettings.optional "Опционално"> @@ -36,15 +36,15 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува конекции до одредени порти"> +<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува поврзувања до одредени порти"> <!ENTITY torsettings.firewall.allowedPorts "Дозволени порти:"> <!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран во мојата држава"> <!ENTITY torsettings.useBridges.default "Одбери вграден мост"> <!ENTITY torsettings.useBridges.default.placeholder "одбери мост"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Барање за мост од torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Внесете ги карактерите од сликата"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Пробајте нов предизвик"> +<!ENTITY torsettings.useBridges.captchaSubmit "Испрати"> <!ENTITY torsettings.useBridges.custom "Обезбеди мост кој го знам"> <!ENTITY torsettings.useBridges.label "Внесете информации за мост од доверлив извор."> <!ENTITY torsettings.useBridges.placeholder "внеси адреса:порта (по една во секој ред)"> @@ -52,11 +52,11 @@ <!ENTITY torsettings.copyLog "Копирај го Tor логот за залепување"> <!ENTITY torsettings.proxyHelpTitle "Прокси помош"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Може да ви биде потребно локално прокси кога се поврзувате преку мрежа на компанија, училиште, или универзитет. Ако не сте сигурни дали е потребно прокси, погледнете во Интернет поставки во друг прелистувач или проверете ги мрежните поставки на системот."> -<!ENTITY torsettings.bridgeHelpTitle "Мост јазол помош"> -<!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани јазли кои го прават потешко блокирањето на врските кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како да е од некој стандарден прелистувач наместо од Tor."> -<!ENTITY torsettings.bridgeHelp2 "Поради колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "Помош за мост реле"> +<!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани релеа кои го прават потешко блокирањето на поврзувањата кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како да е од некој стандарден прелистувач наместо од Tor."> +<!ENTITY torsettings.bridgeHelp2 "Поради тоа колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави конекција со Тор мрежата.  Ова може да потрае неколку минути."> +<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави поврзувањето со Тор мрежата.  Ова може да потрае неколку минути."> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 8b065d3..8dfecbb 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -3,13 +3,13 @@ torlauncher.error_title=Tor стартувач -torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и повторно не го вклучите Tor, Tor Browser нема да се стартува. -torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со хардверот. Додека повторно го стартувате Tor, Tor Browser нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка. -torlauncher.tor_exited2=Повротното старување на Tor нема да ви ги затвори табовите во вашиот прелистувач. -torlauncher.tor_controlconn_failed=Не може да се конектира на Tor контролната порта. +torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и не го рестартирате Tor, Tor Browser нема да се стартува. +torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со хардверот. Додека не го рестартирате Tor, Tor Browser нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка. +torlauncher.tor_exited2=Рестартирањето на Tor нема да ви ги затвори табовите во вашиот прелистувач. +torlauncher.tor_controlconn_failed=Не може да се поврзе на Tor контролната порта. torlauncher.tor_failed_to_start=Tor не успеа да се стартува. torlauncher.tor_control_failed=Не успеа да преземе контрола врз Tor. -torlauncher.tor_bootstrap_failed=Tor не успеа да воспостави конекција со Tor мрежата. +torlauncher.tor_bootstrap_failed=Tor не успеа да воспостави поврзување со Tor мрежата. torlauncher.tor_bootstrap_failed_details=%1$S не успеаа (%2$S). torlauncher.unable_to_start_tor=Не може да се стартува Tor.\n\n%S @@ -22,27 +22,27 @@ torlauncher.failed_to_get_settings=Невозможно е да се добиј torlauncher.failed_to_save_settings=Невозможно е да се зачуваат Tor поставките.\n\n%S torlauncher.ensure_tor_is_running=Проверете дали Tor е вклучен. -torlauncher.error_proxy_addr_missing=Мора да ги посочите и IP адресите или хостовите и бројот на портата за да го поставите Tor да користи прокси за пристап на Интернет. +torlauncher.error_proxy_addr_missing=Мора да ги посочите и IP адресите или хостовите и бројот на портата за да го конфигурирате Tor да користи прокси за пристап на Интернет. torlauncher.error_proxy_type_missing=Морате да одберете тип на прокси. torlauncher.error_bridges_missing=Морате да одберете еден или повеќе мостови. torlauncher.error_default_bridges_type_missing=Мора да одберете тип на транспорт за обезбедените мостови. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Ве молиме побарајте мост. torlauncher.error_bridge_bad_default_type=Нема обезбедени мостови кои го имаат типот на транспорт %S а се достапни. Прилагодете ги вашите поставки. torlauncher.bridge_suffix.meek-amazon=(работи во Кина) torlauncher.bridge_suffix.meek-azure=(работи во Кина) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Барање за мост... +torlauncher.request_a_new_bridge=Барање за нов мост... +torlauncher.contacting_bridgedb=Контактирање со BridgeDB. Ве молиме почекајте. +torlauncher.captcha_prompt=Решете ја ЗАДАЧАТА за да побарате мост. +torlauncher.bad_captcha_solution=Решението е погрешно. Ве молиме обидете се повторно. +torlauncher.unable_to_get_bridge=Не е во можност добивањето на мост од BridgeDB.\n\n%S +torlauncher.no_meek=Овој прелистувач не е конфигуриран за meek, кој е потребен за добивање на мостови. +torlauncher.no_bridges_available=Нема достапни мостови во овој момент. Извинете. -torlauncher.connect=Конектирај -torlauncher.restart_tor=Повторно стартување на Tor +torlauncher.connect=Поврзи +torlauncher.restart_tor= Повторно стартување на Tor torlauncher.quit=Прекини torlauncher.quit_win=Излез torlauncher.done=Завршено @@ -52,27 +52,27 @@ torlauncher.forAssistance2=За помош, посетете %S torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта. -torlauncher.bootstrapStatus.conn_dir=Конектирање на јазол директориум -torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирана конекција со директориумот +torlauncher.bootstrapStatus.conn_dir=Поврзување на реле директориум +torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирано поврзување со директориумот torlauncher.bootstrapStatus.requesting_status=Добивање на мрежен статус torlauncher.bootstrapStatus.loading_status=Вчитување на мрежен статус -torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетски сертификати -torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за јазол -torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за јазол -torlauncher.bootstrapStatus.conn_or=Конектирање на Tor мрежата +torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетни сертификати +torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за реле +torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за реле +torlauncher.bootstrapStatus.conn_or=Поврзување на Tor мрежата torlauncher.bootstrapStatus.handshake_or=Воспоставување на Tor круг -torlauncher.bootstrapStatus.done=Конектирани сте на Tor мрежата! +torlauncher.bootstrapStatus.done=Поврзани сте на Tor мрежата! torlauncher.bootstrapWarning.done=завршено -torlauncher.bootstrapWarning.connectrefused=конекцијата е одбиена +torlauncher.bootstrapWarning.connectrefused=поврзувањето е одбиено torlauncher.bootstrapWarning.misc=разно torlauncher.bootstrapWarning.resourcelimit=недоволни ресурси torlauncher.bootstrapWarning.identity=идентитетско несогласување -torlauncher.bootstrapWarning.timeout=времето за конекција истече +torlauncher.bootstrapWarning.timeout=времето за поврзување истече torlauncher.bootstrapWarning.noroute=нема рута до хост torlauncher.bootstrapWarning.ioerror=грешка при читање/запишување torlauncher.bootstrapWarning.pt_missing=недостасува pluggable transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Поврзувањето со серверот беше изгубено. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не може да се поврзе со серверот. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не може да се поврзе со проксито. diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index e8aa4eb..4dabeb6 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Een lokale proxy kan nodig zijn als u verbinding maakt via het netwerk van een bedrijf, school, of universiteit. Als u niet zeker weet of een proxy nodig is, kijk dan naar de internetinstellingen in een andere browser of kijk naar de netwerkinstellingen van het systeem."> <!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp"> <!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet vermelde relays die het moeilijk maken om verbindingen naar het Tor Network te blokkeren.  Elk van deze bridges gebruikt een andere methode om censuur te vermijden.  Degene die obfs gebruiken, zien eruit gelijk willekeurige ruis, en de andere laten uw netwerk verkeer eruit zien alsof u verbind met een andere service in plaats van met Tor."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 3807906..48557bb 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -38,7 +38,7 @@ torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. torlauncher.captcha_prompt=Los de CAPTCHA op om een brug te verzoeken. torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. torlauncher.unable_to_get_bridge=Kan geen brug verkrijgen van BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. +torlauncher.no_meek=Deze browser is niet geconfigureerd voor meek, wat nodig is om bridges te verkrijgen. torlauncher.no_bridges_available=Geen bruggen zijn beschikbaar op dit moment. Sorry. torlauncher.connect=Verbind diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index a45fc68..76131f7 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Ustawienia Sieci"> <!ENTITY torsettings.wizard.title.default "Połącz z siecią Tor"> <!ENTITY torsettings.wizard.title.configure "Ustawienia Sieci"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Nawiązanie połączenia">  <!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor."> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Kliknij "Połącz", aby połączyć się z Torem."> +<!ENTITY torSettings.configurePrompt "Kliknij "Konfiguruj", aby dostosować ustawienia sieci, jeśli jesteś w kraju, który cenzuruje Tora (np. Egipt, Chiny, Turcja) lub jeśli łączysz się z prywatną siecią, która wymaga serwera proxy."> <!ENTITY torSettings.configure "Konfiguruj"> <!ENTITY torSettings.connect "Połącz"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "(opcjonalnie)"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Używam proxy do łączenia się z Internetem"> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -39,24 +39,24 @@ <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most"> +<!ENTITY torsettings.useBridges.default.placeholder "wybierz most"> +<!ENTITY torsettings.useBridges.bridgeDB "Zażądaj mostu od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Wprowadź znaki z obrazka"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Uzyskaj nowe wyzwanie"> <!ENTITY torsettings.useBridges.captchaSubmit "Podsumowując"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.custom "Dostarcz mostek, który znam"> +<!ENTITY torsettings.useBridges.label "Wprowadź informacje o mostku z zaufanego źródła."> +<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w linii)"> <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelpTitle "Pomoc Proxy"> +<!ENTITY torsettings.proxyHelp1 "Lokalny serwer proxy może być potrzebny podczas łączenia się przez sieć firmową, szkolną lub uniwersytecką. Jeśli nie masz pewności, czy serwer proxy jest potrzebny, sprawdź ustawienia internetowe w innej przeglądarce lub sprawdź ustawienia sieciowe systemu."> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Mosty są zastrzeżonymi przekaźnikami, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostu wykorzystuje inną metodę unikania cenzury.  Obiekty obfs sprawiają, że twój ruch wygląda jak losowy szum, a łagodne połączenia sprawiają, że twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem."> +<!ENTITY torsettings.bridgeHelp2 "Ze względu na to, jak niektóre kraje próbują blokować Tora, niektóre mosty działają w niektórych krajach, ale nie w innych.  Jeśli nie masz pewności, które mosty działają w Twoim kraju, odwiedź torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 356947b..32b912a 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Musisz określić adres IP lub nazwę hosta torlauncher.error_proxy_type_missing=Musisz wybrać typ proxy. torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (bridges) torlauncher.error_default_bridges_type_missing=Musisz wybrać rodzaj transportu dla dostępnych mostów. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Proszę poprosić o most. torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które mają typ transportu %S. Proszę zmienić swoje ustawienia. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(działa w Chinach) +torlauncher.bridge_suffix.meek-azure=(działa w Chinach) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Poproś o most... +torlauncher.request_a_new_bridge=Poproś o nowy most... +torlauncher.contacting_bridgedb=Kontakt z BridgeDB. Proszę czekać. +torlauncher.captcha_prompt=Rozwiąż CAPTCHA, aby poprosić o most. +torlauncher.bad_captcha_solution=Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie. +torlauncher.unable_to_get_bridge=Nie można uzyskać mostu z BridgeDB.\n\n%S +torlauncher.no_meek=Ta przeglądarka nie jest skonfigurowana dla połączeń, które są potrzebne do uzyskania mostów. +torlauncher.no_bridges_available=W tej chwili nie są dostępne żadne mosty. Przepraszam. torlauncher.connect=Połącz torlauncher.restart_tor=Zrestartuj Tora @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=brak trasy do hosta torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu torlauncher.bootstrapWarning.pt_missing=brak podłączanego transportu -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Połączenie z serwerem zostało utracone. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nie można połączyć się z serwerem. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nie można połączyć się z serwerem proxy. diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 8e67127..47473df 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Etablerar en anslutning">  -<!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare"> +<!ENTITY torlauncher.localePicker.title "Språk i Tor Browser"> <!ENTITY torlauncher.localePicker.prompt "Välj ett språk.">  @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> <!ENTITY torsettings.proxyHelpTitle "Proxy hjälp"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företag, skola eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar."> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om relä bryggor"> <!ENTITY torsettings.bridgeHelp1 "Bryggor är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av brygga använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 92800d7..406dfb9 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, en bugg i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har fixat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta. -torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. +torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta. +torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Det gick inte att starta Tor. diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index debbd66..eeb35c3 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "اختیاری"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index a4d097a..caf020b 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -43,9 +43,9 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.quit=چھوڑدیجیے (Quit) torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=مکمل ہوگیا torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S @@ -59,7 +59,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=ٹار نیٹ ورکس سے رابطہ بنائیں torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network!

1 0

[tor-browser-build/master] Update rbm to pick up fix for #28466
by gk＠torproject.org 28 Nov '18

28 Nov '18

commit 3378261a8cce3a8e1d908c8b73ee448ec572bec4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 28 13:38:28 2018 +0000 Update rbm to pick up fix for #28466 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 8adbc46..eb500fa 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 8adbc46dc9e8358abad75ac81faf4646d8165b9e +Subproject commit eb500fa9467fb4d7229c9ca87f202ef18603d023

1 0

[rbm/master] Bug 28466: fix issue with git submodule URL changes
by gk＠torproject.org 28 Nov '18

28 Nov '18

commit eb500fa9467fb4d7229c9ca87f202ef18603d023 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 26 11:49:25 2018 +0100 Bug 28466: fix issue with git submodule URL changes We replace a call to: git submodule update --init with calls to: git submodule init git submodule sync git submodule update The call to `git submodule sync` is solving the issue that could occur when a submodule URL is changing. --- lib/RBM.pm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 8875a7c..3ef20ae 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -474,10 +474,12 @@ sub execute { = capture_exec('git', 'checkout', $git_hash); exit_error "Cannot checkout $git_hash:\n$stderr" unless $success; if (project_config($project, 'git_submodule', $options)) { - ($stdout, $stderr, $success, $exit_code) - = capture_exec('git', 'submodule', 'update', '--init'); - exit_error "Error running git submodule update:\n$stderr" - unless $success; + foreach my $action (qw(init sync update)) { + ($stdout, $stderr, $success, $exit_code) + = capture_exec('git', 'submodule', $action); + exit_error "Error running git submodule $action\n$stderr" + unless $success; + } } } elsif (project_config($project, 'hg_url', $options)) { my $hg_hash = project_config($project, 'hg_hash', $options) @@ -550,10 +552,12 @@ sub maketar { my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $commit_hash); exit_error "Cannot checkout $commit_hash: $stderr" unless $success; - ($stdout, $stderr, $success, $exit_code) - = capture_exec('git', 'submodule', 'update', '--init'); - exit_error "Error running git submodule update:\n$stderr" - unless $success; + foreach my $action (qw(init sync update)) { + ($stdout, $stderr, $success, $exit_code) + = capture_exec('git', 'submodule', $action); + exit_error "Error running git submodule $action\n$stderr" + unless $success; + } ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'submodule', 'foreach', "git archive --prefix=$project-$version/\$path/"

1 0

[torbutton/master] Translations update
by gk＠torproject.org 27 Nov '18

27 Nov '18

commit dc85b56f80732893cf68e8e636948d3fc187990d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 27 21:23:02 2018 +0000 Translations update --- src/chrome/locale/ar/aboutTor.dtd | 5 +++++ src/chrome/locale/bn-BD/aboutTor.dtd | 5 +++++ src/chrome/locale/ca/aboutTor.dtd | 13 +++++++++---- src/chrome/locale/cs/aboutTor.dtd | 5 +++++ src/chrome/locale/da/aboutTor.dtd | 5 +++++ src/chrome/locale/de/aboutTor.dtd | 5 +++++ src/chrome/locale/el/aboutTor.dtd | 5 +++++ src/chrome/locale/es/aboutTor.dtd | 5 +++++ src/chrome/locale/eu/aboutTor.dtd | 5 +++++ src/chrome/locale/fa/aboutTor.dtd | 5 +++++ src/chrome/locale/fa/browserOnboarding.properties | 2 +- src/chrome/locale/fr/aboutTor.dtd | 7 ++++++- src/chrome/locale/fr/browserOnboarding.properties | 2 +- src/chrome/locale/ga/aboutTor.dtd | 5 +++++ src/chrome/locale/he/aboutTor.dtd | 5 +++++ src/chrome/locale/hu/aboutTor.dtd | 5 +++++ src/chrome/locale/id/aboutTor.dtd | 5 +++++ src/chrome/locale/is/aboutTor.dtd | 5 +++++ src/chrome/locale/it/aboutTor.dtd | 5 +++++ src/chrome/locale/ja/aboutTor.dtd | 5 +++++ src/chrome/locale/ja/browserOnboarding.properties | 20 ++++++++++---------- src/chrome/locale/ka/aboutTor.dtd | 5 +++++ src/chrome/locale/ka/torbutton.properties | 4 ++-- src/chrome/locale/ko/aboutTor.dtd | 5 +++++ src/chrome/locale/nb/aboutTor.dtd | 5 +++++ src/chrome/locale/nl/aboutTor.dtd | 5 +++++ src/chrome/locale/pl/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/pl/aboutTor.dtd | 13 +++++++++---- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pl/torbutton.dtd | 18 +++++++++--------- src/chrome/locale/pl/torbutton.properties | 6 +++--- src/chrome/locale/pt-BR/aboutTor.dtd | 5 +++++ src/chrome/locale/ru/aboutTor.dtd | 5 +++++ src/chrome/locale/sv/aboutTor.dtd | 5 +++++ src/chrome/locale/sv/torbutton.properties | 2 +- src/chrome/locale/tr/aboutTor.dtd | 5 +++++ src/chrome/locale/vi/aboutTor.dtd | 5 +++++ src/chrome/locale/zh-CN/aboutTor.dtd | 5 +++++ src/chrome/locale/zh-TW/aboutTor.dtd | 5 +++++ 39 files changed, 189 insertions(+), 39 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 183d47f8..7fda4740 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "احم خصوصية الملايين."> <!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> <!ENTITY aboutTor.donationBanner.line2f "نحتاج دعمك."> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> <!ENTITY aboutTor.donationBanner.buttonB "سأشارك"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index a7458617..fdac71be 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "লাখো লোকের ব্যক্তিগত গোপনীয়তা রক্ষা করুন। "> <!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> <!ENTITY aboutTor.donationBanner.line2f "আপনাদের সাহায্য দরকার! "> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। "> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> <!ENTITY aboutTor.donationBanner.buttonB "আমাকেও সাথে নিন"> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index 91132da8..878ce7ad 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -30,13 +30,18 @@ <!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2b "Avançats drets humans universals."> <!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2d "Protegeix la privacitat de milions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2f "Necessitem el teu suport!"> +<!ENTITY aboutTor.donationBanner.line2g "Recolça la llibertat a internet."> +<!ENTITY aboutTor.donationBanner.line2h "Defensa la web oberta."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "Compta amb mi"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 7c5ba384..31ccf6bd 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Chráníme soukromí milionů lidí."> <!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit."> <!ENTITY aboutTor.donationBanner.line2f "Potřebujeme vaši podporu!"> +<!ENTITY aboutTor.donationBanner.line2g "Podpořte svobodu internetu."> +<!ENTITY aboutTor.donationBanner.line2h "Braňte otevřený web."> +<!ENTITY aboutTor.donationBanner.line2i "Podpořte online soukromí a svobodu."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla dorovná každý příspěvek až do začátku roku 2019."> <!ENTITY aboutTor.donationBanner.line3 "Přispějte hned a Mozilla vás dar zdvojnásobí."> +<!ENTITY aboutTor.donationBanner.line3b "Pošlete příspěvek a ten se zdvojnásobí."> <!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> <!ENTITY aboutTor.donationBanner.buttonB "Jdu do toho"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 7a2df3b0..ba40ff02 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner."> <!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> <!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din støtte!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> <!ENTITY aboutTor.donationBanner.buttonB "Jeg er med"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 6c43e2c6..0ffc979f 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Schütze die Privatsphäre von Millionen Menschen."> <!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> <!ENTITY aboutTor.donationBanner.line2f "Wir brauchen deine Unterstützung."> +<!ENTITY aboutTor.donationBanner.line2g "Unterstütze Internetfreiheit."> +<!ENTITY aboutTor.donationBanner.line2h "Verteidige das offene Netz."> +<!ENTITY aboutTor.donationBanner.line2i "Unterstütze Datenschutz und Freiheit im Internet."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla unterstützt jede Spende bis 2019."> <!ENTITY aboutTor.donationBanner.line3 "Gib noch heute, und Mozilla wird deiner Spende entsprechen."> +<!ENTITY aboutTor.donationBanner.line3b "Spende jetzt, und dein Geschenk wird doppelt so stark."> <!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> <!ENTITY aboutTor.donationBanner.buttonB "Zähl mich mit"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 96301e2a..d93a5a5a 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Προστατέψτε την ιδιωτικότητα εκατομμυρίων."> <!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό."> <!ENTITY aboutTor.donationBanner.line2f "Χρειαζόμαστε την υποστήριξη σας!"> +<!ENTITY aboutTor.donationBanner.line2g "Στηρίξτε την ελευθερία στο διαδίκτυο."> +<!ENTITY aboutTor.donationBanner.line2h "Υπερασπιστείτε τον ανοιχτό ιστό."> +<!ENTITY aboutTor.donationBanner.line2i "Στηρίξτε την ιδιωτικότητα και την ελευθερία στο διαδίκτυο."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Δωρίστε σήμερα και το Mozilla θα δωρίσει το ίδιο ποσό!"> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> <!ENTITY aboutTor.donationBanner.buttonB "Υπολογίστε με"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index b20f45d5..2bb31865 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de personas."> <!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> <!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo."> +<!ENTITY aboutTor.donationBanner.line2g "Apoya la libertad en internet"> +<!ENTITY aboutTor.donationBanner.line2h "Defiende la web abierta"> +<!ENTITY aboutTor.donationBanner.line2i "Apoya la privacidad y la libertad en línea."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla donará una cantidad idéntica a cada donación hasta 2019."> <!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación."> +<!ENTITY aboutTor.donationBanner.line3b "Dona ahora, y tu donación se duplicará."> <!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> <!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo."> diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 24acba36..9f1224bb 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index da917341..2f572883 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "از حریم خصوصی میلیون‌ها محافظت کنید"> <!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> <!ENTITY aboutTor.donationBanner.line2f "ما به حمایت شما نیاز داریم!"> +<!ENTITY aboutTor.donationBanner.line2g "از آزادی اینترنت پشتیبانی کنید."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "از حریم شخصی و آزادی برخط دفاع کنید."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> <!ENTITY aboutTor.donationBanner.buttonB "روی من حساب کن"> diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties index 2dcbded9..3845e2ee 100644 --- a/src/chrome/locale/fa/browserOnboarding.properties +++ b/src/chrome/locale/fa/browserOnboarding.properties @@ -12,7 +12,7 @@ onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=به شبکه تور برو -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=شبکه تور onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 959842c6..69dcd0f8 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.ready.label "Explorez, en toute confidentialité."> <!ENTITY aboutTor.ready2.label "Vous êtes prêts pour l’expérience de navigation la plus confidentielle au monde."> -<!ENTITY aboutTor.failure.label "Une erreur s’est produite !"> +<!ENTITY aboutTor.failure.label "Un problème est survenu !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> <!ENTITY aboutTor.search.label "Chercher avec DuckDuckGo"> @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes."> <!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor."> <!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !"> +<!ENTITY aboutTor.donationBanner.line2g "Soutenez la liberté sur Internet."> +<!ENTITY aboutTor.donationBanner.line2h "Défendez le web ouvert."> +<!ENTITY aboutTor.donationBanner.line2i "Prise en charge de la vie privée et de la liberté en ligne."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla s'engage à verser un montant équivalent à chaque don jusqu'en 2019."> <!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> +<!ENTITY aboutTor.donationBanner.line3b "Donnez maintenant, et votre don devient deux fois plus fort."> <!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> <!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi"> diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties index 8fe3650a..28065b44 100644 --- a/src/chrome/locale/fr/browserOnboarding.properties +++ b/src/chrome/locale/fr/browserOnboarding.properties @@ -27,7 +27,7 @@ onboarding.tour-tor-security.title=Choisissez votre expérience. onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent. onboarding.tour-tor-security.button=Passer les paramètres en revue -onboarding.tour-tor-expect-differences=Informations concernant l’expérience +onboarding.tour-tor-expect-differences=Conseils sur l’expérience onboarding.tour-tor-expect-differences.title=Attendez-vous à des différences. onboarding.tour-tor-expect-differences.description=Avec toutes les fonctions de sécurité et de confidentialité offertes par Tor, votre expérience de navigation sur Internet pourrait être un peu différente. Les choses pourraient être un peu plus lentes et selon votre niveau de sécurité, certains éléments pourraient ne pas fonctionner ou ne pas se charger. On pourrait aussi vous demander de prouver que vous êtes un humain et non un robot. onboarding.tour-tor-expect-differences.button=Consulter les FAQ diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd index a2c65352..1978847e 100644 --- a/src/chrome/locale/ga/aboutTor.dtd +++ b/src/chrome/locale/ga/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Cosain príobháideachas na milliún duine."> <!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> <!ENTITY aboutTor.donationBanner.line2f "Tá do chúnamh de dhíth orainn!"> +<!ENTITY aboutTor.donationBanner.line2g "Tacaigh le saoirse ar an idirlíon."> +<!ENTITY aboutTor.donationBanner.line2h "Seas an fód ar son an Ghréasáin oscailte"> +<!ENTITY aboutTor.donationBanner.line2i "Tacaigh le príobháideachas agus le saoirse ar líne."> +<!ENTITY aboutTor.donationBanner.line2j "Tá Mozilla ag meaitseáil gach euro a bhronntar orainn go dtí 2019."> <!ENTITY aboutTor.donationBanner.line3 "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn."> +<!ENTITY aboutTor.donationBanner.line3b "Beidh do bhronntanas airgid dhá uair níos láidre."> <!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> <!ENTITY aboutTor.donationBanner.buttonB "Cuir mise san áireamh"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index e4659b67..81a4386f 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "הגן על פרטיותם של מיליונים."> <!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> <!ENTITY aboutTor.donationBanner.line2f "אנחנו צריכים את תמיכתך!"> +<!ENTITY aboutTor.donationBanner.line2g "תמוך בחירות אינטרנט."> +<!ENTITY aboutTor.donationBanner.line2h "הגן על הרשת הפתוחה."> +<!ENTITY aboutTor.donationBanner.line2i "תמוך בפרטיות ובחירות באופן מקוון."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla משווה כל תרומה עד 2019."> <!ENTITY aboutTor.donationBanner.line3 "תן היום, ו־Mozilla תשווה את תרומתך."> +<!ENTITY aboutTor.donationBanner.line3b "תן עכשיו, והמתנה שלך הופכת לחזקה פי שניים."> <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> <!ENTITY aboutTor.donationBanner.buttonB "החשב אותי"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 6ac1ae1d..cbc0c571 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Védi milliók magánéletét."> <!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erősnek."> <!ENTITY aboutTor.donationBanner.line2f "Szükségünk van a támogatására!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Adjon ma és a Mozilla is annyival támogat."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> <!ENTITY aboutTor.donationBanner.buttonB "Számítsatok bele"> diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 7d56a131..9370e3ad 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index cc2317c5..0fd4f643 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Verndum friðhelgi milljóna manna."> <!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> <!ENTITY aboutTor.donationBanner.line2f "Við þörfnumst stuðnings þíns!"> +<!ENTITY aboutTor.donationBanner.line2g "Stattu með frelsi á netinu."> +<!ENTITY aboutTor.donationBanner.line2h "Verðu hinn opna vef."> +<!ENTITY aboutTor.donationBanner.line2i "Verðu rétt þinn til einkalífs og frelsis á netinu."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla jafnar upp hvert fjárframlag allt til 2019."> <!ENTITY aboutTor.donationBanner.line3 "Gefðu í dag - og Mozilla mun jafna framlag þitt."> +<!ENTITY aboutTor.donationBanner.line3b "Gefðu upphæð núna - og gjöfin þín mun tvöfaldast."> <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> <!ENTITY aboutTor.donationBanner.buttonB "Reiknið með mér"> diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index f023c259..128a95bd 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protegge la privacy di milioni."> <!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> <!ENTITY aboutTor.donationBanner.line2f "Abbiamo bisogno del tuo supporto!"> +<!ENTITY aboutTor.donationBanner.line2g "Supporta la libertà di internet."> +<!ENTITY aboutTor.donationBanner.line2h "Difendi il web aperto."> +<!ENTITY aboutTor.donationBanner.line2i "Sostieni la privacy e la libertà online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierà la tua donazione."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> <!ENTITY aboutTor.donationBanner.buttonB "Contami"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 19a54e77..e5c0d7ea 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "我々にはあなたのサポートが必要です!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties index e3f09909..230123cf 100644 --- a/src/chrome/locale/ja/browserOnboarding.properties +++ b/src/chrome/locale/ja/browserOnboarding.properties @@ -3,19 +3,19 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=ようこそ -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. +onboarding.tour-tor-welcome.title=準備できました。 +onboarding.tour-tor-welcome.description=Torブラウザは、ウェブブラウジング中に、最高水準のプライバシーとセキュリティを提供します。あなたは現在、トラッキング、監視、および検閲から保護されています。このクイックのオンボードは方法を提示します。 onboarding.tour-tor-welcome.button=今すぐ開始 onboarding.tour-tor-privacy=プライバシー -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=トラッカーとスヌーパーを追い払う。 +onboarding.tour-tor-privacy.description=Torブラウザは、cookieを分離し、セッション後にブラウザの履歴を削除します。これらの変更により、あなたのプライバシーとセキュリティがブラウザによって保護されます。ネットワークレベルでの保護方法については、「Torネットワーク」をクリックしてください。 +onboarding.tour-tor-privacy.button=Torネットワークへ onboarding.tour-tor-network=Torネットワーク onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.button=次のページへ onboarding.tour-tor-circuit-display=Circuit Display onboarding.tour-tor-circuit-display.title=See your path. @@ -25,17 +25,17 @@ onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=セキュリティ onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.button=設定の確認 onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. onboarding.tour-tor-expect-differences.button=よくある質問を見る -onboarding.tour-tor-onion-services=Onion Services -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services=Onion サービス +onboarding.tour-tor-onion-services.title=更なる保護。 onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.button=Onionサイトを訪問 # Circuit Display onboarding. onboarding.tor-circuit-display.next=次へ diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index f6b9dd76..3b5bdad3 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "დაიცავით მილიონობით ადამიანის პირადი მონაცემები."> <!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი."> <!ENTITY aboutTor.donationBanner.line2f "ჩვენ გვესაჭიროება თქვენი გვერდში დგომა!"> +<!ENTITY aboutTor.donationBanner.line2g "მხარი დაუჭირეთ თავისუფალ ინტერნეტს."> +<!ENTITY aboutTor.donationBanner.line2h "დაიცავით ინტერნეტის ღიაობა."> +<!ENTITY aboutTor.donationBanner.line2i "მხარი დაუჭირეთ პირადი მონაცემების ხელშეუხებლობისა და თავისუფლების უზრუნველყოფას ინტერნეტსივრცეში."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla გააორმაგებს თითოეულ შემოწირულ შენატანს 2019 წლამდე."> <!ENTITY aboutTor.donationBanner.line3 "გაეცით დღესვე და Mozilla გააორმაგებს თქვენს შემოწირულობას."> +<!ENTITY aboutTor.donationBanner.line3b "გაეცით თანხა ახლავე და თქვენი შემოწირულობა ორჯერ მეტად მძლავრი იქნება."> <!ENTITY aboutTor.donationBanner.buttonA "თანხის გაღება ახლავე"> <!ENTITY aboutTor.donationBanner.buttonB "ჩემი წვლილის აღნიშვნა"> diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index cbe0d8b0..e025bfde 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -45,8 +45,8 @@ canvas.neverAccessKey=რ # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S პროფილის ხარვეზი -profileReadOnly=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, გადააკოპიროთ %S სხვა ადგილზე, გამოყენებამდე. -profileReadOnlyMac=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, გადააკოპიროთ %S თქვენს მთავარ ეკრანის ან პროგრამების საქაღალდეში, მის გამოყენებამდე. +profileReadOnly=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, %S-ის ასლი შექმნათ სხვა ადგილზე, გამოყენებამდე. +profileReadOnlyMac=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, %S-ის ასლი შექმნათ თქვენს მთავარ ეკრანის ან პროგრამების საქაღალდეში, მის გამოყენებამდე. profileAccessDenied=%S-ს არ გააჩნია პროფილთან წვდომის ნებართვა. გთხოვთ, სათანადოდ გამართოთ თქვენი საფაილო სისტემის ნებართვები და სცადოთ ხელახლა. profileMigrationFailed=თქვენი არსებული %S პროფილის გადატანა ვერ მოხერხდა.\nგამოყენებული იქნება ახალი პარამეტრები. diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 8c8065a5..cf8143ab 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd index d5899000..a5e61845 100644 --- a/src/chrome/locale/nb/aboutTor.dtd +++ b/src/chrome/locale/nb/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index 4b462d6c..8929fc65 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Bescherm de privacy van miljoenen."> <!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> <!ENTITY aboutTor.donationBanner.line2f "We hebben jouw ondersteuning nodig!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Geef vandaag, en Mozilla geeft hetzelfde bedrag."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> <!ENTITY aboutTor.donationBanner.buttonB "Ik Doe Mee"> diff --git a/src/chrome/locale/pl/aboutTBUpdate.dtd b/src/chrome/locale/pl/aboutTBUpdate.dtd index d2900789..c227f7d1 100644 --- a/src/chrome/locale/pl/aboutTBUpdate.dtd +++ b/src/chrome/locale/pl/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Lista zmian:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nowy, przeprojektowany wyświetlacz obwodu"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Wyświetlacz obwodu Tor został przeniesiony i ulepszony! Kliknij przycisk Identyfikacja strony (znajdujący się po lewej stronie paska adresu URL), aby zobaczyć nowy widok obwodu."> <!ENTITY aboutTBUpdate.learnMore "Dowiedz się więcej"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 53d22a06..31df7d7b 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -6,19 +6,19 @@ <!ENTITY aboutTor.title "Informacje na temat Tor'a"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "Odkrywaj. Prywatnie."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Coś poszło nie tak!"> <!ENTITY aboutTor.failure2.label "Tor nie działa w tej przeglądarce."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Wyszukaj z DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pytania?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Sprawdź naszą instrukcje korzystania z przeglądarki Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Instrukcja korzystania z Tor Browser"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> <!ENTITY aboutTor.getInvolved.label "Get Involved »"> @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index b1c1ebd1..8c1730b0 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/browserOnboarding.properties @@ -3,7 +3,7 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Witamy -onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome.title=Jesteś gotowy. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. onboarding.tour-tor-welcome.button=Start Now diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 2ceab63a..7b60431c 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -35,17 +35,17 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeństwa pozwala na wyłączenie pewnych funkcji przeglądarki, które mogą uczynić ten program bardziej narażonym na próby ataku hakerskiego."> <!ENTITY torbutton.prefs.sec_standard_label "Standardowy"> <!ENTITY torbutton.prefs.sec_standard_description "Wszystkie funkcje Przeglądarki Tor i strony zostały włączone."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_safer_label "Bezpieczniej"> +<!ENTITY torbutton.prefs.sec_safer_description "Wyłącza funkcje witryny, które często są niebezpieczne, co powoduje, że niektóre witryny tracą funkcjonalność."> +<!ENTITY torbutton.prefs.sec_safer_list_label "W bezpieczniejszych ustawieniach:"> +<!ENTITY torbutton.prefs.sec_safest_label "Najbezpieczniejszy"> +<!ENTITY torbutton.prefs.sec_safest_description "Pozwala tylko na funkcje serwisu wymagane w przypadku witryn statycznych i podstawowych usług. Te zmiany dotyczą obrazów, multimediów i skryptów."> +<!ENTITY torbutton.prefs.sec_safest_list_label "W najbezpieczniejszych ustawieniach:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Dowiedz się więcej"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Obsługa skryptów Java na stronach bez HTTPS jest wyłączona."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript jest domyślnie wyłączona na wszystkich stronach."> <!ENTITY torbutton.prefs.sec_limit_typography "Niektóre fonty i symbole są wyłączone."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Niektóre fonty, ikony, symbole i obrazki są wyłączone."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Dźwięk i obraz (media HTML5) to "kliknij, aby odtworzyć"."> +<!ENTITY torbutton.circuit_display.title "Obwód Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nowy obwód dla tej strony"> diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index d08b96a8..c3983412 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -6,7 +6,7 @@ torbutton.circuit_display.relay = Przekaźnik torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Nieznane państwo torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.guard_note = Twój węzeł [Guard] może się nie zmienić. torbutton.circuit_display.learn_more = Dowiedz się więcej torbutton.content_sizer.margin_tooltip = Przeglądarka Tor dodaje ten margines po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online. torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora @@ -51,5 +51,5 @@ profileAccessDenied=%S nie posiada uprawnień, aby zobaczyć ten profil. Prosimy profileMigrationFailed=Migracja Twojego isniejącego profilu %S nie powiodła się.\nNowe ustawienia zostaną użyte. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Połączenie zaszyfrowane (usługa Onion, %1$S, %2$S klucze bitowe, %3$S) +pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion) diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index a90f3e1a..c137ac41 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -36,8 +36,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhões de pessoas."> <!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> <!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> <!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 879d708e..1bc187b8 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Обеспечиваем конфиденциальность миллионам людей."> <!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> <!ENTITY aboutTor.donationBanner.line2f "Нам нужна твоя поддержка!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> <!ENTITY aboutTor.donationBanner.buttonB "Посчитайте"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 110322e4..f2938e54 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Skydda miljontals privatliv."> <!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> <!ENTITY aboutTor.donationBanner.line2f "Vi behöver ert stöd!"> +<!ENTITY aboutTor.donationBanner.line2g "Stöd internetfrihet."> +<!ENTITY aboutTor.donationBanner.line2h "Försvara den öppna webben."> +<!ENTITY aboutTor.donationBanner.line2i "Stöd integritet och frihet på nätet."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla matchar varje donation fram till 2019."> <!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha din donation."> +<!ENTITY aboutTor.donationBanner.line3b "Ge nu, och din gåva blir dubbelt så stark."> <!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> <!ENTITY aboutTor.donationBanner.buttonB "Räkna med mig"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 83f5eee7..aaa6856e 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -24,7 +24,7 @@ torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.security_settings.menu.title = Säkerhetsinställningar torbutton.title.prompt_torbrowser = Viktig information om Torbutton -torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar din integritet bättre än vanliga Firefox, även när Firefox används med Tor Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många fel som vi inte kunde åtgärda på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och hämta Tor Browser Bundle. Tor Browser skyddar din integritet bättre än vanliga Firefox, även när Firefox används med Tor Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information. torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker på att du vill aktivera plugins?\n\n diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index e4a2443d..789e3d81 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Milyonların gizliliğini koru."> <!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koru."> <!ENTITY aboutTor.donationBanner.line2f "Desteğinize ihtiyacımız var!"> +<!ENTITY aboutTor.donationBanner.line2g "İnternet özgürlüğünü destekleyin"> +<!ENTITY aboutTor.donationBanner.line2h "Açık web düşüncesini savunun."> +<!ENTITY aboutTor.donationBanner.line2i "Kişisel gizliliği ve çevrimiçi özgürlüğü destekleyin."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla 2019 yılına kadar yapılan her bağışa karşılık veriyor."> <!ENTITY aboutTor.donationBanner.line3 "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak."> +<!ENTITY aboutTor.donationBanner.line3b "Bağış yapın ve hediyeniz iki kat güzel olsun."> <!ENTITY aboutTor.donationBanner.buttonA "Şimdi Bağış Yapın"> <!ENTITY aboutTor.donationBanner.buttonB "Ben de Varım"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 820d92c9..09c26101 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người."> <!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> <!ENTITY aboutTor.donationBanner.line2f "Chúng tôi cần sự hỗ trợ của bạn!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> <!ENTITY aboutTor.donationBanner.buttonB "Hãy cho tôi tham gia"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index f61e2a91..0ae7596e 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。"> <!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> <!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。"> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> <!ENTITY aboutTor.donationBanner.buttonB "算我一个"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index a679ed55..bcbec612 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "我們需要您的支援！"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "今日您捐款，Mozilla 也會捐出相同數額。"> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> <!ENTITY aboutTor.donationBanner.buttonB "我也要加入！">

1 0

[torbutton/master] Bug 28543: about:tor has scroll bar between widths 900px and 1000px.
by gk＠torproject.org 27 Nov '18

27 Nov '18

commit 9ae78d32be280bcf58819676f700994544049ae8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Nov 26 12:04:34 2018 -0500 Bug 28543: about:tor has scroll bar between widths 900px and 1000px. Remove unnecessary min-width from the .torcontent-container rule. --- src/chrome/skin/aboutTor.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index cf8290c9..37fa30fe 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -51,7 +51,6 @@ body:not([initialized]) { .torcontent-container { margin: 40px auto 28px auto; max-width: 1000px; - min-width: 1000px; } }

1 0

[tor-browser-build/master] Bug 23384: Remove user arthuredelstein on build-sunet-a.torproject.net
by boklm＠torproject.org 27 Nov '18

27 Nov '18

commit 1aaca9195d0ba07db68ceaab1f516f91e0ee8a49 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 27 17:55:04 2018 +0100 Bug 23384: Remove user arthuredelstein on build-sunet-a.torproject.net Arthur said he doesn't need access to this machine anymore, so we remove his user account from the ansible config (the account will be removed from the machine manually). --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 - tools/ansible/roles/tbb-team/files/arthuredelstein.pub | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 8bf2e66..fa8ffa3 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,6 +1,5 @@ --- tbb_team_members: - - arthuredelstein - boklm - brade - gk diff --git a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub deleted file mode 100644 index e7f0c39..0000000 --- a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTn6K3kVN90fKK4BFC2I6wU9Ngb0v1U9JG9Ongt8UlTnbT58tLXATj65a7JwLcFHTjfTyDe2YLA5ujec2Az9LVYNezf4lIbykkDMg125En0HVhjanae9JwCWbOH9BhaEcB9ILc/gAeEXedxvZjpdTkcuJRoYem0jzyBXIm1eCb7gSbGJ5ma9JVFysOxFFor3SiOAjTDotgqVtfG3SF0ecRnViO/dfW9sCzwpTABOg0FZTKV/0AzbPoLE9w8OGe3qZU/eyK+Uw4gP/ZmF9veP1Npnvhf3wS4xkyg0zIvhIeOWQyArbir7dr0xTPhoOv3+GrDwKfCVfEvLEAwcL4TZPx arthur(a)Arthur.local

1 0

[tor-browser-build/master] Bug 28594: Remove tor browser alpha nightly builds
by boklm＠torproject.org 26 Nov '18

26 Nov '18

commit e24e2dea8ebe54b9e8ddd27044bffa21adf08c94 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 26 19:34:45 2018 +0100 Bug 28594: Remove tor browser alpha nightly builds Update testsuite_git_commit to remove tor browser alpha nightly builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 5f04029..26820a9 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git -testsuite_git_commit: 7b0dcd9f21bfde6b097b687c63f84fa579296804 +testsuite_git_commit: 7b1e23e06761c7336795d2b2a6fa40f5914b0aef nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Revert "28051"
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 6b9a93c0517d8b11d0e843f7c17abfc9090b7332 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 22 21:31:48 2018 +0000 Revert "28051" We are not ready for that yet. This reverts commit 8e8445c1d47644e6e34fc1b96d6934a9aa13f58b. --- build.gradle | 4 -- mobile/android/app/000-tor-browser-android.js | 3 ++ mobile/android/app/build.gradle | 11 ----- mobile/android/base/AndroidManifest.xml.in | 1 - .../base/java/org/mozilla/gecko/BrowserApp.java | 53 ++++++++++++---------- .../base/java/org/mozilla/gecko/GeckoApp.java | 29 ------------ .../java/org/mozilla/gecko/GeckoApplication.java | 5 -- .../java/org/mozilla/gecko/LauncherActivity.java | 18 -------- .../gecko/notifications/NotificationClient.java | 6 +-- .../gecko/notifications/NotificationHelper.java | 5 +- mobile/android/config/proguard/proguard.cfg | 15 ------ .../java/org/mozilla/gecko/util/ProxySelector.java | 4 +- 12 files changed, 38 insertions(+), 116 deletions(-) diff --git a/build.gradle b/build.gradle index 6cf2d4cc0e7a..a080e15b2fac 100644 --- a/build.gradle +++ b/build.gradle @@ -32,10 +32,6 @@ allprojects { url repository } } - // These are needed for Orbot's dependencies - maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } - maven { url 'https://jitpack.io' } - jcenter() } } diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index e7e337276acb..c329fcdee5f7 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -54,6 +54,9 @@ pref("media.realtime_decoder.enabled", false); pref("general.useragent.updates.enabled", false); pref("general.useragent.updates.url", ""); +// Override this because Orbot uses 9050 as the default +pref("network.proxy.socks_port", 9050); + // Do not allow the user to install extensions from web pref("xpinstall.enabled", false); pref("extensions.enabledScopes", 1); diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index d0060901b6b3..7c515bbe65a7 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -225,9 +225,6 @@ dependencies { implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" - implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar') - implementation files('orbotservice-release.aar') - implementation files('jsocksAndroid-release.aar') if (mozconfig.substs.MOZ_NATIVE_DEVICES) { implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" @@ -265,14 +262,6 @@ dependencies { // Including the Robotium JAR directly can cause issues with dexing. androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4' - - // Orbot - implementation 'com.github.delight-im:Android-Languages:v1.0.1' - implementation 'pl.bclogic:pulsator4droid:1.0.3' - - // Orbotservice - implementation 'org.torproject:tor-android-binary:0.3.4.9' - implementation 'com.jrummyapps:android-shell:1.0.1' } // TODO: (bug 1261486): This impl is not robust - diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 0e5f4edaf814..c4ea9a37683e 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -24,7 +24,6 @@ #include FennecManifest_permissions.xml.in <application android:label="@string/moz_app_displayname" - tools:replace="android:label" android:icon="@drawable/icon" android:logo="@drawable/logo" android:name="@MOZ_ANDROID_APPLICATION_CLASS@" diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 42b9ebd0a3f7..5efd83398775 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -181,8 +181,7 @@ import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.GeckoSession; -import org.torproject.android.OrbotMainActivity; -import org.torproject.android.service.TorServiceConstants; +import info.guardianproject.netcipher.proxy.OrbotHelper; import java.io.File; import java.io.FileNotFoundException; @@ -240,9 +239,6 @@ public class BrowserApp extends GeckoApp public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003; - public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001; - - private static boolean mOrbotRun = false; public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE"; @@ -1286,26 +1282,41 @@ public class BrowserApp extends GeckoApp @Override public void onReceive(Context context, Intent intent) { - if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_STATUS)) { + if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) { GeckoAppShell.setTorStatus(intent); } } }; public void checkStartOrbot() { - /* run in thread so Tor status updates will be received while the - * Gecko event sync is blocking the main thread */ - HandlerThread handlerThread = new HandlerThread("torStatusReceiver"); - handlerThread.start(); - Looper looper = handlerThread.getLooper(); - Handler handler = new Handler(looper); - registerReceiver(torStatusReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS), - null, handler); + if (!OrbotHelper.isOrbotInstalled(this)) { + final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this); - if (!mOrbotRun) { - final String orbotStartAction = "android.intent.action.MAIN"; - final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); - startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null); + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.install_orbot); + builder.setMessage(R.string.you_must_have_orbot); + builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + startActivity(installOrbotIntent); + } + }); + builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + } + }); + builder.show(); + } else { + /* run in thread so Tor status updates will be received while the + * Gecko event sync is blocking the main thread */ + HandlerThread handlerThread = new HandlerThread("torStatusReceiver"); + handlerThread.start(); + Looper looper = handlerThread.getLooper(); + Handler handler = new Handler(looper); + registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS), + null, handler); + OrbotHelper.requestStartTor(this); } } @@ -3007,12 +3018,6 @@ public class BrowserApp extends GeckoApp TabQueueHelper.processTabQueuePromptResponse(resultCode, this); break; - case ACTIVITY_RESULT_ORBOT_LAUNCH: - final SafeIntent intent = new SafeIntent(getIntent()); - Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH"); - mOrbotRun = true; - break; - default: for (final BrowserAppDelegate delegate : delegates) { delegate.onActivityResult(this, requestCode, resultCode, data); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 3741c26fe0e8..802d8adafbeb 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -91,8 +91,6 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.torproject.android.service.TorService; - import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -598,9 +596,6 @@ public abstract class GeckoApp extends GeckoActivity EventDispatcher.getInstance().dispatch("Browser:Quit", res); - Intent torService = new Intent(this, TorService.class); - stopService(torService); - // We don't call shutdown here because this creates a race condition which // can cause the clearing of private data to fail. Instead, we shut down the // UI only after we're done sanitizing. @@ -1217,30 +1212,6 @@ public abstract class GeckoApp extends GeckoActivity } } } - } else if (mIsRestoringActivity) { - /* Synchronize Tabs state with Gecko. We're restoring the Activity, this - * mean all of the Chrome state was lost, but the previously created - * Tabs still exist within the Android application, because those are - * static and the application keeps track of those (and only the Activity - * is starting, the application was never destroyed). */ - Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder(); - Tab selectedTab = Tabs.getInstance().getSelectedTab(); - for (Tab tab : tabs) { - GeckoBundle reloadMessage = new GeckoBundle(); - reloadMessage.putString("url", tab.getURL()); - reloadMessage.putString("engine", null); - reloadMessage.putInt("parentId", tab.getParentId()); - reloadMessage.putBoolean("userEntered", true); - reloadMessage.putBoolean("isPrivate", tab.isPrivate()); - reloadMessage.putBoolean("pinned", false); - reloadMessage.putBoolean("desktopMode", tab.getDesktopMode()); - reloadMessage.putString("referrerURI", null); - reloadMessage.putInt("tabID", tab.getId()); - reloadMessage.putBoolean("newTab", true); - reloadMessage.putBoolean("delayLoad", selectedTab != tab); - reloadMessage.putBoolean("selected", selectedTab == tab); - getAppEventDispatcher().dispatch("Tab:Load", reloadMessage); - } } synchronized (GeckoApp.this) { diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index b38e7184c798..e896134e0af9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -62,8 +62,6 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.UUID; -import org.torproject.android.service.util.Prefs; - public class GeckoApplication extends Application implements HapticFeedbackDelegate { private static final String LOG_TAG = "GeckoApplication"; @@ -321,9 +319,6 @@ public class GeckoApplication extends Application "Profile:Create", null); - // Give Orbot the base Context - Prefs.setContext(context); - super.onCreate(); } diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java index 4cd94ed538c7..e8f8facc24c6 100644 --- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java @@ -45,9 +45,6 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN; import org.mozilla.gecko.deeplink.DeepLinkContract; -import org.torproject.android.OrbotMainActivity; -import org.torproject.android.service.TorServiceConstants; - /** * Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app). */ @@ -70,9 +67,6 @@ public class LauncherActivity extends Activity { } else if (isWebAppIntent(safeIntent)) { dispatchWebAppIntent(); - } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) { - dispatchOrbotIntent(); - // If it's not a view intent, it won't be a custom tabs intent either. Just launch! } else if (!isViewIntentWithURL(safeIntent)) { dispatchNormalIntent(); @@ -122,18 +116,6 @@ public class LauncherActivity extends Activity { startActivity(intent); } - private void dispatchOrbotIntent() { - final String orbotStartAction = "android.intent.action.MAIN"; - final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); - - //When we launch Orbot, we want a new task. - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - - startActivity(intent); - } - private void dispatchUrlIntent(@NonNull String url) { Intent intent = new Intent(getIntent()); intent.setData(Uri.parse(url)); diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java index c66d67f32787..d8392a801e13 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java @@ -28,8 +28,6 @@ import org.mozilla.gecko.NotificationListener; import org.mozilla.gecko.R; import org.mozilla.gecko.util.BitmapUtils; -import org.torproject.android.service.util.NotificationBuilderCompat; - /** * Client for posting notifications. */ @@ -144,7 +142,7 @@ public final class NotificationClient implements NotificationListener { private void add(final String name, final String imageUrl, final String host, final String alertTitle, final String alertText, final PendingIntent contentIntent, final PendingIntent deleteIntent) { - final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext) + final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext) .setContentTitle(alertTitle) .setContentText(alertText) .setSmallIcon(R.drawable.ic_status_logo) @@ -152,7 +150,7 @@ public final class NotificationClient implements NotificationListener { .setDeleteIntent(deleteIntent) .setAutoCancel(true) .setDefaults(Notification.DEFAULT_SOUND) - .setStyle(new Notification.BigTextStyle() + .setStyle(new NotificationCompat.BigTextStyle() .bigText(alertText) .setSummaryText(host)); diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java index 35366609da49..34ea99882d9a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java @@ -32,11 +32,10 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.Bitmap; import android.net.Uri; +import android.support.v4.app.NotificationCompat; import android.support.v4.util.SimpleArrayMap; import android.util.Log; -import org.torproject.android.service.util.NotificationBuilderCompat; - public final class NotificationHelper implements BundleEventListener { public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction"; @@ -234,7 +233,7 @@ public final class NotificationHelper implements BundleEventListener { private void showNotification(final GeckoBundle message) { ThreadUtils.assertOnUiThread(); - final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext); + final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext); // These attributes are required final String id = message.getString(ID_ATTR); diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 3d03e3107c72..0be8a745e44b 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -165,21 +165,6 @@ # See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic… -dontnote android.support.** -# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META… -# JSR 305 annotations are for embedding nullability information. --dontwarn javax.annotation.** - -# A resource is loaded with a relative path so the package of this class must be preserved. --keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase - -# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. --dontwarn org.codehaus.mojo.animal_sniffer.* - -# OkHttp platform used only on JVM and when Conscrypt dependency is available. --dontwarn okhttp3.internal.platform.ConscryptPlatform - -#-keepnames class org.torproject.* - -include "adjust-keeps.cfg" -include "leakcanary-keeps.cfg" diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index 41c2c7e705a1..f05716fe1d09 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -30,8 +30,8 @@ import java.util.List; public class ProxySelector { private static final String TOR_PROXY_ADDRESS = "127.0.0.1"; - private static final int TOR_SOCKS_PROXY_PORT = 9150; - private static final int TOR_HTTP_PROXY_PORT = 8218; + private static final int TOR_SOCKS_PROXY_PORT = 9050; + private static final int TOR_HTTP_PROXY_PORT = 8118; public static URLConnection openConnectionWithProxy(URI uri) throws IOException { java.net.ProxySelector ps = java.net.ProxySelector.getDefault();

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Implement fallback to delete private data in the browser startup
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 977e468c7f83b78cf920a7aa4943147eda195c45 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 19 14:58:15 2018 -0200 Bug 28507: Implement fallback to delete private data in the browser startup When the TBA is forcefully closed, its private data is not deleted, even if the history.clear_on_exit is set. As fallback, this patch calls the Sanitize:ClearData event in the browser startup to clean the private data if needed. --- .../android/base/java/org/mozilla/gecko/GeckoApp.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index ef7da17e19a1..3741c26fe0e8 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -564,10 +564,7 @@ public abstract class GeckoApp extends GeckoActivity return super.onOptionsItemSelected(item); } - private void quitAndClear() { - // Make sure the Guest Browsing notification goes away when we quit. - GuestSession.hideNotification(this); - + private GeckoBundle createSanitizeData() { final SharedPreferences prefs = getSharedPreferencesForProfile(); final Set<String> clearSet = PrefUtils.getStringSet( prefs, ClearOnShutdownPref.PREF, new HashSet<String>()); @@ -576,7 +573,14 @@ public abstract class GeckoApp extends GeckoActivity for (final String clear : clearSet) { clearObj.putBoolean(clear, true); } + return clearObj; + } + private void quitAndClear() { + // Make sure the Guest Browsing notification goes away when we quit. + GuestSession.hideNotification(this); + + final GeckoBundle clearObj = createSanitizeData(); final GeckoBundle res = new GeckoBundle(2); res.putBundle("sanitize", clearObj); @@ -1135,6 +1139,13 @@ public abstract class GeckoApp extends GeckoActivity mTextSelection.create(); final Bundle finalSavedInstanceState = savedInstanceState; + + // When the browser is forcefully closed, its private data is not + // deleted, even if the history.clear_on_exit is set. Here we are calling + // the Sanitize:ClearData in the startup to make sure the private + // data was cleared. + EventDispatcher.getInstance().dispatch("Sanitize:ClearData", createSanitizeData()); + ThreadUtils.postToBackgroundThread(new Runnable() { @Override public void run() {

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] 28051
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 8e8445c1d47644e6e34fc1b96d6934a9aa13f58b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 22 14:58:20 2018 +0000 28051 --- build.gradle | 4 ++ mobile/android/app/000-tor-browser-android.js | 3 -- mobile/android/app/build.gradle | 11 +++++ mobile/android/base/AndroidManifest.xml.in | 1 + .../base/java/org/mozilla/gecko/BrowserApp.java | 53 ++++++++++------------ .../base/java/org/mozilla/gecko/GeckoApp.java | 29 ++++++++++++ .../java/org/mozilla/gecko/GeckoApplication.java | 5 ++ .../java/org/mozilla/gecko/LauncherActivity.java | 18 ++++++++ .../gecko/notifications/NotificationClient.java | 6 ++- .../gecko/notifications/NotificationHelper.java | 5 +- mobile/android/config/proguard/proguard.cfg | 15 ++++++ .../java/org/mozilla/gecko/util/ProxySelector.java | 4 +- 12 files changed, 116 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index a080e15b2fac..6cf2d4cc0e7a 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,10 @@ allprojects { url repository } } + // These are needed for Orbot's dependencies + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url 'https://jitpack.io' } + jcenter() } } diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index c329fcdee5f7..e7e337276acb 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -54,9 +54,6 @@ pref("media.realtime_decoder.enabled", false); pref("general.useragent.updates.enabled", false); pref("general.useragent.updates.url", ""); -// Override this because Orbot uses 9050 as the default -pref("network.proxy.socks_port", 9050); - // Do not allow the user to install extensions from web pref("xpinstall.enabled", false); pref("extensions.enabledScopes", 1); diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 7c515bbe65a7..d0060901b6b3 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -225,6 +225,9 @@ dependencies { implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" + implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar') + implementation files('orbotservice-release.aar') + implementation files('jsocksAndroid-release.aar') if (mozconfig.substs.MOZ_NATIVE_DEVICES) { implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" @@ -262,6 +265,14 @@ dependencies { // Including the Robotium JAR directly can cause issues with dexing. androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4' + + // Orbot + implementation 'com.github.delight-im:Android-Languages:v1.0.1' + implementation 'pl.bclogic:pulsator4droid:1.0.3' + + // Orbotservice + implementation 'org.torproject:tor-android-binary:0.3.4.9' + implementation 'com.jrummyapps:android-shell:1.0.1' } // TODO: (bug 1261486): This impl is not robust - diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index c4ea9a37683e..0e5f4edaf814 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -24,6 +24,7 @@ #include FennecManifest_permissions.xml.in <application android:label="@string/moz_app_displayname" + tools:replace="android:label" android:icon="@drawable/icon" android:logo="@drawable/logo" android:name="@MOZ_ANDROID_APPLICATION_CLASS@" diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 5efd83398775..42b9ebd0a3f7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -181,7 +181,8 @@ import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.GeckoSession; -import info.guardianproject.netcipher.proxy.OrbotHelper; +import org.torproject.android.OrbotMainActivity; +import org.torproject.android.service.TorServiceConstants; import java.io.File; import java.io.FileNotFoundException; @@ -239,6 +240,9 @@ public class BrowserApp extends GeckoApp public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003; + public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001; + + private static boolean mOrbotRun = false; public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE"; @@ -1282,41 +1286,26 @@ public class BrowserApp extends GeckoApp @Override public void onReceive(Context context, Intent intent) { - if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) { + if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_STATUS)) { GeckoAppShell.setTorStatus(intent); } } }; public void checkStartOrbot() { - if (!OrbotHelper.isOrbotInstalled(this)) { - final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this); + /* run in thread so Tor status updates will be received while the + * Gecko event sync is blocking the main thread */ + HandlerThread handlerThread = new HandlerThread("torStatusReceiver"); + handlerThread.start(); + Looper looper = handlerThread.getLooper(); + Handler handler = new Handler(looper); + registerReceiver(torStatusReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS), + null, handler); - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.install_orbot); - builder.setMessage(R.string.you_must_have_orbot); - builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - startActivity(installOrbotIntent); - } - }); - builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - } - }); - builder.show(); - } else { - /* run in thread so Tor status updates will be received while the - * Gecko event sync is blocking the main thread */ - HandlerThread handlerThread = new HandlerThread("torStatusReceiver"); - handlerThread.start(); - Looper looper = handlerThread.getLooper(); - Handler handler = new Handler(looper); - registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS), - null, handler); - OrbotHelper.requestStartTor(this); + if (!mOrbotRun) { + final String orbotStartAction = "android.intent.action.MAIN"; + final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); + startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null); } } @@ -3018,6 +3007,12 @@ public class BrowserApp extends GeckoApp TabQueueHelper.processTabQueuePromptResponse(resultCode, this); break; + case ACTIVITY_RESULT_ORBOT_LAUNCH: + final SafeIntent intent = new SafeIntent(getIntent()); + Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH"); + mOrbotRun = true; + break; + default: for (final BrowserAppDelegate delegate : delegates) { delegate.onActivityResult(this, requestCode, resultCode, data); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 63a136541970..ef7da17e19a1 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -91,6 +91,8 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.torproject.android.service.TorService; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -592,6 +594,9 @@ public abstract class GeckoApp extends GeckoActivity EventDispatcher.getInstance().dispatch("Browser:Quit", res); + Intent torService = new Intent(this, TorService.class); + stopService(torService); + // We don't call shutdown here because this creates a race condition which // can cause the clearing of private data to fail. Instead, we shut down the // UI only after we're done sanitizing. @@ -1201,6 +1206,30 @@ public abstract class GeckoApp extends GeckoActivity } } } + } else if (mIsRestoringActivity) { + /* Synchronize Tabs state with Gecko. We're restoring the Activity, this + * mean all of the Chrome state was lost, but the previously created + * Tabs still exist within the Android application, because those are + * static and the application keeps track of those (and only the Activity + * is starting, the application was never destroyed). */ + Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder(); + Tab selectedTab = Tabs.getInstance().getSelectedTab(); + for (Tab tab : tabs) { + GeckoBundle reloadMessage = new GeckoBundle(); + reloadMessage.putString("url", tab.getURL()); + reloadMessage.putString("engine", null); + reloadMessage.putInt("parentId", tab.getParentId()); + reloadMessage.putBoolean("userEntered", true); + reloadMessage.putBoolean("isPrivate", tab.isPrivate()); + reloadMessage.putBoolean("pinned", false); + reloadMessage.putBoolean("desktopMode", tab.getDesktopMode()); + reloadMessage.putString("referrerURI", null); + reloadMessage.putInt("tabID", tab.getId()); + reloadMessage.putBoolean("newTab", true); + reloadMessage.putBoolean("delayLoad", selectedTab != tab); + reloadMessage.putBoolean("selected", selectedTab == tab); + getAppEventDispatcher().dispatch("Tab:Load", reloadMessage); + } } synchronized (GeckoApp.this) { diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index e896134e0af9..b38e7184c798 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -62,6 +62,8 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.UUID; +import org.torproject.android.service.util.Prefs; + public class GeckoApplication extends Application implements HapticFeedbackDelegate { private static final String LOG_TAG = "GeckoApplication"; @@ -319,6 +321,9 @@ public class GeckoApplication extends Application "Profile:Create", null); + // Give Orbot the base Context + Prefs.setContext(context); + super.onCreate(); } diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java index e8f8facc24c6..4cd94ed538c7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java @@ -45,6 +45,9 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN; import org.mozilla.gecko.deeplink.DeepLinkContract; +import org.torproject.android.OrbotMainActivity; +import org.torproject.android.service.TorServiceConstants; + /** * Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app). */ @@ -67,6 +70,9 @@ public class LauncherActivity extends Activity { } else if (isWebAppIntent(safeIntent)) { dispatchWebAppIntent(); + } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) { + dispatchOrbotIntent(); + // If it's not a view intent, it won't be a custom tabs intent either. Just launch! } else if (!isViewIntentWithURL(safeIntent)) { dispatchNormalIntent(); @@ -116,6 +122,18 @@ public class LauncherActivity extends Activity { startActivity(intent); } + private void dispatchOrbotIntent() { + final String orbotStartAction = "android.intent.action.MAIN"; + final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); + + //When we launch Orbot, we want a new task. + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + + startActivity(intent); + } + private void dispatchUrlIntent(@NonNull String url) { Intent intent = new Intent(getIntent()); intent.setData(Uri.parse(url)); diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java index d8392a801e13..c66d67f32787 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java @@ -28,6 +28,8 @@ import org.mozilla.gecko.NotificationListener; import org.mozilla.gecko.R; import org.mozilla.gecko.util.BitmapUtils; +import org.torproject.android.service.util.NotificationBuilderCompat; + /** * Client for posting notifications. */ @@ -142,7 +144,7 @@ public final class NotificationClient implements NotificationListener { private void add(final String name, final String imageUrl, final String host, final String alertTitle, final String alertText, final PendingIntent contentIntent, final PendingIntent deleteIntent) { - final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext) + final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext) .setContentTitle(alertTitle) .setContentText(alertText) .setSmallIcon(R.drawable.ic_status_logo) @@ -150,7 +152,7 @@ public final class NotificationClient implements NotificationListener { .setDeleteIntent(deleteIntent) .setAutoCancel(true) .setDefaults(Notification.DEFAULT_SOUND) - .setStyle(new NotificationCompat.BigTextStyle() + .setStyle(new Notification.BigTextStyle() .bigText(alertText) .setSummaryText(host)); diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java index 34ea99882d9a..35366609da49 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java @@ -32,10 +32,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.Bitmap; import android.net.Uri; -import android.support.v4.app.NotificationCompat; import android.support.v4.util.SimpleArrayMap; import android.util.Log; +import org.torproject.android.service.util.NotificationBuilderCompat; + public final class NotificationHelper implements BundleEventListener { public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction"; @@ -233,7 +234,7 @@ public final class NotificationHelper implements BundleEventListener { private void showNotification(final GeckoBundle message) { ThreadUtils.assertOnUiThread(); - final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext); + final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext); // These attributes are required final String id = message.getString(ID_ATTR); diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 0be8a745e44b..3d03e3107c72 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -165,6 +165,21 @@ # See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic… -dontnote android.support.** +# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META… +# JSR 305 annotations are for embedding nullability information. +-dontwarn javax.annotation.** + +# A resource is loaded with a relative path so the package of this class must be preserved. +-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase + +# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. +-dontwarn org.codehaus.mojo.animal_sniffer.* + +# OkHttp platform used only on JVM and when Conscrypt dependency is available. +-dontwarn okhttp3.internal.platform.ConscryptPlatform + +#-keepnames class org.torproject.* + -include "adjust-keeps.cfg" -include "leakcanary-keeps.cfg" diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index f05716fe1d09..41c2c7e705a1 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -30,8 +30,8 @@ import java.util.List; public class ProxySelector { private static final String TOR_PROXY_ADDRESS = "127.0.0.1"; - private static final int TOR_SOCKS_PROXY_PORT = 9050; - private static final int TOR_HTTP_PROXY_PORT = 8118; + private static final int TOR_SOCKS_PROXY_PORT = 9150; + private static final int TOR_HTTP_PROXY_PORT = 8218; public static URLConnection openConnectionWithProxy(URI uri) throws IOException { java.net.ProxySelector ps = java.net.ProxySelector.getDefault();

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Parse a set of strings in Android Set Preferences
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit b03bfc5100f3d255ae0116ab18653759f87fe241 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 19 14:25:27 2018 -0200 Bug 28507: Parse a set of strings in Android Set Preferences Android allows a set of String values in the preferences editor. However, the TBA distribution just supported simple scalar types. This patch implements the code to parse complex prefs from the distribution preference file. --- .../gecko/preferences/DistroSharedPrefsImport.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java index 13047c6f2ff4..7969aca3d2ac 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java @@ -11,10 +11,13 @@ import org.mozilla.gecko.distribution.Distribution; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashSet; import java.util.Iterator; +import java.util.Set; public class DistroSharedPrefsImport { @@ -58,7 +61,21 @@ public class DistroSharedPrefsImport { } else if (value instanceof Long) { sharedPreferences.putLong(GeckoPreferences.NON_PREF_PREFIX + key, (long) value); } else { - Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); + JSONArray jsonArray = preferences.optJSONArray(key); + if (jsonArray != null) { + Set<String> prefValues = new HashSet<String>(); + for (int i = 0; i < jsonArray.length(); i++) { + try { + prefValues.add(jsonArray.getString(i)); + } catch (JSONException e) { + Log.e(LOGTAG, "Unable to parse Android Preferences.", e); + continue; + } + } + sharedPreferences.putStringSet(GeckoPreferences.NON_PREF_PREFIX + key, prefValues); + } else { + Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); + } } } sharedPreferences.apply();

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Add prefs that allow the browser to delete browsing history by default
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 57ef4c8201764f36e50347e913825c99ba2dc8bd Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 19 14:40:26 2018 -0200 Bug 28507: Add prefs that allow the browser to delete browsing history by default --- .../torbrowser/assets/distribution/preferences.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json index bebd14967d8e..0990fba37a8f 100644 --- a/mobile/android/torbrowser/assets/distribution/preferences.json +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -5,6 +5,18 @@ "AndroidPreferences": { "homepage": "about:tor", "startpane_enabled_after_57": true, - "startpane_enabled": true + "startpane_enabled": true, + "history.clear_on_exit": [ + "private.data.openTabs", + "private.data.history", + "private.data.searchHistory", + "private.data.formdata", + "private.data.cookies_sessions", + "private.data.cache", + "private.data.offlineApps", + "private.data.siteSettings", + "private.data.syncedTabs", + "private.data.passwords" + ] } }

1 0

[tor-browser-build/master] Build .apk files with distribution directory
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit f38b27734129d7a83f068e09ea1a1d07327622f5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 22 14:44:28 2018 +0000 Build .apk files with distribution directory Since #27111 landed we need a distributions directory to contain our additional preferences. Thus, we build now unconditionally with it. --- projects/firefox/mozconfig-android-armv7 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index f34e228..0098ea1 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -17,9 +17,7 @@ ac_add_options --with-branding=mobile/android/branding/torbrowser ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64 ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang -if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then - ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser -fi +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then # Because Google Play will likely be the primary distribution medium,

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25143_v2'
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit f2f4958d538fcb93bca387aa65bc833c7e143dcf Merge: 43c9452 a334a1a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 22 14:33:48 2018 +0000 Merge remote-tracking branch 'boklm/bug_25143_v2' rbm.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25143: avoid error if output file already exists
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit a334a1a59175e3e75b2a49fb02bc9206b838b727 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 19 19:29:52 2018 +0100 Bug 25143: avoid error if output file already exists If output file or directory already exists, remove it before moving it. This avoids an error when rebuilding a project that was already built. --- rbm.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 5e981ac..87fe179 100644 --- a/rbm.conf +++ b/rbm.conf @@ -401,7 +401,12 @@ runc: sudo chown -R $(whoami) "$srcdir" if [ $(ls -1 "$srcdir"/* 2> /dev/null | wc -l) -gt 0 ] then - mv -f "$srcdir"/* [% dst %]/ + for file in "$srcdir"/* + do + bname="$(basename "$file")" + test -e [% dst %]/"$bname" && rm -Rf [% dst %]/"$bname" + mv -f "$file" [% dst %]/ + done fi remote_finish: |

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27125 - Move localized Tor Browser for Android strings into separate file
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 970fcfe56478aa18fdeaf9ec902f016165dade62 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 20:56:22 2018 +0000 Bug 27125 - Move localized Tor Browser for Android strings into separate file Revert changed localized string we don't use anymore. --- .../android/base/locales/en-US/android_strings.dtd | 29 ++-------------------- .../base/locales/en-US/torbrowser_strings.dtd | 25 +++++++++++++++++++ mobile/android/base/locales/moz.build | 1 + mobile/android/base/strings.xml.in | 1 + .../mozbuild/action/generate_strings_xml.py | 3 ++- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index d7cded48fda4..bd55ce0a832f 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -4,8 +4,9 @@ <!ENTITY firstrun_panel_title_welcome "Welcome"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> -<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> +<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> +  <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> <!ENTITY firstrun_panel_title_customize "Customize"> @@ -43,32 +44,6 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> - -<!ENTITY firstrun_welcome_tab_title "Welcome"> -<!ENTITY firstrun_welcome_title "You\'re ready."> -<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> -<!ENTITY firstrun_welcome_next "Start now"> -<!ENTITY firstrun_privacy_tab_title "Privacy"> -<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> -<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> -<!ENTITY firstrun_privacy_next "Go to Tor Network"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> -<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> -<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> -<!ENTITY firstrun_tornetwork_next "Next"> -<!ENTITY firstrun_secsettings_tab_title "Security"> -<!ENTITY firstrun_secsettings_title "Choose your experience."> -<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> -<!ENTITY firstrun_secsettings_next "Next"> -<!ENTITY firstrun_tips_tab_title "Tips"> -<!ENTITY firstrun_tips_title "Experience Tips."> -<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> -<!ENTITY firstrun_tips_next "Next"> -<!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion Services."> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> -<!ENTITY firstrun_onionservices_next "Go to explore"> - <!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">  +<!ENTITY firstrun_welcome_tab_title "Welcome"> +<!ENTITY firstrun_welcome_title "You\'re ready."> +<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> +<!ENTITY firstrun_welcome_next "Start now"> +<!ENTITY firstrun_privacy_tab_title "Privacy"> +<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> +<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> +<!ENTITY firstrun_privacy_next "Go to Tor Network"> +<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> +<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> +<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> +<!ENTITY firstrun_tornetwork_next "Next"> +<!ENTITY firstrun_secsettings_tab_title "Security"> +<!ENTITY firstrun_secsettings_title "Choose your experience."> +<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> +<!ENTITY firstrun_secsettings_next "Next"> +<!ENTITY firstrun_tips_tab_title "Tips"> +<!ENTITY firstrun_tips_title "Experience Tips."> +<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> +<!ENTITY firstrun_tips_next "Next"> +<!ENTITY firstrun_onionservices_tab_title "Onions"> +<!ENTITY firstrun_onionservices_title "Onion Services."> +<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> +<!ENTITY firstrun_onionservices_next "Go to explore"> diff --git a/mobile/android/base/locales/moz.build b/mobile/android/base/locales/moz.build index 81edbea9425b..d863a3cc5680 100644 --- a/mobile/android/base/locales/moz.build +++ b/mobile/android/base/locales/moz.build @@ -65,4 +65,5 @@ for f in ['../res/values/strings.xml', # The `en-US/` will be rewritten to the locale-specific path. 'en-US/android_strings.dtd', 'en-US/sync_strings.dtd', + 'en-US/torbrowser_strings.dtd', ] diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index cfc7b5a137f8..2beb152ad5bb 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -8,6 +8,7 @@ #includesubst @BRANDPATH@ #includesubst @STRINGSPATH@ #includesubst @SYNCSTRINGSPATH@ +#includesubst @TBSTRINGSPATH@  <!ENTITY formatI "%I"> diff --git a/python/mozbuild/mozbuild/action/generate_strings_xml.py b/python/mozbuild/mozbuild/action/generate_strings_xml.py index b60b480f0748..0b3ca6efb229 100644 --- a/python/mozbuild/mozbuild/action/generate_strings_xml.py +++ b/python/mozbuild/mozbuild/action/generate_strings_xml.py @@ -11,7 +11,7 @@ import buildconfig from mozbuild import preprocessor -def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None): +def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, torbrowser_strings_dtd, locale=None): if not locale: raise ValueError('locale must be specified!') @@ -23,6 +23,7 @@ def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None # Includes. defines['STRINGSPATH'] = android_strings_dtd defines['SYNCSTRINGSPATH'] = sync_strings_dtd + defines['TBSTRINGSPATH'] = torbrowser_strings_dtd # Fennec branding is en-US only: see # $(MOZ_BRANDING_DIRECTORY)/locales/jar.mn. defines['BRANDPATH'] = '{}/{}/locales/en-US/brand.dtd'.format(

1 0

[tor-browser-build/master] Bug 26843: add projects/firefox-locale-bundle
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 43c9452946313a5ab3dd064501daa05096db86eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 19 13:04:54 2018 +0100 Bug 26843: add projects/firefox-locale-bundle projects/firefox-locale-bundle will clone or pull the mercurial repositories for each locale into the hg_clones/firefox-locale-bundle directory, and generate tarballs using the changesets listed in the firefox json file. The script get_hg_hash is used to parse this json file and output the hg changeset for the selected locale. Patch based on work started by GeKo. --- README | 9 ++++++--- projects/firefox-locale-bundle/build | 29 +++++++++++++++++++++++++++++ projects/firefox-locale-bundle/config | 12 ++++++++++++ projects/firefox-locale-bundle/get_hg_hash | 21 +++++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/README b/README index a20b659..8ebef9b 100644 --- a/README +++ b/README @@ -14,8 +14,10 @@ to extract container file systems, start containers and copy files to and from containers. The sources of most components are downloaded using git, which needs to -be installed. The sources of webrtc are downloaded using gclient, which -requires GTK+ 2.0 development files and curl to be installed. +be installed. Some components are downloaded using mercurial which also +needs to be installed. The sources of webrtc are downloaded using +gclient, which requires GTK+ 2.0 development files and curl to be +installed. You also need a few perl modules installed: - YAML::XS @@ -41,7 +43,8 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git libgtk2.0-dev curl runc + libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ + mercurial The build system is based on rbm, which is included as a git submodule in the rbm/ directory. You can fetch the rbm git submodule by running diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build new file mode 100644 index 0000000..3fec48e --- /dev/null +++ b/projects/firefox-locale-bundle/build @@ -0,0 +1,29 @@ +#!/bin/bash + +[% c("var/set_default_env") -%] + +clone_dir='[% c("basedir") %]/hg_clones/[% project %]' +mkdir -p "$clone_dir" +cd "$clone_dir" +tmpdir=$(mktemp -d) + +[% FOREACH lang = c('var/locales') %] + [% SET lang = tmpl(lang); + SET hgurl = "https://hg.mozilla.org/l10n-central/" _ lang %] + if test -d [% lang %] + then + cd [% lang %] + [% c("hg") %] pull [% hgurl %] + else + [% c("hg") %] clone [% hgurl %] [% lang %] + cd [% lang %] + fi + hg_hash=$([% c("basedir") %]/projects/firefox-locale-bundle/get_hg_hash \ + $rootdir/[% c('input_files_by_name/firefox_json') %] \ + [% lang %]) + [% c("hg") %] archive -r "$hg_hash" -t files "$tmpdir"/[% lang %] + cd .. +[% END %] + +tar -C "$tmpdir" -czf [% dest_dir %]/[% c("filename") %] . +rm -Rf "$tmpdir" diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config new file mode 100644 index 0000000..13c5fb8 --- /dev/null +++ b/projects/firefox-locale-bundle/config @@ -0,0 +1,12 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' + +var: + use_container: 0 + ff_version: '[% pc("firefox", "var/firefox_version") %]' + ff_build: build1 + +input_files: + - name: firefox_json + URL: 'https://product-details.mozilla.org/1.0/l10n/Firefox-[% c("var/ff_version") %]-[% c("var/ff_build") %].json' diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash new file mode 100755 index 0000000..0531113 --- /dev/null +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -0,0 +1,21 @@ +#!/usr/bin/perl -w +use strict; +use File::Slurp; +use JSON; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error("Wrong number of arguments", 1) unless @ARGV == 2; + +my ($file, $locale) = @ARGV; +my $json_text = read_file($file); +exit_error("Error reading $file", 2) unless defined $json_text; + +my $data = decode_json($json_text); + +my $changeset = $data->{locales}{$locale}{changeset}; +exit_error("Can't find locale $locale in $file", 3) unless $changeset; +print "$changeset\n";

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Update Torbutton submodule
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 9a300eedd12c23e1ce48484816df00f4c1a77033 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 21 22:21:36 2018 +0000 Update Torbutton submodule --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ac8d92514940..a41034ced7a6 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd +Subproject commit a41034ced7a6c0fe590320d9da61d15df1fef42f

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27111: Configure tor browser for mobile to load about:tor
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit c0c87e1a9a6573ac480e4b46d232a4b451f6475c Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu Nov 15 07:33:54 2018 -0200 Bug 27111: Configure tor browser for mobile to load about:tor - Add preferences.json: it is used to configure android specific preferences - Keep the ActivityStream HomePager closed when the user clicks in the url bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 2 -- mobile/android/torbrowser/assets/distribution/preferences.json | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 4a497f6999e0..5efd83398775 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -2734,8 +2734,6 @@ public class BrowserApp extends GeckoApp mBrowserToolbar.startEditing(url, animator); - showHomePagerWithAnimator(panelId, null, animator); - animator.start(); Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN); } diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json new file mode 100644 index 000000000000..bebd14967d8e --- /dev/null +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -0,0 +1,10 @@ +{ + "ApplicationPreferences": { + "newtab.load_homepage": true + }, + "AndroidPreferences": { + "homepage": "about:tor", + "startpane_enabled_after_57": true, + "startpane_enabled": true + } +}

1 0

[torbutton/master] Bug 28093: Update donation banner style to make it fit in small screens
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit a41034ced7a6c0fe590320d9da61d15df1fef42f Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Nov 20 11:15:03 2018 -0200 Bug 28093: Update donation banner style to make it fit in small screens --- src/chrome/skin/aboutTor.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 60035a24..cf8290c9 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -431,3 +431,30 @@ body[mobile] .top .heading1 { font-size: 62px; line-height: 1.1 } + +body[mobile] #donation-banner { + position: static; +} + +body[mobile][show-donation-banner="true"] .torcontent-container, +body[mobile][show-donation-banner="true"] .onion-pattern-container { + transform: none; +} + +body[mobile][show-donation-banner="false"] .torcontent-container { + transform: translateY(-200px); +} + +@media only screen and (max-width: 480px) { + #donation-banner-image { + display: none; + } + + #donation-banner-lines { + align-items: stretch; + } + + #donation-banner-button { + text-align: center; + } +}

1 0

[torbutton/master] Bug 27111: Update about:tor desktop version to work on mobile
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 61deb44d0c07eb1ec1d71eac2f0a7aeca87ea054 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Aug 29 07:31:26 2018 -0300 Bug 27111: Update about:tor desktop version to work on mobile Update torbutton, aboutTor(markup and styling) to work on mobile. --- src/chrome/content/aboutTor/aboutTor-content.js | 3 ++ src/chrome/content/aboutTor/aboutTor.xhtml | 2 ++ src/chrome/content/torbutton.js | 23 +++++++++++---- src/chrome/skin/aboutTor.css | 36 ++++++++++++++++++++++++ src/chrome/skin/torbrowser_mobile_logo.png | Bin 0 -> 9345 bytes 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index e8f5ffa2..d34bbe5c 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -119,6 +119,9 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); + if (aData.mobile) + body.setAttribute("mobile", "yes"); + // Setting body.initialized="yes" displays the body. body.setAttribute("initialized", "yes"); }, diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9256748e..94dd13f3 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -18,6 +18,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> + <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton-assets/aboutTor.css"/> @@ -73,6 +74,7 @@ window.addEventListener("pageshow", function() { </script> <div id="torstatus-version"/> <div class="torcontent-container"> + <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 90da5827..ee13f461 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -238,6 +238,10 @@ function torbutton_donation_banner_countdown() { } } +function torbutton_is_mobile() { + return Services.appinfo.OS === "Android"; +} + // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -408,11 +412,19 @@ function torbutton_init() { torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); - createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, - m_tb_control_port, m_tb_control_pass, - "extensions.torbutton.display_circuit"); + try { + createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, + m_tb_control_port, m_tb_control_pass, + "extensions.torbutton.display_circuit"); + } catch(e) { + torbutton_log(4, "Error creating the tor circuit display " + e); + } - torbutton_init_user_manual_links(); + try { + torbutton_init_user_manual_links(); + } catch(e) { + torbutton_log(4, "Error loading the user manual " + e); + } // Arrange for our about:tor content script to be loaded in each frame. window.messageManager.loadFrameScript( @@ -449,6 +461,7 @@ var torbutton_abouttor_message_handler = { // not working. get chromeData() { return { + mobile: torbutton_is_mobile(), torOn: torbutton_tor_check_ok() }; } @@ -1932,7 +1945,7 @@ function showSecurityPreferencesPanel(chromeWindow) { } function setupPreferencesForMobile() { - if (Services.appinfo.OS !== "Android") { + if (!torbutton_is_mobile()) { return; } diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 9f195cfd..60035a24 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -199,6 +199,8 @@ body:not([showmanual]) .showForManual { width: 100%; max-width: 2200px; /* room for our 20 circles */ overflow: hidden; + position: absolute; + bottom: 0px; } .onion-pattern-row { @@ -395,3 +397,37 @@ body[show-donation-banner="true"] #onboarding-overlay-button { transition: transform 0ms; position: absolute; } + +/* + * Mobile specific css + */ + +.torcontent-logo { + display: none; +} + +body[mobile] #torstatus-version, +body[mobile] .searchbox, +body[mobile] .top .heading2, +body[mobile] #bottom { + display: none; +} + +body[mobile] .top { + white-space: normal; + margin-top: 0px !important; +} + +body[mobile] .torcontent-logo { + display: block; + margin-top: 20px; + width: 50%; + height: auto; + margin-left: auto; + margin-right: auto; +} + +body[mobile] .top .heading1 { + font-size: 62px; + line-height: 1.1 +} diff --git a/src/chrome/skin/torbrowser_mobile_logo.png b/src/chrome/skin/torbrowser_mobile_logo.png new file mode 100644 index 00000000..9d8317f0 Binary files /dev/null and b/src/chrome/skin/torbrowser_mobile_logo.png differ

1 0

[tor-browser-build/master] Bug 28476: Enable android nightly builds
by boklm＠torproject.org 21 Nov '18

21 Nov '18

commit 80d0df6b8936729b26544cdb4535b5d1001feaf6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 21 12:02:39 2018 +0100 Bug 28476: Enable android nightly builds Update testsuite_git_commit to enable android nightly builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index af7e03d..5f04029 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git -testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +testsuite_git_commit: 7b0dcd9f21bfde6b097b687c63f84fa579296804 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[torbutton/master] Bug 28540: New text for 2018 donation banner
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 1503b5e151cd8bb528f143f5fdf4513791d3f10f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 13:52:47 2018 -0800 Bug 28540: New text for 2018 donation banner --- src/chrome/locale/en-US/aboutTor.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 6efb202e..a36d812c 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0

[tor-browser-build/master] Bug 28144: Update projects/tor-browser for Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 6028be7e4b62d6ab419258dc3237e395f1dc34e6 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Nov 6 17:54:05 2018 -0800 Bug 28144: Update projects/tor-browser for Android --- projects/tor-browser/build.android | 18 ++++++++++++++++++ projects/tor-browser/config | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android new file mode 100644 index 0000000..24bdc70 --- /dev/null +++ b/projects/tor-browser/build.android @@ -0,0 +1,18 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +ext_dir=assets/distribution/extensions +qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-qa.apk +apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk + +mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %] +cd /var/tmp/build + +mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff(a)eff.org.xpi +mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi + +zip -d $apk META-INF/\* +zip -r $apk $ext_dir + +# Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest +keytool -genkey -v -keystore qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US" +jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index bb1c259..e4e3a03 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -41,29 +41,41 @@ targets: windows-x86_64: var: mar_osname: win64 + android-armv7: + build: '[% INCLUDE build.android %]' + var: + arch_deps: + - openjdk-8-jdk input_files: - project: container-image - filename: run_scripts + enable: '[% ! c("var/android") %]' - project: firefox name: firefox - project: tor name: tor + enable: '[% ! c("var/android") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% c("var/locales").size %]' + enable: '[% c("var/locales").size && ! c("var/android") %]' - project: tor-launcher name: tor-launcher + enable: '[% ! c("var/android") %]' - project: torbutton name: torbutton + enable: '[% ! c("var/android") %]' - project: https-everywhere name: https-everywhere - project: fonts name: fonts + enable: '[% ! c("var/android") %]' - project: meek name: meek + enable: '[% ! c("var/android") %]' - project: obfs4 name: obfs4 + enable: '[% ! c("var/android") %]' - project: fteproxy name: fteproxy enable: '[% c("var/fteproxy") %]' @@ -71,6 +83,7 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data + enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9

1 0

[tor-browser-build/master] Bug 28468: Modify Android toolchain to support Orbot
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 5e3b6403e384198f0f85c482777970340333bc5a Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:18:52 2018 -0800 Bug 28468: Modify Android toolchain to support Orbot --- projects/android-toolchain/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 122ae5f..c14f90e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -13,6 +13,8 @@ var: export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export ANDROID_HOME=$ANDROID_SDK_HOME + export GRADLE_USER_HOME=$GRADLE_HOME google_repo: https://dl.google.com/android/repository input_files: - project: container-image

1 0

[tor-browser-build/master] Bug 28483: Modify Android Toolchain API Version
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit d66abd6cb81944bb24f9ec4255a5311bdebf58da Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:17:26 2018 -0800 Bug 28483: Modify Android Toolchain API Version --- projects/android-toolchain/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 325a543..a9d3139 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -17,7 +17,8 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm +# API 16 is the minimum we currently support for Tor Browser on Android +./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm # Tool Archives cd $SDK_HOME

1 0

[tor-browser-build/master] Bug 28472: Add Android Makefile Rules
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 836a8b56606978fa7a140cfd1a9d9ddb6b2e41e2 Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Nov 15 20:27:38 2018 -0800 Bug 28472: Add Android Makefile Rules --- Makefile | 15 +++++++++++++++ projects/release/build | 4 ++++ projects/release/config | 11 +++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile b/Makefile index 4c21a83..8ec5d0c 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: release release: submodule-update $(rbm) build release --target release --target torbrowser-all +release-android-armv7: submodule-update + $(rbm) build release --target release --target torbrowser-android-armv7 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all +alpha-android-armv7: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-armv7 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all +nightly-android-armv7: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-armv7 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update alpha_nightly: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-all +alpha_nightly-android-armv7: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all +testbuild-android-armv7: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-armv7 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/release/build b/projects/release/build index 882d26d..2c9912f 100644 --- a/projects/release/build +++ b/projects/release/build @@ -4,6 +4,10 @@ [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" +[% IF c("var/torbrowser-android-armv7") -%] + mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ + [% RETURN %] +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index 8605aa2..65e297d 100644 --- a/projects/release/config +++ b/projects/release/config @@ -14,6 +14,10 @@ targets: - torbrowser-windows-i686 - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 + - torbrowser-android-armv7 + torbrowser-android-armv7: + var: + torbrowser-android-armv7: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -80,6 +84,13 @@ targets: input_files: # Release + - name: android-armv7 + project: tor-browser + enable: '[% c("var/torbrowser-android-armv7") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-armv7 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]'

1 0

[torbutton/master] Translations updates
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 50d2baa2788db45036b7f614ec21ce2dbcb53b7e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 20 09:29:37 2018 +0000 Translations updates --- src/chrome/locale/fa/aboutTor.dtd | 2 +- src/chrome/locale/fa/browserOnboarding.properties | 16 ++++++++-------- src/chrome/locale/fa/torbutton.properties | 4 ++-- src/chrome/locale/ja/torbutton.dtd | 4 ++-- src/chrome/locale/ka/aboutTor.dtd | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 2 +- src/chrome/locale/sv/aboutTor.dtd | 4 ++-- src/chrome/locale/sv/brand.dtd | 6 +++--- src/chrome/locale/sv/brand.properties | 6 +++--- src/chrome/locale/sv/browserOnboarding.properties | 6 +++--- src/chrome/locale/sv/torbutton.dtd | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index be1440b7..da917341 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "درباره‌ی تور"> <!ENTITY aboutTor.ready.label "کاوش. خصوصی."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "شما برای تجربه خصوصی‌ترین مرور اینترنت در جهان آماده هستید."> <!ENTITY aboutTor.failure.label "خطایی پیش آمده است!"> <!ENTITY aboutTor.failure2.label "تور با این مرورگر کار نمی‌کند."> diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties index e0ab4338..2dcbded9 100644 --- a/src/chrome/locale/fa/browserOnboarding.properties +++ b/src/chrome/locale/fa/browserOnboarding.properties @@ -3,14 +3,14 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=خوش آمدید -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=شما آماده هستید. +onboarding.tour-tor-welcome.description=مرورگر تور در هنگام مرورگری وب بالاترین استاندارد در حریم شخصی و امنیت را به شما ارائه می‌دهد. شما حالا در برابر ردیابی, زیرنظر داشتن و سانسور محافظت می‌شوید. چگونگی این امر توسط این پذیرش سازمانی سریع به شما نشان داده خواهد شد. +onboarding.tour-tor-welcome.button=همین حالا شروع کن. onboarding.tour-tor-privacy=حریم خصوصی onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.button=به شبکه تور برو onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. @@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=مشاهده پرسشگان onboarding.tour-tor-onion-services=خدمات پیازی onboarding.tour-tor-onion-services.title=Be extra protected. @@ -40,9 +40,9 @@ onboarding.tour-tor-onion-services.button=Visit an Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=بعدی onboarding.tor-circuit-display.done=انجام شد -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=۱ از ۳ +onboarding.tor-circuit-display.two-of-three=۲ از ۳ +onboarding.tor-circuit-display.three-of-three=۳ از ۳ onboarding.tor-circuit-display.intro.title=How do circuits work? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index a239e685..3f90df0c 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = این مرورگر torbutton.circuit_display.relay = بازپخش torbutton.circuit_display.tor_bridge = پل torbutton.circuit_display.unknown_country = کشور ناشناخته -torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard = محافظ torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = اطلاعات بیشتر torbutton.content_sizer.margin_tooltip = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود. @@ -52,4 +52,4 @@ profileMigrationFailed=مهاجرت ناموفق از پروفایل %S.\nتنظ # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryption=ارتباط رمزگذاری شد (سرویس پیازی) diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 359dcf48..65368394 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "いくつかのフォントと数学記号が無効化されます。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "いくつかのアイコン、数学記号および画像が無効化されます。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "オーディオとビデオ(HTML5メディア)はクリックすると再生されます。"> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "Tor サーキット"> +<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index f232c0ba..f6b9dd76 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "ხ"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor-ბრაუზერის სახელმძღვანელო"> -<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან ორგანიზაციას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას, უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან დაცული ტექნოლოგიების შექმნითა და შემუშავებით, მათთან შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომი კვლევებითა და მუშაობით , საზოგადოების ცნობიერების დონის ასამაღლებლად."> +<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან ორგანიზაციას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას, უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან ასარიდებელი საშუალებების შექმნითა და გავრცელებით, მათზე შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომ კი მათთან დაკავშირებ ით მეცნიერული გაგებისა და საზოგადოების ცნობიერების დონის ამაღლებით."> <!ENTITY aboutTor.getInvolved.label "შემოგვიერთდით »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index 7b757280..781f545a 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ <!ENTITY aboutTBUpdate.title "Tor Browser-uppdatering"> -<!ENTITY aboutTBUpdate.updated "Tor-webbläsaren har uppdaterats."> +<!ENTITY aboutTBUpdate.updated "Tor Browser har uppdaterats."> <!ENTITY aboutTBUpdate.linkPrefix "För den senaste information om den här versionen,"> <!ENTITY aboutTBUpdate.linkLabel "besök vår hemsida"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 76dcfa01..110322e4 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -15,10 +15,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor-webbläsaren »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor-webbläsaren"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor Browser"> <!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> <!ENTITY aboutTor.getInvolved.label "Engagera dig »"> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 43a95e12..797bdb92 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -2,9 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor-webbläsaren"> -<!ENTITY brandShortName "Tor-webbläsaren"> -<!ENTITY brandFullName "Tor-webbläsare"> +<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor-projektet"> <!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotyperna är varumärken som tillhör Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 7c215e54..555e01e6 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor webbläsaren -brandShortName=Tor webbläsaren -brandFullName=Tor webbläsaren +brandShorterName=Tor Browser +brandShortName=Tor Browser +brandFullName=Tor Browser vendorShortName=Tor-projektet homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties index 779564db..8cc7e3f1 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv/browserOnboarding.properties @@ -4,17 +4,17 @@ onboarding.tour-tor-welcome=Välkommen onboarding.tour-tor-welcome.title=Du är redo. -onboarding.tour-tor-welcome.description=Tor-webbläsaren erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. +onboarding.tour-tor-welcome.description=Tor Browser erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. onboarding.tour-tor-welcome.button=Börja nu onboarding.tour-tor-privacy=Sekretess onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. -onboarding.tour-tor-privacy.description=Tor-webbläsaren isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. +onboarding.tour-tor-privacy.description=Tor Browser isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. onboarding.tour-tor-privacy.button=Gå till Tor-nätverket onboarding.tour-tor-network=Tor-nätverk onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. -onboarding.tour-tor-network.description=Tor-webbläsaren ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.description=Tor Browser ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. onboarding.tour-tor-network.button=Gå till kretsvisning onboarding.tour-tor-circuit-display=Kretsvisning diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 4bbc35a8..067b45b3 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -6,12 +6,12 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-nätverksinställningar..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor webbläsare..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Klicka för att initialisera Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor-webbläsares säkerhetsinställningar"> +<!ENTITY torbutton.prefs.security_settings "Säkerhetsinställningar i Tor Browser"> <!ENTITY torbutton.prefs.restore_defaults "Återställ standard"> <!ENTITY torbutton.prefs.custom_warning "Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna."> <!ENTITY torbutton.cookiedialog.title "Hantera Cookies skydd">

1 0

[torbutton/master] Bug 27701 - Don't show App Blocker on Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 82729ba49f026a03966adb75b6b7737d71579967 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 17:12:03 2018 +0000 Bug 27701 - Don't show App Blocker on Android --- src/modules/default-prefs.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/default-prefs.js b/src/modules/default-prefs.js index d4c948f8..6a2bd86c 100644 --- a/src/modules/default-prefs.js +++ b/src/modules/default-prefs.js @@ -21,6 +21,12 @@ function ensureDefaultPrefs () { Services.console.logStringMessage( `Preference ${aPrefName} with value ${aValue} has an invalid value type`); } + + // Disable the External App Blocker on Android + if ((aPrefName === "extensions.torbutton.launch_warning") && + (Services.appinfo.OS === "Android")) { + defaultPrefBranch.setBoolPref(aPrefName, false); + } } }; Services.scriptloader.loadSubScript(kDefaultPreferences, context);

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27256 - Enable TouchEvents on Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 0b188f1fd0349fc76f8cc5663279a67b283d3b68 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 16 04:03:09 2018 +0000 Bug 27256 - Enable TouchEvents on Android This allows highlighting/selecting text by long pressing. Thanks to towiw for the info. --- mobile/android/app/000-tor-browser-android.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index 04a613092e6d..c329fcdee5f7 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -61,3 +61,6 @@ pref("network.proxy.socks_port", 9050); pref("xpinstall.enabled", false); pref("extensions.enabledScopes", 1); pref("extensions.autoDisableScopes", 1); + +// Enable touch events on Android (highlighting text, etc) +pref("dom.w3c_touch_events.enabled", 2);

1 0

[torbutton/master] Bug 28515: Use en-US for english Torbutton strings
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 6a10722355e8c457df9cfcacde22cd3d2f04e5a3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 19 09:20:09 2018 +0000 Bug 28515: Use en-US for english Torbutton strings There is no `en` in Mozilla's universe and we need `en-US` for Torbutton integration into `tor-browser` (see: #25013). Thus, switch our locale code for english in Torbutton accordingly. The server-side of this switch got done in #28261 and the workaround for that, which was symlinking `en` to `en-US`, is not needed anymore. --- makexpi.sh | 4 ++-- src/chrome.manifest | 2 +- src/chrome/locale/en | 1 - trans_tools/import-translations.sh | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index aa3e665b..243fbd6b 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ---------- # create the pkg directory if it doesn't exist yet mkdir -p pkg cd src -echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*" -zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*" +echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" +zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*" #mv ../$APP_NAME.jar ./chrome #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar cd .. diff --git a/src/chrome.manifest b/src/chrome.manifest index 18c5f5b9..33199ccf 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -45,7 +45,7 @@ locale torbutton da chrome/locale/da/ locale torbutton de chrome/locale/de/ locale torbutton dz chrome/locale/dz/ locale torbutton el chrome/locale/el/ -locale torbutton en chrome/locale/en/ +locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ locale torbutton es chrome/locale/es/ locale torbutton et chrome/locale/et/ diff --git a/src/chrome/locale/en b/src/chrome/locale/en deleted file mode 120000 index f2b0341f..00000000 --- a/src/chrome/locale/en +++ /dev/null @@ -1 +0,0 @@ -en-US \ No newline at end of file diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 8f562208..00de8243 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -28,7 +28,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" # Verify that the FILEMAP contains an entry for each Torbutton file. FILES_ARE_MISSING=0 -for DEST_PATH in $LOCALE_DIR/en/*.dtd $LOCALE_DIR/en/*.properties; +for DEST_PATH in $LOCALE_DIR/en-US/*.dtd $LOCALE_DIR/en-US/*.properties; do IS_FILE_IN_MAP=0 DEST_FILE=${DEST_PATH##*/}

1 0

[tor-browser-build/master] Bug 27443: Update Firefox RBM config and build for Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit b068c56f0ae00663e267ae0c6a2c89dd06f6ea20 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Sep 4 09:47:14 2018 -0700 Bug 27443: Update Firefox RBM config and build for Android --- projects/firefox/build | 14 +- projects/firefox/config | 12 + projects/firefox/gradle-dependencies-list.txt | 358 ++++++++++++++++++++++++++ projects/firefox/mozconfig-android-armv7 | 49 ++++ 4 files changed, 431 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index c73590d..d210b7a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,6 +1,10 @@ #!/bin/bash [% c("var/setarch") -%] [% c("var/set_default_env") -%] +[% IF c("var/android") %] + export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" +[% END -%] + [% IF c("var/windows") -%] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] # We need a link to our GCC, otherwise the system cc gets used which points to @@ -10,6 +14,7 @@ [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build +mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/windows") -%] mingwdir=/var/tmp/dist/mingw-w64 @@ -143,6 +148,13 @@ rm -f js/src/configure ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts ./mach build --verbose + +[% IF c("var/android") %] + ./mach package + cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk + [% RETURN %] +[% END %] + ./mach build stage-package [% IF c("var/osx") %] @@ -257,8 +269,6 @@ cd $distdir [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/browser/omni.ja"' }) %] [% END %] -mkdir -p [% dest_dir _ '/' _ c('filename') %] - [% IF c("var/osx"); SET browserdir='"Tor Browser.app/Contents"'; diff --git a/projects/firefox/config b/projects/firefox/config index dfdf2c4..9f88ae8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -4,6 +4,7 @@ filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git +git_submodule: 1 gpg_keyring: torbutton.gpg var: @@ -21,6 +22,8 @@ var: - python container: use_container: 1 + # this should be updated when the list of gradle dependencies is changed + gradle_dependencies_version: 2 targets: release: @@ -33,6 +36,11 @@ targets: var: torbrowser_update_channel: default + android-armv7: + var: + arch_deps: + - openjdk-8-jdk + linux: var: arch_deps: @@ -120,3 +128,7 @@ input_files: enable: '[% c("var/linux") %]' - filename: start-firefox enable: '[% c("var/linux") %]' + - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' + name: gradle-dependencies + exec: '[% INCLUDE "fetch-gradle-dependencies" %]' + enable: '[% c("var/android") %]' diff --git a/projects/firefox/gradle-dependencies-list.txt b/projects/firefox/gradle-dependencies-list.txt new file mode 100644 index 0000000..f96af50 --- /dev/null +++ b/projects/firefox/gradle-dependencies-list.txt @@ -0,0 +1,358 @@ +# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# Don't forget to update var/gradle_dependencies_version when modifying this file +sha256sum | url +f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.14/an… +fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom +50cadbcd70d80cf627661628e9d5163fe4f0757b87e89e68b43663b509c031d5 | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-… +1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.… +315a79bf0beee4a355ebe36de326b7b9b22a1ecdf22badd7e1bb2af94429bff1 | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7… +f2abf7db3c5937fe021fd66f8bd2d9460cf2c9b1ad8efa0abb797d778390b22f | https://jcenter.bintray.com/com/squareup/haha/haha/2.0.2/haha-2.0.2.pom +d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep… +0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/5.3.3/proguard-… +e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup… +d5831ee4f71055800821a34a3051cf1ed5b3702f295ffebd50f65fb5d81a71b8 | https://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/mockito-core-1… +fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom +7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-… +b5b46ac0c09da41b04dbc753456b48912856a7ffbb1490676910b510c471d13f | https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.pom +e6d920d5a1a34aaaebab1e6a82c36bbfd61f1eeaabc4534ee05d4faad56f1b7a | https://jcenter.bintray.com/org/apache/ant/ant/1.8.0/ant-1.8.0.pom +9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://jcenter.bintray.com/org/apache/apache/4/apache-4.pom +56057490cbc1eeae6227e6eb5c6d5b324b77429b8a78d15027c77d491ef9c675 | https://jcenter.bintray.com/org/ow2/asm/asm/5.0.1/asm-5.0.1.jar +85c3c8840bb21554faf159998146f7ca9ef1b951defb29ec4e8252ec463728fd | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b… +47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json… +857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin… +2ca121831e597b4d8f2cb22d17c5c041fc23a7777ceb6bfbdd4dfb34bbe7d997 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-utils/1.5.15/plexus-… +ecaffef655fea6b138f0855a12f7dbb59fc0d6bffb5c1bfd31803cccb49ea08c | https://jcenter.bintray.com/org/apache/maven/maven-profile/2.2.1/maven-prof… +f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc… +70f418efbb506c5155da5f9a5a33262ea08a9e4d7fea186aa9015c41a7224ac2 | https://jcenter.bintray.com/org/hamcrest/hamcrest-integration/1.3/hamcrest-… +fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.… +fb1cb7fa27d892712ced8fbf8d027eb5052ecd3999dba1ba47824357accb40e7 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1… +38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://maven.google.com/com/android/tools/analytics-library/shared/26.0.1/… +b46b548f116a5dd5b018e6f1f4760fe04f93aecdbea094c2f0890e8bf690ada3 | https://jcenter.bintray.com/org/robolectric/shadows-framework/3.5.1/shadows… +343b1a3093410e3fb26c66998423ab389c3a7441cd1a8859bd327dd15b479aa4 | https://jcenter.bintray.com/org/objenesis/objenesis-parent/2.1/objenesis-pa… +ff2aceed10da9930a44f6c8f81c6372d5e55eb59c4e0ea9d37f77dfd765fa9fa | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.jar +f1226fd07fc72af8d6232bdfa70bf31d883a1a01cbc547f23a74e9066c692df1 | https://jcenter.bintray.com/com/google/guava/guava-parent/20.0/guava-parent… +6d535f94efb663bdb682c9f27a50335394688009642ba7a9677504bc1be4129b | https://jcenter.bintray.com/org/hamcrest/hamcrest-parent/1.3/hamcrest-paren… +1ceb4bfb0f098ae29b935044b2363e11323313fe3ed2055df8b79737d5056277 | https://jcenter.bintray.com/org/hamcrest/hamcrest-library/1.3/hamcrest-libr… +419487d0c123d11cc6e1a12da517d02958ee1de209f1e1855bb14f5dd3759bb0 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/… +4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://maven.google.com/com/android/tools/annotations/26.0.1/annotations-2… +597b54cc1a494799d783921c6ac04352f33e94fca8e00f299d4ca192db79e3fc | https://jcenter.bintray.com/org/robolectric/shadows-framework/3.5.1/shadows… +f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e | https://jcenter.bintray.com/com/squareup/javawriter/2.1.1/javawriter-2.1.1.… +ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o… +4a028c17c75cce301e13fdfbc0750ceb48a166dd1013ee516a49684472fcf0e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/… +1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba… +b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco… +e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://maven.google.com/com/android/tools/build/builder-model/3.0.1/builde… +3c09321a4140cbbaf50ceefb08f249e2a033eef78dc6efc3d3022515b05a0cda | https://maven.google.com/com/android/support/customtabs/23.4.0/customtabs-2… +c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80 | https://jcenter.bintray.com/org/objenesis/objenesis/2.1/objenesis-2.1.jar +d1e247c4ed3952385fd704ac9db2a222247cfe7d20508b4f3c76b90f857952ed | https://jcenter.bintray.com/org/apache/maven/maven-artifact-manager/2.2.1/m… +db50fbb16778e5ff47eaf46a2b63891c546911e7bde06c068ecbe9806b02c672 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5… +7b5da383a465a071e90eac4a5e615992a499d9776938305d7581d8abbf3b13e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-runner/1.1… +3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.p… +2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://maven.google.com/com/android/tools/external/org-jetbrains/uast/26.0… +e37a4467bac5cdeb02c5c4b8e5063d2f4e67b69e3c7df6d6b610f13185572bab | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.jar +a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1… +a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot… +d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://maven.google.com/com/android/support/appcompat-v7/23.4.0/appcompat-… +14db0f7d2299c5400ff7764bb37b4fa80306582d8965fdf6999091723e2384ce | https://jcenter.bintray.com/org/robolectric/annotations/3.5.1/annotations-3… +be214032de23c6b520b79c1ccdb160948e0c67ed7c11984b7ec4ca5537867b4e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-lightweight/1… +31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom +8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.… +5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26… +aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://maven.google.com/com/android/tools/lint/lint/26.0.1/lint-26.0.1.jar +ff9988062651ac02bfcafd3aa4302f9366fac66d4ad639b36530193afdbdd67b | https://jcenter.bintray.com/org/robolectric/utils/3.5.1/utils-3.5.1.pom +59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.jar +beff8c3c1e840e0f7f78aadef170f347bae349f098babfc176765f499a4bcbb5 | https://jcenter.bintray.com/org/robolectric/sandbox/3.5.1/sandbox-3.5.1.jar +91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff | https://jcenter.bintray.com/javax/inject/javax.inject/1/javax.inject-1.jar +52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client… +50eb253acd0b6ee048f432d9fc3a3b36264efb3da1ffa7fb07f6c4d4b7a8ca31 | https://jcenter.bintray.com/org/codehaus/codehaus-parent/3/codehaus-parent-… +95b8b357d19f63797dd7d67622fd3f18374d64acbc6584faba1c7759a31e8438 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.… +603cf898f93b854f18021fab452aca3fe482368eeb2e720988ae82212ebcf4b6 | https://jcenter.bintray.com/org/robolectric/robolectric/3.5.1/robolectric-3… +2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3 | https://jcenter.bintray.com/classworlds/classworlds/1.1-alpha-2/classworlds… +1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.… +567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle… +8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom +401429d864e4c28b0ef7bc9213ac7b48989f8a9a26db200abb8c65f41f5a503e | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.pom +b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.pom +30b09c7504768820bfd8572ffcf8c2c55a668ecff6ca3e125906d00bf393a082 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-… +e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://maven.google.com/com/android/tools/build/gradle-api/3.0.1/gradle-ap… +0397963405810796ee2d9527e9d1e1a2ed9c44cdb83cdd6959a4ee148ab56fbe | https://jcenter.bintray.com/org/robolectric/sandbox/3.5.1/sandbox-3.5.1.pom +363cc83767b760d7a564d5301e09467e6d48fc1c1c1664b1e18c50815ce19076 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.pom +58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c… +b7134929f7cc7c04021ec1cc27ef63ab907e410cf0588e397b8851181eb91092 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.jar +cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom +3759796aab6669f10d58d6f6ef1b25a8a9ca4f7ec48bd47ad5141dd1f0865a38 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-… +0156d3f3f54a82eda56285b82aa85caadfdf00d90cde549f7091e0bb0702aad2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotli… +21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://jcenter.bintray.com/org/apache/httpcomponents/project/4.1.1/project… +7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128… +616da56b2e90bf055b90436800259a8f82715f8e03307c512483328380a51248 | https://jcenter.bintray.com/org/simpleframework/simple-transport/6.0.1/simp… +5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://maven.google.com/com/android/tools/lint/lint-checks/26.0.1/lint-che… +cf3d36efa6d760c6901a21fb14d9eab6553454742ecc4c5c484e2a347cdac4ea | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi… +8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://jcenter.bintray.com/org/apache/commons/commons-parent/5/commons-par… +87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://jcenter.bintray.com/org/apache/commons/commons-parent/39/commons-pa… +10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://maven.google.com/com/android/tools/analytics-library/tracker/26.0.1… +e246e2a062b5d989fdefc521c9c56431ba5554ff8d2344edee9218a34a546a33 | https://jcenter.bintray.com/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.p… +d53062ffe8677a4f5e1ad3a1d1fa37ed600fab39166d39be7ed204635c5f839b | https://jcenter.bintray.com/org/apache/maven/maven-artifact/2.2.1/maven-art… +f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-… +7b0cdb372fbde4e801f76bdb416927162ebd32c0c4e53fa39828437d3112c9d5 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android-no-o… +5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client… +0ec9e69539aa51350a7d295003d8e7f36007d9cd4a3b93730994a24ada5a11c5 | https://maven.google.com/com/android/support/test/exposed-instrumentation-a… +9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom +90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4 | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.pom +ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… +bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/… +668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://maven.google.com/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.… +bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.pom +2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom +5f1d5eab6940ece3ebb73691d8a60434d8d1e330176442be8f35a1585345b2ec | https://maven.google.com/com/android/support/design/23.4.0/design-23.4.0.aar +8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom +a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://maven.google.com/com/android/tools/repository/26.0.1/repository-26.… +24ddb65b7a6c3befb6267ce5f739f237c84eba99389265c30df67c3dd8396a40 | https://jcenter.bintray.com/org/apache/maven/maven-project/2.2.1/maven-proj… +3a0a524d3540d005d4df0ca39305fce1972f0d2d966d9b8e6bdb956011501584 | https://maven.google.com/com/android/support/test/runner/0.5/runner-0.5.pom +c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom +d125b3ade9f694ae60ef835f5ae000b6ba35fba8c34bafd8b40a1961375e63fa | https://jcenter.bintray.com/org/apache/maven/maven-profile/2.2.1/maven-prof… +f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://jcenter.bintray.com/org/jacoco/org.jacoco.build/0.7.4.201502262128/… +54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1… +631b213b1b10c00c900aad759c88ed0c83084bae76336ad00dcfe1f24c48be65 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable… +1bd627d7252500462075f4a08cd0db4dbbf1ccecc08b093709551b54c8649085 | https://jcenter.bintray.com/org/simpleframework/simple-transport/6.0.1/simp… +965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… +6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://jcenter.bintray.com/org/codehaus/codehaus-parent/4/codehaus-parent-… +905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.… +1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.jar +36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.jar +63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://maven.google.com/com/android/tools/build/builder-model/3.0.1/builde… +31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime… +ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom +e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://maven.google.com/com/android/tools/analytics-library/shared/26.0.1/… +ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c… +a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://maven.google.com/com/android/support/support-v4/23.4.0/support-v4-2… +b9c445604a16b15c4269485d569252a53e3094efc8a0c252e09dee1f2f204568 | https://jcenter.bintray.com/org/robolectric/annotations/3.5.1/annotations-3… +6d574f9ae0922791eb8f06979f0010997d4b862c7aec96d485ae797ddfc13278 | https://jcenter.bintray.com/org/robolectric/shadowapi/3.5.1/shadowapi-3.5.1… +8ba35dd4ea1647b89a8ae082bb6c81d5695a1ec31e73aa57bfa3512069c4bee2 | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-… +d135cff96dcbbc8a5fab30180e557cae620373cf26941d4c738a88896a2d98ed | https://jcenter.bintray.com/org/apache/maven/maven/2.2.1/maven-2.2.1.pom +3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/34/mojo-parent-34… +258f12f1facc44d0b25b9fa2bde33a58f3de9eea412588ff47922c9cac910a5a | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7… +712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://maven.google.com/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.… +949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://maven.google.com/com/android/tools/lint/lint-checks/26.0.1/lint-che… +1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… +fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://jcenter.bintray.com/org/apache/commons/commons-parent/22/commons-pa… +cf5c43860b53ba5a95c19bc6525cc43d3488a6fe3df2f649c0099a613a0640e3 | https://jcenter.bintray.com/com/google/code/gson/gson-parent/2.8.2/gson-par… +3ec9d39b3e35fad9aab1e6b137466ce2190f88aee897cffa383e94a65287105e | https://jcenter.bintray.com/com/jayway/android/robotium/robotium-solo/5.5.4… +953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom +4ad0673155d7e0e5cf6d13689802d8d507f38e5ea00a6d2fb92aef206108213d | https://jcenter.bintray.com/org/apache/maven/maven-plugin-registry/2.2.1/ma… +12a3c9a32b82fdc95223cab1f9d344e14ef3e396da14c4d0013451646f3280e7 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-utils/1.5.15/plexus-… +f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-… +fdff6cfa9ed9cc911c842a5d2395f209ec621ef1239d46810e9e495809d3ae09 | https://jcenter.bintray.com/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.jar +ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://maven.google.com/com/android/tools/external/org-jetbrains/uast/26.0… +cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.0.18… +ef71d45a49edfe76be0f520312a76bc2aae73ec0743a5ffffe10d30122c6e2b2 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-container-default/1.… +fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.… +b3005544708f8583e455c22b09a4940596a057108bccdadb9db4d8e048091fed | https://jcenter.bintray.com/org/apache/maven/maven-error-diagnostics/2.2.1/… +e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://maven.google.com/com/android/tools/layoutlib/layoutlib-api/26.0.1/l… +1a5c870be804f9041c1392606c19ef5a8ae503e79705962c2f8452c51cb0d27c | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-analyzer/1.4… +2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json… +153b32f474fd676ec36ad807c508885005139140fc92168bb76bf6be31f8efb8 | https://jcenter.bintray.com/org/apache/maven/maven-model/2.2.1/maven-model-… +1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr… +6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://maven.google.com/com/android/tools/repository/26.0.1/repository-26.… +5fe283f47b0e7f7d95a4252af3fa7a0db4d8f080cd9df308608c0472b8f168a1 | https://jcenter.bintray.com/org/apache/maven/maven-repository-metadata/2.2.… +07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.… +c5f51e723e84eee14c339170730b4e590342732e1560747ae559585a6ae09a0d | https://jcenter.bintray.com/org/robolectric/robolectric/3.5.1/robolectric-3… +1870cb5f561ac94760064c5eff8d4259692dd5845680113e78ed9b239e6cf34a | https://jcenter.bintray.com/org/simpleframework/simple-http/6.0.1/simple-ht… +58a4152e2ea975e955393d49ed23f3c88fa8368d75d2290fb2c28373a6c5a977 | https://maven.google.com/com/android/support/test/runner/0.5/runner-0.5.aar +340422be8f3e3c847a0a0bf944296774f6db81f2fa8b34912bc931a112a26919 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-providers/1.0-beta… +e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep… +34af0baedaef19375b7c1a7da967e9089d5e0754647fdbe9a302590392874b77 | https://jcenter.bintray.com/org/apache/maven/maven-project/2.2.1/maven-proj… +a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://maven.google.com/com/android/tools/sdk-common/26.0.1/sdk-common-26.… +ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar +f4778bb3abf2df40bfa365d00ff301b5eec76f2933b85f6aa3918e2ab6f08b91 | https://maven.google.com/com/android/support/design/23.4.0/design-23.4.0.pom +f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http… +9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup… +4054f186137e3b849a7c23c9e846cd57d8a2fe32c17d4c62bd420512d74c3d3f | https://jcenter.bintray.com/org/objenesis/objenesis/2.1/objenesis-2.1.pom +645e30c1a93c6b50c918c14cea11e1f41015153fe6329149ad17d930e820be4a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5… +a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.j… +2242fd02d12b1ca73267fb3d89863025517200e7a4ee426cba4667d0172c74c3 | https://jcenter.bintray.com/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.p… +feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.… +0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom +d47fc646324c22c66f2b0e0e743c850dde9a51990c53925e7501d960f2e8df84 | https://jcenter.bintray.com/com/squareup/javawriter/2.1.1/javawriter-2.1.1.… +9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05 | https://jcenter.bintray.com/com/almworks/sqlite4java/sqlite4java/0.282/sqli… +467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://jcenter.bintray.com/org/apache/commons/commons-parent/25/commons-pa… +ee4e1227673b6ba0b462b567f011b88b6e4e4cd044e1c9734ffb1a2ff80d7ee7 | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1… +51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://jcenter.bintray.com/org/ow2/ow2/1.3/ow2-1.3.pom +e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco… +e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128… +7c758612888782ccfe376823aee7cdcc7e0cdafb097f7ef50295a0b0c3a16edf | https://jcenter.bintray.com/org/codehaus/plexus/plexus-container-default/1.… +362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http… +df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/… +7b0aa6ed7553597ce0610684a9f7eca8021eee218f2e2f427c04a7fbf5f920bd | https://jcenter.bintray.com/com/google/android/apps/common/testing/accessib… +40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc… +ecf58351f8fe0c398b8b452216705bece5291b9b327d30202c16b28ac680450c | https://jcenter.bintray.com/org/apache/maven/maven-artifact-manager/2.2.1/m… +b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.j… +fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.… +dce95c6e899e42925697aa961b4f01ced3211003cd2101df93ce9d52bb3c3d0a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-runner/1.1… +c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar +70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar +ecbd655fd71d298eaf0787045b84324ce68936ad0de98c7a9c55538e539f2747 | https://jcenter.bintray.com/org/apache/ant/ant-parent/1.8.0/ant-parent-1.8.… +c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://jcenter.bintray.com/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-… +0dc4d181e4d347893c2ddbd2e6cd5d7287fc651c03648fa64b2341c7366b1773 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk… +34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63 | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar +db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime… +f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.… +c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://jcenter.bintray.com/com/android/tools/annotations/24.5.0/annotation… +d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://maven.google.com/com/android/support/appcompat-v7/23.4.0/appcompat-… +f095c882716d49269a806685dcb256fa6a36389b2713ac56bb758bf8693565a2 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be… +e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui… +22a5564590c8bfd8df7efb2b0c7d9942b46a0beb59ba38899d59c1270f293b1c | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1… +9884c02d47244364e1fb27675b5ef3b206a2d2d3141ac77f57fd771a175c2a2f | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.p… +7e4a34c7b63d879c5cec454e2e47eb1e61e271a58672e7e548659f4f23742500 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk… +ef5ff4dc0257c1eebed07da22b4695ffdd3030da8d224282fb9c565b56cf2f24 | https://jcenter.bintray.com/org/simpleframework/simple-http/6.0.1/simple-ht… +6422a1f272022e3153ed68af04e5a03548fe48061ed2846c044df84e02abb143 | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.pom +e263064a6ebeba4209d1abb089f9fff5194d79bb011b525d276b3994025123e0 | https://maven.google.com/com/android/support/test/rules/0.5/rules-0.5.aar +23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c… +b2e81b7d5a22755f2ea76aa9bbbd4359d61c4cb9577193ccfbb8f97378ed293b | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.jar +5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… +e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.… +757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar… +8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr… +711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c | https://jcenter.bintray.com/org/hamcrest/hamcrest-library/1.3/hamcrest-libr… +7bc4c7f999b9c673c714f7f8adb6281b11b8f14d5821a2b860c3d60c24518c66 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-… +faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.… +cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2… +401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5… +d19c24122f9f70221e8d97a54f48fbf43feba5b003963057458982e0407aab42 | https://jcenter.bintray.com/com/jayway/android/robotium/robotium-solo/5.5.4… +52d73f35f7e638ce3cb56546f879c20e7f7019f72aa20cde1fa80e97865dfd40 | https://jcenter.bintray.com/javax/annotation/javax.annotation-api/1.2/javax… +7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://maven.google.com/com/android/tools/sdk-common/26.0.1/sdk-common-26.… +0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e | https://jcenter.bintray.com/org/apache/ant/ant/1.8.0/ant-1.8.0.jar +b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom +d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.jar +c9268e671899430946b54c4d1b93c30f0db1b7df0b39b3c6279d6bd475a6fbdc | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream-parent/1.4.8/x… +fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://maven.google.com/com/android/support/support-v4/23.4.0/support-v4-2… +d46777ad3ea8bca73491b2e02fc85b3664486abf5314cc4dc6740908bd855330 | https://jcenter.bintray.com/com/google/android/apps/common/testing/accessib… +781ae7e6a1ae87e55b3e0a19a441bafd385f4ed9b5b4bd6316ec9bc6952d0273 | https://maven.google.com/com/android/support/test/exposed-instrumentation-a… +b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common… +715268d800bacd07236ee1e6f4407650e61cf979733bc262e4de15fbd13b920d | https://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/mockito-core-1… +13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://maven.google.com/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom +2f781378c1be7caa98fa1c5a109f296a6bcdcbe1f9a67a3d16e07f5eb786c96c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-project/1.1.51/kotl… +ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l… +a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu… +260cc48a58764afbcadec4a9b41877c5aa826c760ae3b6b1db8bde44074c7c41 | https://jcenter.bintray.com/org/ow2/asm/asm/5.0.1/asm-5.0.1.pom +4a16a423391387d46724749ad29263e64894dadf6783aa38e4b9c888c88d25fe | https://jcenter.bintray.com/org/robolectric/shadowapi/3.5.1/shadowapi-3.5.1… +2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.… +02c12c3c2ae12dd475219ff691c82a4d9ea21f44bc594a181295bf6d43dcfbb0 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.… +ce9e83354fb5c24ed0e2b26a986130ed5d3dedeba288eb1fce563f78f7bb881f | https://maven.google.com/com/android/support/test/espresso/espresso-core/2.… +a160969150a1671661098deef05da96e1a4f40b93dab045e222485aa976e75a6 | https://maven.google.com/com/android/support/customtabs/23.4.0/customtabs-2… +3db15325cd620c0e54c3d88b6b7ec1bac43db376e18c9bf56bd0c05402ee6be8 | https://jcenter.bintray.com/org/apache/maven/maven-plugin-registry/2.2.1/ma… +08426143d37d770f3e4dae45b0870c3ab1ba512cb64418f34496025b72d16760 | https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.8.0/ant-launcher-… +1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.… +c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://maven.google.com/com/android/databinding/compilerCommon/3.0.1/compi… +a219a1abf948400b669d08be73a6f9209fb720d237e5ff74c223bffe5f9df93d | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-… +24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://maven.google.com/com/android/tools/build/gradle-api/3.0.1/gradle-ap… +770471090ca40a17b9e436ee2ec00819be42042da6f4085ece1d37916dc08ff9 | https://jcenter.bintray.com/backport-util-concurrent/backport-util-concurre… +727a7252ca385f648c3ddf4f104e3908cba723fa577fdd93b0cf851eb16c44f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotli… +943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa | https://jcenter.bintray.com/javax/inject/javax.inject/1/javax.inject-1.pom +164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4… +15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin… +ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26… +381d72c526be217b770f9f8c3f749a86d3b1548ac5c1fcb48d267530ec60d43f | https://jcenter.bintray.com/org/codehaus/plexus/plexus-components/1.1.14/pl… +9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6… +0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot… +052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/… +9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2… +b84d281f59b9da528139e0752a0e1cab0bd98d52c58442b00e45c9748e1d9eee | https://jcenter.bintray.com/org/codehaus/plexus/plexus-interpolation/1.11/p… +2a0e55bb02940d54bc025aca27ec5071535890fc8ef892cf4fb4fe63f216242d | https://jcenter.bintray.com/com/squareup/haha/haha/2.0.2/haha-2.0.2.jar +e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://maven.google.com/com/android/databinding/compilerCommon/3.0.1/compi… +f021eb07aebec822496f489a2d6ec5d3fa81a2717bfc8407cb0ebcaadcee2d7e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-lightweight/1… +da9fd92eacdf63daf0be52eb71accc10ff7943a85d7aac9ea96cf7e03ee3d3cc | https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.8.0/ant-launcher-… +2d4cdc52be79184386d74333d1c4466b7960f83505bfd5e596e76c5ab6ee3bbf | https://jcenter.bintray.com/com/almworks/sqlite4java/sqlite4java/0.282/sqli… +f6775dc981540ffa10f33bd831f14608517ce38b90628e045707dd5bb5d1348e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be… +8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk… +45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.… +bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.… +8b5cd510f29b8f96143cd990747797e9408735c914078a47fa3a6290b474d045 | https://maven.google.com/com/android/support/test/rules/0.5/rules-0.5.pom +6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://maven.google.com/com/android/tools/layoutlib/layoutlib-api/26.0.1/l… +1dea25a2af87ff4757ece0dcb676e0d891dfe1e1e784d6251112e35f21d77b86 | https://maven.google.com/com/android/support/palette-v7/23.4.0/palette-v7-2… +321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk… +bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008 | https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar +aff003f3a0afcfad1bc8b4cce81813ababc48680345f16a1a70adcd1adcb8ce2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable… +f7524cfffc9773ea75a9f7379139f00a57355e411009ea9529b7adf7ef93fde8 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-file/1.0-beta-6/wa… +5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04 | https://jcenter.bintray.com/javax/annotation/javax.annotation-api/1.2/javax… +6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://maven.google.com/com/android/tools/analytics-library/tracker/26.0.1… +0cc647963b74ad1d7a37c9868e9e5a8f474e49297e1863582253a08a4c719cb1 | https://jcenter.bintray.com/classworlds/classworlds/1.1-alpha-2/classworlds… +0d25a88a1b1e44801f8912206a40ff249cb5702ee87cf3d243d5213f7bcf534f | https://jcenter.bintray.com/org/apache/maven/maven-settings/2.2.1/maven-set… +a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://maven.google.com/com/android/tools/annotations/26.0.1/annotations-2… +e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba… +d7d77326867e6d903156ebb18c244819b26aebe3aa82a1c57081081a0b6c4f63 | https://jcenter.bintray.com/org/robolectric/utils/3.5.1/utils-3.5.1.jar +85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom +f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar +950c765f9ebfb7de187cf70ec5b61218568b993bc760cb341bdf142ac94e751b | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android/1.4-… +a0700d84efe7cc3103557bd0522f9443681b96ba9559c4bb7f9dc9bf35243485 | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom +e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu… +ed68ffe66e8fcc23fdeab4eab259a197a11f26325eae59c5afba3a273cd83d25 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-… +0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c… +963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk… +26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-… +a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar +70cc10a9e0b028dd98ca870354afc45eb61eebbd5c6b247b9dd00b4af2b9279a | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-… +f16b5ea711dfe0323454b880180aa832420ec039936e4aa75fb978748634808a | https://jcenter.bintray.com/org/apache/maven/maven-ant-tasks/2.1.3/maven-an… +2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://maven.google.com/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom +f5655d331af6afcd4dbaedaa739b889380c771a7e83f7aea5c8544a05074cf0b | https://jcenter.bintray.com/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.pom +89fc0cd20db030033ba04bb00c2837efe1e530b00f86935d6a645717d15bb978 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/2.6.1/protobu… +1933a6037439b389bda2feaccfc0113880fd8d88f7d240d2052b91108dd5ae89 | https://jcenter.bintray.com/org/apache/apache/5/apache-5.pom +e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.p… +7298feeb36ff14dd933c38e62585fb9973fea32fb3c4bc5379428cb1aac5dd3c | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-file/1.0-beta-6/wa… +1ccea47240da2f0b75dbddb22718fd64cce42c20bf7983e35480b098ab62d26d | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android-no-o… +42f0be9bf98c12dacdcb99dd141d83d4dc5bb7c37a6f26684cd3ff2287667fba | https://jcenter.bintray.com/org/hamcrest/hamcrest-integration/1.3/hamcrest-… +55aa554843983f431df5616112cf688d38aa17c132357afd1c109435bfdac4e6 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/2.6.1/protobu… +efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom +7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar… +62dd8e35a2c4432bb22f8250bbfe08639635599b4064d5d747bd24cf3c02fac5 | https://jcenter.bintray.com/org/apache/maven/maven-model/2.2.1/maven-model-… +2643837251ebdff33a7731646abb563a6050dbb1307937a6e401ef25f3c59103 | https://jcenter.bintray.com/com/jayway/android/robotium/robotium/5.5.4/robo… +9dad0f56523955b60a9903f4e8342891355d7a59c77f36a3b53cf6ff2e4df625 | https://jcenter.bintray.com/org/apache/maven/maven-repository-metadata/2.2.… +f52619bf2f5c5117f0af1c23adff3a9c8f468647be47fefc59b81dcec7e480e6 | https://jcenter.bintray.com/org/apache/maven/maven-ant-tasks/2.1.3/maven-an… +6b8361d8f44649e739343b77c644f1fef1f19d771734ed83785b0dc297198bd1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi… +7450c3330cf06c254db9f0dc5ef49eac15502311cf19e0208ba473076ee043d6 | https://jcenter.bintray.com/org/apache/maven/maven-parent/11/maven-parent-1… +2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common… +7b33cee43a87b390f2ea8084ed431b605016e2ff4c24db9a1fbdd8ffe97ef92d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1… +81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.… +358700f7a5b932bce30ebb0010641a9cade4b8499a60845717b2e22a39697f92 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli… +9a9f556713a404e770c9dbdaed7eb086078014c989291960c76fdde6db4192f7 | https://jcenter.bintray.com/org/apache/maven/maven-settings/2.2.1/maven-set… +c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar +dec38b5e95eba8dbb0aefb0ea72fb777def93e75f60c247a143b0b81a5de3916 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1… +fd9507feb858fa620d1b4aa4b7039fdea1a77e09d3fd28cfbddfff468d9d8c28 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-interpolation/1.11/p… +24465b2ba90dc5ed7e2c05f1c87fe4256c27df6d3cd69b6177f3cb447b05c021 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle… +0c5a9770ae0271dc97bcc6cb0f2e809a40ba587cdce2556f9db59912c8e158fc | https://jcenter.bintray.com/org/apache/maven/maven-parent/19/maven-parent-1… +c219d697fa9c8f243d8f6e347499b6d4e8af1d0cac4bbc7b3907d338a2024c13 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.… +326ba49aa7a35e07b6cc592ad7a5b0f86f4667051a8e70e7639c54bc0c356dee | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli… +e116f32edcb77067289a3148143f2c0c97b27cf9a1342f8108ee37dec4868861 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b… +cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://maven.google.com/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.jar +f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902 | https://jcenter.bintray.com/backport-util-concurrent/backport-util-concurre… +30f5789efa39ddbf96095aada3fc1260c4561faf2f714686717cb2dc5049475a | https://jcenter.bintray.com/net/java/jvnet-parent/3/jvnet-parent-3.pom +5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://maven.google.com/com/android/tools/build/builder/3.0.1/builder-3.0.… +7c75075badcb014443ee94c8c4cad2f4a9905be3ce9430fe7b220afc7fa3a80f | https://jcenter.bintray.com/org/codehaus/plexus/plexus-containers/1.0.3/ple… +3c4fa807380179c24966309fe642eee19558948ebfd326f8f01c301629a50cb0 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android/1.4-… +c3fb02564ca173e45548d7a91aca1efe341db11da2656199d559773e7ae15edf | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1… +8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui… +81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.p… +6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.pom +332883794330d554c24cf311bf60481ad55bf773d5a4b71434d7f6c119ba9dbe | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-analyzer/1.4… +f658a628efd6e0efe416b977638ba144af660fe6413f3637a4d03feb6a1ce806 | https://jcenter.bintray.com/org/apache/maven/maven-artifact/2.2.1/maven-art… +cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.jar +66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.… +4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://jcenter.bintray.com/org/apache/apache/9/apache-9.pom +150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://maven.google.com/com/android/support/support-vector-drawable/23.4.0… +7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk… +cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o… +228367b7569fb1462a3eb1423bc2778e2fc7fbaee3d3767890c02b8924fa1889 | https://jcenter.bintray.com/org/apache/maven/maven-error-diagnostics/2.2.1/… +025caec7c56a0cb4d86c45bc18ac3e23dba291e22ebceb76302a9a9b9b7183cc | https://jcenter.bintray.com/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1… +cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcenter.bintray.com/com/google/google/1/google-1.pom +932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.0.0/proto… +6ee434905eeb60a7c4d52b1f45288d5e53b68094f1cce6990bced2097c3dbec4 | https://maven.google.com/com/android/support/test/espresso/espresso-core/2.… +1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://jcenter.bintray.com/com/google/guava/guava-parent/22.0/guava-parent… +91b9f17a54e6c340c8d3ea4b359401170706eb26a82d51909abe6ba80081aed8 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.pom +74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar +e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.… +8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/… +43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://maven.google.com/com/android/support/support-vector-drawable/23.4.0… +97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar +803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://maven.google.com/com/android/tools/build/builder/3.0.1/builder-3.0.… +8c38b967ee2d7ae4c0bb021717f58717c9a627a82f4af9963263367de078164e | https://maven.google.com/com/android/support/palette-v7/23.4.0/palette-v7-2… +d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l… +536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6… diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 new file mode 100644 index 0000000..f34e228 --- /dev/null +++ b/projects/firefox/mozconfig-android-armv7 @@ -0,0 +1,49 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=arm-linux-androideabi +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle +ac_add_options --with-android-version=16 +ac_add_options --with-branding=mobile/android/branding/torbrowser + +# Android NDK does not contain llvm-config so set clang path in options +ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang + +if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then + ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +fi + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme

1 0

[tor-browser-build/master] Bug 28467: Update hacking doc for working with submodules
by boklm＠torproject.org 16 Nov '18

16 Nov '18

commit f8d9731ad7dd2c3cf66d4aaa6b5d78ad0dcac671 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 16 09:36:31 2018 +0000 Bug 28467: Update hacking doc for working with submodules Additionally, minor clean-ups got done (like adding our 64bit Windows target where needed). --- README.HACKING | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/README.HACKING b/README.HACKING index d9ebf63..9b846a7 100644 --- a/README.HACKING +++ b/README.HACKING @@ -44,15 +44,15 @@ In each of those places, an option can be defined: The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, - torbrowser-windows-i686, torbrowser-osx-x86_64 + torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-i686, -torbrowser-windows-i686, torbrowser-osx-x86_64 are special cases. They -do not contain options directly, instead they contain a list of other -targets. For instance, the torbrowser-linux-x86_64 target is pointing -to the linux-x86_64 and linux targets. You should define an option under -the linux target if it applies to Linux on both architectures, or under +torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64 are +special cases. They do not contain options directly, instead they contain a +list of other targets. For instance, the torbrowser-linux-x86_64 target is +pointing to the linux-x86_64 and linux targets. You should define an option +under the linux target if it applies to Linux on both architectures, or under the linux-x86_64 if it only applies to the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by @@ -148,6 +148,8 @@ $platform should be one of the following: - torbrowser-windows-i686 + - torbrowser-windows-x86_64 + - torbrowser-osx-x86_64 For example, to see tor's build script for linux x86_64 on the alpha @@ -242,6 +244,16 @@ Remember that the git_hash option has different definitions for alpha and nightly builds, so you should modify the right one depending on what type of build you are doing (see also the "Types of builds" section). +The first alternative is not working in case patches contain binary diffs, +which the patch command can't handle. However, working with submodules can +make the git branch alternative tricky to use. In that case you can resort +to a third option by installing git in the build container (via var/deps in +the respective config file). Then you can change to the submodule directory +in the build script and do a + + git apply patch-for-XXXX.patch + +after adding the patch to the project's config file (see above). The Firefox mozconfig files --------------------------- @@ -298,8 +310,8 @@ For example, if you want to try a Linux x86_64 alpha build, you can run: torbrowser-linux-x86_64 -Types of builds: nightly, alpha, release and testbuild ------------------------------------------------------- +Types of builds: nightly, alpha, release, and testbuild +------------------------------------------------------- The testbuild makefile target allows you to do a build quickly in the testbuild directory, skipping the generation of all the locales and the @@ -313,4 +325,3 @@ builds in order to point to the master branch. If you want your testbuild target to create builds based on nightly rather than alpha, you can edit your rbm.local.conf file and uncomment the targets/torbrowser-testbuild definition. -

1 0

[tor-browser-build/master] Bug 28470: Add fetch gradle dependency script to common project
by gk＠torproject.org 16 Nov '18

16 Nov '18

commit 873289e271fb88c47e1c5738b66a37b723e74ee2 Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 11:12:30 2018 +0000 Bug 28470: Add fetch gradle dependency script to common project The script got written by boklm. --- projects/common/fetch-gradle-dependencies | 19 ++++++++++++++ .../how-to-create-gradle-dependencies-list.txt | 30 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/projects/common/fetch-gradle-dependencies b/projects/common/fetch-gradle-dependencies new file mode 100644 index 0000000..0acd38a --- /dev/null +++ b/projects/common/fetch-gradle-dependencies @@ -0,0 +1,19 @@ +#!/bin/bash +set -e +# Bug 28117: setting LC_ALL=C is causing wget to fail downloading some URLs +unset LC_ALL +cd "[% dest_dir %]" +m2dir="$(mktemp -d)" +[% USE artifacts = datafile(c('basedir') _ '/projects/' _ project _ '/gradle-dependencies-list.txt', delim = '|') %] +[% FOREACH artifact = artifacts %] + artifact_path=$(echo "[% artifact.url %]" | sed 's|^https://[^/]\+/||') + artifact_filename=$(basename "$artifact_path") + artifact_dirname=$(dirname "$artifact_path") + [% GET c("urlget", { filename => 'downloaded_file', URL => artifact.url}); %] + echo "[% artifact.sha256sum %] downloaded_file" | sha256sum -c + mkdir -p "$m2dir/$artifact_dirname" + mv -f downloaded_file "$m2dir/$artifact_dirname/$artifact_filename" +[% END -%] +echo "Finished downloading gradle dependencies" +mkdir -p "[% dest_dir %]" +mv -f "$m2dir" "[% dest_dir %]/gradle-dependencies-[% c("var/gradle_dependencies_version") %]" diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt new file mode 100644 index 0000000..ef816d0 --- /dev/null +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -0,0 +1,30 @@ +### Updating Gradle Dependencies +If additional Android dependencies are required by the project's build, then +the Gradle build will fail due to missing dependencies. To find out what the +missing dependencies are, comment out the following line in the project's build +file: + + export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" + +and rerun the build. + +Dependent artifacts will show up as downloads in the logs. You can pull out +these dependencies into a list with the following command (replacing +"firefox-android-armv7.log" with the build log file name of the actual project): + +`cat logs/firefox-android-armv7.log | grep "Download http" | sed "s/^.*Download //g" > download-urls.txt` + +You will then need to add the new dependency URLs and SHA-256 values into the +projects/$project/gradle-dependencies-list.txt file. The format of this file is +pipe delimited + sha256sum | url + +Finally, in the project's config file increment the +var/gradle_dependencies_version and make sure to restore the project's build +file back to original. + +It may also be the case that you wish to clean up old versions of the artifacts. +For this you will need to run the build with a +gradle-dependencies-list.txt file containing only the headers. Make sure to also +comment the GRADLE_MAVEN_REPOSITORIES line from the project's build file. You +can now proceed to reconstruct the list as given above.

1 0

[tor-browser-build/master] Bug 28469: Fix unsupported libbacktrace in Rust 1.26
by gk＠torproject.org 16 Nov '18

16 Nov '18

commit d4215cdbc472573bafe020532ebfcfb491e7615f Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 07:19:03 2018 +0000 Bug 28469: Fix unsupported libbacktrace in Rust 1.26 --- ...e-dl_iterate_phdr-is-undefined-on-Android.patch | 34 +++++++++++++++++ projects/rust/build | 5 +++ projects/rust/config | 6 ++- projects/rust/replace_pagesize_in_mmap.patch | 44 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) diff --git a/projects/rust/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch b/projects/rust/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch new file mode 100644 index 0000000..75cd657 --- /dev/null +++ b/projects/rust/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch @@ -0,0 +1,34 @@ +From 4fa67c8a014ac10558be71edec9048851ca7a02d Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 15 Nov 2018 19:04:46 +0000 +Subject: [PATCH] Make sure `dl_iterate_phdr` is undefined on Android + +If we build with API < 21 we'll run into undefined reference errors. +We follow the Rust people who ran into similar issues when +upgrading libbacktrace for 1.28.0 in making sure `dl_iterate_phdr` is +not defined for Android. + +diff --git a/src/libbacktrace/configure b/src/libbacktrace/configure +index 8bdb29d256..8941fcd2b0 100755 +--- a/src/libbacktrace/configure ++++ b/src/libbacktrace/configure +@@ -12397,7 +12397,15 @@ rm -f conftest* + have_dl_iterate_phdr=no ;; + esac + else +- ac_fn_c_check_func "$LINENO" "dl_iterate_phdr" "ac_cv_func_dl_iterate_phdr" ++ case "${host}" in ++ *-*-androideabi*) ++ # Avoid dl_iterate_phdr on older Android API (which we use), ++ # as defining it causes undefined reference errors when ++ # compiling Firefox later on. ++ have_dl_iterate_phdr=no ;; ++ *) ac_fn_c_check_func "$LINENO" "dl_iterate_phdr" "ac_cv_func_dl_iterate_phdr" ;; ++ esac ++ + if test "x$ac_cv_func_dl_iterate_phdr" = x""yes; then : + have_dl_iterate_phdr=yes + else +-- +2.19.1 + diff --git a/projects/rust/build b/projects/rust/build index 7ae3073..12f012a 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -62,6 +62,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/unwind.patch [% END %] +[% IF c("var/android") %] + patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + patch -p1 < $rootdir/replace_pagesize_in_mmap.patch +[% END %] + mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index 83ae690..99d1177 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -22,7 +22,7 @@ targets: - libssl-dev - pkg-config - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.ar=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-ar --set=target.armv7-linux-androideabi.linker=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-clang --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc linux: var: @@ -90,3 +90,7 @@ input_files: gpg_keyring: rust.gpg - filename: unwind.patch enable: '[% c("var/windows-i686") %]' + - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + enable: '[% c("var/android") %]' + - filename: replace_pagesize_in_mmap.patch + enable: '[% c("var/android") %]' diff --git a/projects/rust/replace_pagesize_in_mmap.patch b/projects/rust/replace_pagesize_in_mmap.patch new file mode 100644 index 0000000..598f190 --- /dev/null +++ b/projects/rust/replace_pagesize_in_mmap.patch @@ -0,0 +1,44 @@ +diff --git a/src/libbacktrace/mmap.c b/src/libbacktrace/mmap.c +index 138ef70711..e3c4cd2643 100644 +--- a/src/libbacktrace/mmap.c ++++ b/src/libbacktrace/mmap.c +@@ -140,7 +140,7 @@ backtrace_alloc (struct backtrace_state *state, + { + /* Allocate a new page. */ + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + asksize = (size + pagesize - 1) & ~ (pagesize - 1); + page = mmap (NULL, asksize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); +@@ -181,7 +181,7 @@ backtrace_free (struct backtrace_state *state, void *addr, size_t size, + { + size_t pagesize; + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + if (((uintptr_t) addr & (pagesize - 1)) == 0 + && (size & (pagesize - 1)) == 0) + { +@@ -226,7 +226,7 @@ backtrace_vector_grow (struct backtrace_state *state,size_t size, + size_t alc; + void *base; + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + alc = vec->size + size; + if (vec->size == 0) + alc = 16 * size; +diff --git a/src/libbacktrace/mmapio.c b/src/libbacktrace/mmapio.c +index dfdaf6fa52..5b23003090 100644 +--- a/src/libbacktrace/mmapio.c ++++ b/src/libbacktrace/mmapio.c +@@ -60,7 +60,7 @@ backtrace_get_view (struct backtrace_state *state ATTRIBUTE_UNUSED, + off_t pageoff; + void *map; + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + inpage = offset % pagesize; + pageoff = offset - inpage; +

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 22343: Make 'Save Page As' obey first-party isolation
by gk＠torproject.org 15 Nov '18

15 Nov '18

commit c2b7e89ecaf3ea6a14a650a0a71c6dc3ebb02c50 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 30 10:25:34 2017 -0700 Bug 22343: Make 'Save Page As' obey first-party isolation Fixes: * File menu: - Save Page As * Context menu in content pages: - Save Page As - Save Image As - Save Video As - Save Link As - Save Frame As * Page Info "Media" Panel: - Save As --- browser/base/content/browser.js | 2 +- browser/base/content/nsContextMenu.js | 39 ++++++++++++++++++-------- browser/base/content/pageinfo/pageInfo.js | 5 ++-- browser/base/content/utilityOverlay.js | 6 ++-- dom/webbrowserpersist/nsIWebBrowserPersist.idl | 9 +++++- dom/webbrowserpersist/nsWebBrowserPersist.cpp | 18 ++++++++++-- dom/webbrowserpersist/nsWebBrowserPersist.h | 2 ++ mobile/android/chrome/content/browser.js | 6 ++-- netwerk/base/LoadContextInfo.cpp | 18 ++++++++++-- toolkit/components/browser/nsWebBrowser.cpp | 12 ++++++++ toolkit/content/contentAreaUtils.js | 32 +++++++++++++++------ 11 files changed, 115 insertions(+), 34 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 0fc6a72daf66..5eed34e08086 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6175,7 +6175,7 @@ function handleLinkClick(event, href, linkNode) { if (where == "save") { saveURL(href, linkNode ? gatherTextUnder(linkNode) : "", null, true, - true, doc.documentURIObject, doc); + true, doc.documentURIObject, doc, undefined, doc.nodePrincipal); event.preventDefault(); return true; } diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js index 368d0475ac34..37ebde22ea07 100644 --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -989,9 +989,11 @@ nsContextMenu.prototype = { let onMessage = (message) => { mm.removeMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage); let dataURL = message.data.dataURL; + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(dataURL), this.principal.originAttributes); saveImageURL(dataURL, name, "SaveImageTitle", true, false, document.documentURIObject, null, null, null, - isPrivate); + isPrivate, principal); }; mm.addMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage); }, @@ -1063,7 +1065,7 @@ nsContextMenu.prototype = { // Helper function to wait for appropriate MIME-type headers and // then prompt the user with a file picker saveHelper(linkURL, linkText, dialogTitle, bypassCache, doc, docURI, - windowID, linkDownload, isContentWindowPrivate) { + windowID, linkDownload, isContentWindowPrivate, contentPrincipal) { // canonical def in nsURILoader.h const NS_ERROR_SAVE_LINK_AS_TIMEOUT = 0x805d0020; @@ -1116,7 +1118,7 @@ nsContextMenu.prototype = { // do it the old fashioned way, which will pick the best filename // it can without waiting. saveURL(linkURL, linkText, dialogTitle, bypassCache, false, docURI, - doc, isContentWindowPrivate); + doc, isContentWindowPrivate, contentPrincipal); } if (this.extListener) this.extListener.onStopRequest(aRequest, aContext, aStatusCode); @@ -1156,10 +1158,13 @@ nsContextMenu.prototype = { } }; + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(linkURL), this.principal.originAttributes); + // setting up a new channel for 'right click - save link as ...' var channel = NetUtil.newChannel({ uri: makeURI(linkURL), - loadingPrincipal: this.principal, + loadingPrincipal: principal, contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD, securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS, }); @@ -1201,14 +1206,17 @@ nsContextMenu.prototype = { // Save URL of clicked-on link. saveLink() { - urlSecurityCheck(this.linkURL, this.principal); + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(this.linkURL), this.principal.originAttributes); + urlSecurityCheck(this.linkURL, principal); let isContentWindowPrivate = this.isRemote ? this.ownerDoc.isPrivate : undefined; this.saveHelper(this.linkURL, this.linkTextStr, null, true, this.ownerDoc, gContextMenuContentData.documentURIObject, this.frameOuterWindowID, this.linkDownload, - isContentWindowPrivate); + isContentWindowPrivate, + principal); }, // Backwards-compatibility wrapper @@ -1223,23 +1231,32 @@ nsContextMenu.prototype = { let isContentWindowPrivate = this.isRemote ? this.ownerDoc.isPrivate : undefined; let referrerURI = gContextMenuContentData.documentURIObject; let isPrivate = PrivateBrowsingUtils.isBrowserPrivate(this.browser); + let thisPrincipal = this.principal; if (this.onCanvas) { // Bypass cache, since it's a data: URL. this._canvasToBlobURL(this.target).then(function(blobURL) { + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(blobURL), thisPrincipal.originAttributes); saveImageURL(blobURL, "canvas.png", "SaveImageTitle", true, false, referrerURI, null, null, null, - isPrivate); + isPrivate, principal); }, Cu.reportError); } else if (this.onImage) { - urlSecurityCheck(this.mediaURL, this.principal); + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(this.mediaURL), thisPrincipal.originAttributes); + urlSecurityCheck(this.mediaURL, principal); saveImageURL(this.mediaURL, null, "SaveImageTitle", false, false, referrerURI, null, gContextMenuContentData.contentType, - gContextMenuContentData.contentDisposition, isPrivate); + gContextMenuContentData.contentDisposition, isPrivate, + principal); } else if (this.onVideo || this.onAudio) { - urlSecurityCheck(this.mediaURL, this.principal); + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(this.mediaURL), thisPrincipal.originAttributes); + urlSecurityCheck(this.mediaURL, principal); var dialogTitle = this.onVideo ? "SaveVideoTitle" : "SaveAudioTitle"; this.saveHelper(this.mediaURL, null, dialogTitle, false, doc, referrerURI, - this.frameOuterWindowID, "", isContentWindowPrivate); + this.frameOuterWindowID, "", isContentWindowPrivate, + principal); } }, diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 86f548c74494..efe24f7487d9 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -696,7 +696,7 @@ function saveMedia() { titleKey = "SaveAudioTitle"; saveURL(url, null, titleKey, false, false, makeURI(item.baseURI), - null, gDocInfo.isContentWindowPrivate); + null, gDocInfo.isContentWindowPrivate, gDocInfo.principal); } } else { selectSaveFolder(function(aDirectory) { @@ -704,7 +704,8 @@ function saveMedia() { var saveAnImage = function(aURIString, aChosenData, aBaseURI) { uniqueFile(aChosenData.file); internalSave(aURIString, null, null, null, null, false, "SaveImageTitle", - aChosenData, aBaseURI, null, false, null, gDocInfo.isContentWindowPrivate); + aChosenData, aBaseURI, null, false, null, gDocInfo.isContentWindowPrivate, + gDocInfo.principal); }; for (var i = 0; i < rowArray.length; i++) { diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index b73a01a0b0f3..4cd7d91e4e9a 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -258,14 +258,16 @@ function openLinkIn(url, where, params) { // ContentClick.jsm passes isContentWindowPrivate for saveURL instead of passing a CPOW initiatingDoc if ("isContentWindowPrivate" in params) { - saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, null, params.isContentWindowPrivate); + saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, + null, params.isContentWindowPrivate, + aPrincipal || aTriggeringPrincipal); } else { if (!aInitiatingDoc) { Cu.reportError("openUILink/openLinkIn was called with " + "where == 'save' but without initiatingDoc. See bug 814264."); return; } - saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, aInitiatingDoc); + saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, aInitiatingDoc, params.isContentWindowPrivate, aPrincipal || aTriggeringPrincipal); } return; } diff --git a/dom/webbrowserpersist/nsIWebBrowserPersist.idl b/dom/webbrowserpersist/nsIWebBrowserPersist.idl index 8de84f5e2904..62ac1c1cd7bd 100644 --- a/dom/webbrowserpersist/nsIWebBrowserPersist.idl +++ b/dom/webbrowserpersist/nsIWebBrowserPersist.idl @@ -13,11 +13,12 @@ interface nsIWebProgressListener; interface nsIFile; interface nsIChannel; interface nsILoadContext; +interface nsIPrincipal; /** * Interface for persisting DOM documents and URIs to local or remote storage. */ -[scriptable, uuid(8cd752a4-60b1-42c3-a819-65c7a1138a28)] +[scriptable, uuid(ccdbc750-be09-4f11-bb01-4e0a4db76c41)] interface nsIWebBrowserPersist : nsICancelable { /** No special persistence behaviour. */ @@ -112,6 +113,12 @@ interface nsIWebBrowserPersist : nsICancelable attribute nsIWebProgressListener progressListener; /** + * This attribute can be used to set the loading principal + * of the document or URI to be persisted. + */ + attribute nsIPrincipal loadingPrincipal; + + /** * Save the specified URI to file. * * @param aURI URI to save to file. Some implementations of this interface diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp index fd6d9d0d9315..4f49b63475f3 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.cpp +++ b/dom/webbrowserpersist/nsWebBrowserPersist.cpp @@ -277,6 +277,7 @@ const char *kWebBrowserPersistStringBundle = nsWebBrowserPersist::nsWebBrowserPersist() : mCurrentDataPathIsRelative(false), mCurrentThingsToPersist(0), + mLoadingPrincipal(nsContentUtils::GetSystemPrincipal()), mFirstAndOnlyUse(true), mSavingDocument(false), mCancel(false), @@ -413,6 +414,19 @@ NS_IMETHODIMP nsWebBrowserPersist::SetProgressListener( return NS_OK; } +NS_IMETHODIMP nsWebBrowserPersist::GetLoadingPrincipal(nsIPrincipal** loadingPrincipal) +{ + *loadingPrincipal = mLoadingPrincipal; + return NS_OK; +} + +NS_IMETHODIMP nsWebBrowserPersist::SetLoadingPrincipal(nsIPrincipal* loadingPrincipal) +{ + mLoadingPrincipal = loadingPrincipal ? loadingPrincipal : + nsContentUtils::GetSystemPrincipal(); + return NS_OK; +} + NS_IMETHODIMP nsWebBrowserPersist::SaveURI( nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer, uint32_t aReferrerPolicy, @@ -1385,7 +1399,7 @@ nsresult nsWebBrowserPersist::SaveURIInternal( nsCOMPtr<nsIChannel> inputChannel; rv = NS_NewChannel(getter_AddRefs(inputChannel), aURI, - nsContentUtils::GetSystemPrincipal(), + mLoadingPrincipal, nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_OTHER, nullptr, // aPerformanceStorage @@ -2756,7 +2770,7 @@ nsWebBrowserPersist::CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel) rv = NS_NewChannel(aChannel, aURI, - nsContentUtils::GetSystemPrincipal(), + mLoadingPrincipal, nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_OTHER); NS_ENSURE_SUCCESS(rv, rv); diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.h b/dom/webbrowserpersist/nsWebBrowserPersist.h index 17b570d783e7..f95300be12cb 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.h +++ b/dom/webbrowserpersist/nsWebBrowserPersist.h @@ -147,6 +147,8 @@ private: nsCOMPtr<nsIMIMEService> mMIMEService; nsCOMPtr<nsIURI> mURI; nsCOMPtr<nsIWebProgressListener> mProgressListener; + nsCOMPtr<nsIPrincipal> mLoadingPrincipal; + /** * Progress listener for 64-bit values; this is the same object as * mProgressListener, but is a member to avoid having to qi it for each diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index d081fde9b20e..51fe1422acc5 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -886,10 +886,10 @@ var BrowserApp = { if (!permissionGranted) { return; } - + let doc = aTarget.ownerDocument; ContentAreaUtils.saveImageURL(aTarget.currentRequestFinalURI.spec, null, "SaveImageTitle", - false, true, aTarget.ownerDocument.documentURIObject, - aTarget.ownerDocument); + false, true, doc.documentURIObject, + null, null, null, doc.isPrivate, doc.nodePrincipal); }); }); diff --git a/netwerk/base/LoadContextInfo.cpp b/netwerk/base/LoadContextInfo.cpp index 79f870e8d20d..1218345b63ed 100644 --- a/netwerk/base/LoadContextInfo.cpp +++ b/netwerk/base/LoadContextInfo.cpp @@ -121,8 +121,6 @@ GetLoadContextInfo(nsIChannel * aChannel) { nsresult rv; - DebugOnly<bool> pb = NS_UsePrivateBrowsing(aChannel); - bool anon = false; nsLoadFlags loadFlags; rv = aChannel->GetLoadFlags(&loadFlags); @@ -132,7 +130,21 @@ GetLoadContextInfo(nsIChannel * aChannel) OriginAttributes oa; NS_GetOriginAttributes(aChannel, oa); - MOZ_ASSERT(pb == (oa.mPrivateBrowsingId > 0)); + +#ifdef DEBUG + nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo(); + if (loadInfo) { + nsCOMPtr<nsIPrincipal> principal = loadInfo->LoadingPrincipal(); + if (principal) { + bool chrome; + principal->GetIsSystemPrincipal(&chrome); + if (!chrome) { + bool pb = NS_UsePrivateBrowsing(aChannel); + MOZ_ASSERT(pb == (oa.mPrivateBrowsingId > 0)); + } + } + } +#endif return new LoadContextInfo(anon, oa); } diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp index 40ac82210502..ff1e728243b4 100644 --- a/toolkit/components/browser/nsWebBrowser.cpp +++ b/toolkit/components/browser/nsWebBrowser.cpp @@ -997,6 +997,18 @@ nsWebBrowser::SetProgressListener(nsIWebProgressListener* aProgressListener) } NS_IMETHODIMP +nsWebBrowser::GetLoadingPrincipal(nsIPrincipal** loadingPrincipal) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsWebBrowser::SetLoadingPrincipal(nsIPrincipal* loadingPrincipal) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP nsWebBrowser::SaveURI(nsIURI* aURI, nsISupports* aCacheKey, nsIURI* aReferrer, diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js index 48cf448798a5..e213a0e4333e 100644 --- a/toolkit/content/contentAreaUtils.js +++ b/toolkit/content/contentAreaUtils.js @@ -62,14 +62,14 @@ function forbidCPOW(arg, func, argname) { // - A linked document using Alt-click Save Link As... // function saveURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, - aSkipPrompt, aReferrer, aSourceDocument, aIsContentWindowPrivate) { + aSkipPrompt, aReferrer, aSourceDocument, aIsContentWindowPrivate, + aContentPrincipal) { forbidCPOW(aURL, "saveURL", "aURL"); forbidCPOW(aReferrer, "saveURL", "aReferrer"); // Allow aSourceDocument to be a CPOW. - internalSave(aURL, null, aFileName, null, null, aShouldBypassCache, aFilePickerTitleKey, null, aReferrer, aSourceDocument, - aSkipPrompt, null, aIsContentWindowPrivate); + aSkipPrompt, null, aIsContentWindowPrivate, aContentPrincipal); } // Just like saveURL, but will get some info off the image before @@ -109,10 +109,12 @@ const nsISupportsCString = Ci.nsISupportsCString; * @param aIsContentWindowPrivate (bool) * Whether or not the containing window is in private browsing mode. * Does not need to be provided is aDoc is passed. + * @param aContentPrincipal [optional] + * The principal to be used for fetching and saving the target URL. */ function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, aSkipPrompt, aReferrer, aDoc, aContentType, aContentDisp, - aIsContentWindowPrivate) { + aIsContentWindowPrivate, aContentPrincipal) { forbidCPOW(aURL, "saveImageURL", "aURL"); forbidCPOW(aReferrer, "saveImageURL", "aReferrer"); @@ -156,7 +158,8 @@ function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, internalSave(aURL, null, aFileName, aContentDisp, aContentType, aShouldBypassCache, aFilePickerTitleKey, null, aReferrer, - null, aSkipPrompt, null, aIsContentWindowPrivate); + null, aSkipPrompt, null, aIsContentWindowPrivate, + aContentPrincipal); } // This is like saveDocument, but takes any browser/frame-like element @@ -170,7 +173,7 @@ function saveBrowser(aBrowser, aSkipPrompt, aOuterWindowID = 0) { let stack = Components.stack.caller; persistable.startPersistence(aOuterWindowID, { onDocumentReady(document) { - saveDocument(document, aSkipPrompt); + saveDocument(document, aSkipPrompt, aBrowser.contentPrincipal); }, onError(status) { throw new Components.Exception("saveBrowser failed asynchronously in startPersistence", @@ -186,7 +189,9 @@ function saveBrowser(aBrowser, aSkipPrompt, aOuterWindowID = 0) { // case "save as" modes that serialize the document's DOM are // unavailable. This is a temporary measure for the "Save Frame As" // command (bug 1141337) and pre-e10s add-ons. -function saveDocument(aDocument, aSkipPrompt) { +// +// aContentPrincipal is the principal for downloading and saving the document. +function saveDocument(aDocument, aSkipPrompt, aContentPrincipal) { if (!aDocument) throw "Must have a document when calling saveDocument"; @@ -241,7 +246,7 @@ function saveDocument(aDocument, aSkipPrompt) { internalSave(aDocument.documentURI, aDocument, null, contentDisposition, aDocument.contentType, false, null, null, aDocument.referrer ? makeURI(aDocument.referrer) : null, - aDocument, aSkipPrompt, cacheKey); + aDocument, aSkipPrompt, cacheKey, undefined, aContentPrincipal); } function DownloadListener(win, transfer) { @@ -350,11 +355,13 @@ XPCOMUtils.defineConstant(this, "kSaveAsType_Text", kSaveAsType_Text); * This parameter is provided when the aInitiatingDocument is not a * real document object. Stores whether aInitiatingDocument.defaultView * was private or not. + * @param aContentPrincipal [optional] + * The principal to be used for fetching and saving the target URL. */ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, aContentType, aShouldBypassCache, aFilePickerTitleKey, aChosenData, aReferrer, aInitiatingDocument, aSkipPrompt, - aCacheKey, aIsContentWindowPrivate) { + aCacheKey, aIsContentWindowPrivate, aContentPrincipal) { forbidCPOW(aURL, "internalSave", "aURL"); forbidCPOW(aReferrer, "internalSave", "aReferrer"); forbidCPOW(aCacheKey, "internalSave", "aCacheKey"); @@ -423,6 +430,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, let nonCPOWDocument = aDocument && !Cu.isCrossProcessWrapper(aDocument); + let isPrivate = aIsContentWindowPrivate; if (isPrivate === undefined) { isPrivate = aInitiatingDocument instanceof Ci.nsIDOMDocument @@ -440,6 +448,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, sourcePostData: nonCPOWDocument ? getPostData(aDocument) : null, bypassCache: aShouldBypassCache, isPrivate, + loadingPrincipal: aContentPrincipal, }; // Start the actual save process @@ -476,10 +485,15 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, * If true, the document will always be refetched from the server * @param persistArgs.isPrivate * Indicates whether this is taking place in a private browsing context. + * @param persistArgs.loadingPrincipal + * The principal assigned to the document being saved. */ function internalPersist(persistArgs) { var persist = makeWebBrowserPersist(); + if (["http", "https", "ftp"].includes(persistArgs.sourceURI.scheme)) { + persist.loadingPrincipal = persistArgs.loadingPrincipal; + } // Calculate persist flags. const nsIWBP = Ci.nsIWebBrowserPersist; const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |

1 0

[tor-browser-build/master] Bug 28436: Update link to gn cross_compiles.md.
by boklm＠torproject.org 14 Nov '18

14 Nov '18

commit c50a316848b6efad58644a1c85594b8e92c9b2ff Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 13 16:17:07 2018 -0700 Bug 28436: Update link to gn cross_compiles.md. --- projects/webrtc/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index d3975b3..5a6cece 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -92,7 +92,7 @@ EOF export GN_ARGS="" # For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". -# https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… +# https://gn.googlesource.com/gn/+/master/docs/cross_compiles.md # Not debug. GN_ARGS+=" is_debug=false" # There are warnings from unused returns.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 14 Nov '18

14 Nov '18

commit c4f92596551ae6651a25be34f330a14776d2e09e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 14 15:11:31 2018 +0000 Translations update --- src/chrome/locale/de/browserOnboarding.properties | 16 ++++++++-------- src/chrome/locale/ko/torbutton.dtd | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index 1243128c..d57b3f15 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -15,11 +15,11 @@ onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk onboarding.tour-tor-network=Tor-Netzwerk onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk. onboarding.tour-tor-network.description=Der Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als bei einem VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. -onboarding.tour-tor-network.button=Circuit-Ansicht öffnen +onboarding.tour-tor-network.button=Kanal-Ansicht öffnen -onboarding.tour-tor-circuit-display=Circuit-Ansicht +onboarding.tour-tor-circuit-display=Kanal-Ansicht onboarding.tour-tor-circuit-display.title=Zeige deinen Pfad -onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Pfad erneut zu laden, klicke auf das Informations-Symbol in der Adressleiste und wähle "Neuer Pfad für diese Seite". +onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Kanal erneut zu laden, öffne die Kanal-Ansicht und klicke "Neuer Kanal für diese Seite". onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit @@ -44,11 +44,11 @@ onboarding.tor-circuit-display.one-of-three=1 von 3 onboarding.tor-circuit-display.two-of-three=2 von 3 onboarding.tor-circuit-display.three-of-three=3 von 3 -onboarding.tor-circuit-display.intro.title=Wie funktionieren Circuits? -onboarding.tor-circuit-display.intro.msg=Circuits bestehen aus zufällig zugeordneten Relays, d.h. Computern auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Circuits ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n +onboarding.tor-circuit-display.intro.title=Wie funktionieren Kanäle? +onboarding.tor-circuit-display.intro.msg=Kanäle bestehen aus zufällig zugeordneten Relays, d.h. Server auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Kanäle ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n -onboarding.tor-circuit-display.diagram.title=Circuit-Ansicht -onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. +onboarding.tor-circuit-display.diagram.title=Kanal-Ansicht +onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, die den Kanal für diese Website bilden. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, nutzt Tor Browser für jede Website einen eigenen Kanal. onboarding.tor-circuit-display.new-circuit.title=Brauchen Sie einen neuen Circuit? -onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Circuit zu laden. +onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Kanal zu laden. diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 5daf9f14..b23701b2 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -34,18 +34,18 @@ <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> <!ENTITY torbutton.prefs.sec_standard_label "표준"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_safer_label "더 안전합니다"> +<!ENTITY torbutton.prefs.sec_safer_description "이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다."> +<!ENTITY torbutton.prefs.sec_safer_list_label "더 안전한 설정을 선택하고 있습니다:"> +<!ENTITY torbutton.prefs.sec_safest_label "제일 안전합니다"> +<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다."> +<!ENTITY torbutton.prefs.sec_safest_list_label "제일 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_learn_more_label "더 알아보기"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_js_disabled "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> +<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴이며 수학기호가 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_click_to_play_media "오디오와 동영상(HTML5 media) 보려면 누르십시오."> <!ENTITY torbutton.circuit_display.title "토르 서킷"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.new_circuit "이 사이트에서 새로운 서킷을 재구축">

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 25013: Add torbutton as a tor-browser submodule
by gk＠torproject.org 14 Nov '18

14 Nov '18

commit fbccad5b7b28a975f2e9de73f8362fcf937db6aa Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Nov 13 07:23:52 2018 -0200 Bug 25013: Add torbutton as a tor-browser submodule Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. --- .gitmodules | 3 +++ mobile/android/installer/package-manifest.in | 4 ++++ toolkit/moz.build | 3 +++ toolkit/torproject/torbutton | 1 + 4 files changed, 11 insertions(+) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..2f03bd8e22df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "toolkit/torproject/torbutton"] + path = toolkit/torproject/torbutton + url = https://git.torproject.org/torbutton.git diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 8a2a356c151c..69714f9eca7c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -426,6 +426,10 @@ @BINPATH@/chrome/devtools@JAREXT@ @BINPATH@/chrome/devtools.manifest +; Torbutton +@BINPATH@/chrome/torbutton@JAREXT@ +@BINPATH@/chrome/torbutton.manifest + ; [Default Preferences] ; All the pref files must be part of base to prevent migration bugs #ifdef MOZ_GECKOVIEW_JAR diff --git a/toolkit/moz.build b/toolkit/moz.build index df0b09d3bc0f..ba89c51efea1 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -28,6 +28,9 @@ if CONFIG['MOZ_MAINTENANCE_SERVICE'] or CONFIG['MOZ_UPDATER']: 'mozapps/update/common', ] +if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': + DIRS += ['torproject/torbutton'] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: DIRS += [ 'components/maintenanceservice' diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton new file mode 160000 index 000000000000..ac8d92514940 --- /dev/null +++ b/toolkit/torproject/torbutton @@ -0,0 +1 @@ +Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd

1 0

[torbutton/master] Bug 25013: Make `en` a symlink of `en-US` instead
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 152a94d5779076525da8a420641ff82b6d85d6de Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:14:25 2018 +0000 Bug 25013: Make `en` a symlink of `en-US` instead --- src/chrome/locale/en | 1 + src/chrome/locale/en-US | 1 - src/chrome/locale/{en => en-US}/aboutDialog.dtd | 0 src/chrome/locale/{en => en-US}/aboutTBUpdate.dtd | 0 src/chrome/locale/{en => en-US}/aboutTor.dtd | 0 src/chrome/locale/{en => en-US}/brand.dtd | 0 src/chrome/locale/{en => en-US}/brand.properties | 0 src/chrome/locale/{en => en-US}/browserOnboarding.properties | 0 src/chrome/locale/{en => en-US}/torbutton.dtd | 0 src/chrome/locale/{en => en-US}/torbutton.properties | 0 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en b/src/chrome/locale/en new file mode 120000 index 00000000..f2b0341f --- /dev/null +++ b/src/chrome/locale/en @@ -0,0 +1 @@ +en-US \ No newline at end of file diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US deleted file mode 120000 index 2c4c454f..00000000 --- a/src/chrome/locale/en-US +++ /dev/null @@ -1 +0,0 @@ -en \ No newline at end of file diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en-US/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/en/aboutDialog.dtd rename to src/chrome/locale/en-US/aboutDialog.dtd diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/en/aboutTBUpdate.dtd rename to src/chrome/locale/en-US/aboutTBUpdate.dtd diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd similarity index 100% rename from src/chrome/locale/en/aboutTor.dtd rename to src/chrome/locale/en-US/aboutTor.dtd diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en-US/brand.dtd similarity index 100% rename from src/chrome/locale/en/brand.dtd rename to src/chrome/locale/en-US/brand.dtd diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en-US/brand.properties similarity index 100% rename from src/chrome/locale/en/brand.properties rename to src/chrome/locale/en-US/brand.properties diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties similarity index 100% rename from src/chrome/locale/en/browserOnboarding.properties rename to src/chrome/locale/en-US/browserOnboarding.properties diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd similarity index 100% rename from src/chrome/locale/en/torbutton.dtd rename to src/chrome/locale/en-US/torbutton.dtd diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en-US/torbutton.properties similarity index 100% rename from src/chrome/locale/en/torbutton.properties rename to src/chrome/locale/en-US/torbutton.properties

1 0

[torbutton/master] Translations update
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit ac8d9251494056e761bb2cf5c2a4795a888f38bd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:24:11 2018 +0000 Translations update --- src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/cs/aboutTor.dtd | 4 +- src/chrome/locale/cs/brand.properties | 4 +- src/chrome/locale/cs/torbutton.properties | 4 +- src/chrome/locale/da/torbutton.properties | 2 +- src/chrome/locale/el/aboutDialog.dtd | 2 +- src/chrome/locale/el/aboutTor.dtd | 8 +-- src/chrome/locale/el/browserOnboarding.properties | 8 +-- src/chrome/locale/fr/aboutDialog.dtd | 2 +- src/chrome/locale/fr/aboutTor.dtd | 2 +- src/chrome/locale/fr/brand.dtd | 2 +- src/chrome/locale/ja/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ja/aboutTor.dtd | 14 ++--- src/chrome/locale/ja/browserOnboarding.properties | 8 +-- src/chrome/locale/ka/torbutton.properties | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 6 +- src/chrome/locale/sv/aboutTor.dtd | 38 ++++++------- src/chrome/locale/sv/browserOnboarding.properties | 68 +++++++++++------------ src/chrome/locale/sv/torbutton.properties | 4 +- src/chrome/locale/tr/browserOnboarding.properties | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/aboutTor.dtd | 20 +++---- 22 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index eee3db56..0c25a117 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -6,5 +6,5 @@ <!ENTITY aboutTBUpdate.changeLogHeading "سجل التغييرات:"> <!ENTITY aboutTBUpdate.circuitDisplayHeading "تصميم جديد لطريقة عرض الدوائر"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "عرض دوائر تور نقل إلى مكان آخر وخضع للتحسين. انقر على زر «هوية الموقع» (تجده يمين شريط العنوانين) لترى العرض الجديد."> <!ENTITY aboutTBUpdate.learnMore "إعرف/ي أكثر "> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 435bdfdc..7c5ba384 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -7,8 +7,8 @@ <!ENTITY aboutTor.title "O Toru"> <!ENTITY aboutTor.ready.label "Prohlížejte v soukromí."> -<!ENTITY aboutTor.ready2.label "Vše je připraveno pro maximální soukromí pro vaše prohlížení."> -<!ENTITY aboutTor.failure.label "Něco se nepovedlo!"> +<!ENTITY aboutTor.ready2.label "Vše je připraveno pro maximální soukromí Vašeho prohlížení."> +<!ENTITY aboutTor.failure.label "Něco se pokazilo!"> <!ENTITY aboutTor.failure2.label "Tor v tomto prohlížeči nefunguje."> <!ENTITY aboutTor.search.label "Vyhledejte s DuckDuckGo"> diff --git a/src/chrome/locale/cs/brand.properties b/src/chrome/locale/cs/brand.properties index 1ac05c0b..7a8228a1 100644 --- a/src/chrome/locale/cs/brand.properties +++ b/src/chrome/locale/cs/brand.properties @@ -7,10 +7,10 @@ brandShortName=Prohlížeč Tor brandFullName=Prohlížeč Tor vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, domovská stránka s vestavěných vyhledávačem +homePageSingleStartMain=Firefox Start, domovská stránka s vestavěným vyhledávačem homePageImport=Importovat vaši domovskou stránku z aplikace %S homePageMigrationPageTitle=Výběr domovské stránky -homePageMigrationDescription=Vyberte prosím domovskou stránku, kterou chcete používat: +homePageMigrationDescription=Vyberte prosím domovskou stránku, kterou si přejete používat: syncBrandShortName=Synchronizace diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties index ef9b8092..acbe680a 100644 --- a/src/chrome/locale/cs/torbutton.properties +++ b/src/chrome/locale/cs/torbutton.properties @@ -21,10 +21,10 @@ torbutton.popup.external.suggest = Chcete-li být v bezpečí, otevírejte staž torbutton.popup.launch = Stáhnout soubor torbutton.popup.cancel = Zrušit torbutton.popup.dontask = Od teď stahovat soubory automaticky -torbutton.popup.no_newnym = Torbutton vám nemůže bezpečně poskytnout novou identitu, protože nemá přístup ke controlnímu portu Tor.\n\nMáte spuštěn Tor Browser Bundle? +torbutton.popup.no_newnym = Torbutton vám nemůže bezpečně poskytnout novou identitu, protože nemá přístup ke kontrolnímu portu Tor.\n\nMáte spuštěn Tor Browser Bundle? torbutton.security_settings.menu.title = Nastavení zabezpečení torbutton.title.prompt_torbrowser = Důležitá zpráva Torbutton -torbutton.popup.prompt_torbrowser = Torbutton nyní pracuje jinak: nemůžete jej nyní vypnout.\n\nPro tuto změnu jsme se rozhodli kvůli bezpečnosti používvání Torbutton v prohlížeči. který je zároveň využíván pro prohlížení mimo síť Tor. Docházelo kvůli tomu k příliš mnoha chybám, které jsme nemohli jinak opravit.\n\nPokud chcete dále používat Firefox běžným způsobem, nainstalujte si Tor Browser Bundle. Nastavení soukromí prohlížeče Tor jsou nadřazeny těm ve Firefoxu, dokonce i když Firefox používáte společně s Torbutton. \n\nTorbutton můžete odstranit v Nástroje > Doplňky > Rozšíření a klepnutím na tlačítko Odebrat. +torbutton.popup.prompt_torbrowser = Torbutton nyní pracuje jinak: nemůžete jej nyní vypnout.\n\nPro tuto změnu jsme se rozhodli kvůli bezpečnosti používání Torbutton v prohlížeči. který je zároveň využíván pro prohlížení mimo síť Tor. Docházelo kvůli tomu k příliš mnoha chybám, které jsme nemohli jinak opravit.\n\nPokud chcete dále používat Firefox běžným způsobem, nainstalujte si Tor Browser Bundle. Nastavení soukromí prohlížeče Tor jsou nadřazeny těm ve Firefoxu, dokonce i když Firefox používáte společně s Torbutton. \n\nTorbutton můžete odstranit v Nástroje > Doplňky > Rozšíření a klepnutím na tlačítko Odebrat. torbutton.popup.short_torbrowser = Důležitá informace!\n\nTorbutton je nyní stále aktivní.\n\nPro více informací klepněte na Torbutton. torbutton.popup.confirm_plugins = Zásuvné moduly, jako je třeba Flash, mohou narušit vaše soukromí a anonymitu.\n\nTaké mohou obejít Tor a vyzradit vaše umístění a IP adresu.\n\nOpravdu chcete zásuvné moduly povolit?\n\n diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index eaf46742..ef2e85a9 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -16,7 +16,7 @@ torbutton.panel.label.enabled = Tor aktiveret extensions.torbutton(a)torproject.org.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data. torbutton.popup.external.title = Download en ekstern filtype? torbutton.popup.external.app = Tor Browser kan ikke vis denne file. Du skal derfor åbne den med et andet program.\n\n -torbutton.popup.external.note = Nogle filtyper kan lede programmer til at forbinde til internettet uden at bruge Tor.\n\n +torbutton.popup.external.note = Nogle filtyper kan lede programmer til at oprette forbindelse til internettet uden at bruge Tor.\n\n torbutton.popup.external.suggest = For at være sikker bør du kun åbne downloade filer mens du er offline, eller bruge en Tor Live CD såsom Tails.\n torbutton.popup.launch = Download fil torbutton.popup.cancel = Annuller diff --git a/src/chrome/locale/el/aboutDialog.dtd b/src/chrome/locale/el/aboutDialog.dtd index a5c0cf69..d75b039e 100644 --- a/src/chrome/locale/el/aboutDialog.dtd +++ b/src/chrome/locale/el/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; έχει φτιαχτεί από">  <!ENTITY project.tpoLink "ο &vendorShortName;"> -<!ENTITY project.end ",μια μη κερδοσκοπική οργάνωση που υπερασπίζεται την ιδιωτικότητα και την ελευθερεία σας στο διαδύκτιο."> +<!ENTITY project.end ", μια μη κερδοσκοπική οργάνωση που υπερασπίζεται την ιδιωτικότητα και την ελευθερία σας στο διαδίκτυο."> <!ENTITY help.start "Θέλετε να βοηθήσετε?">  diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 738b81ac..96301e2a 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> <!ENTITY aboutTor.ready.label "Εξερευνήστε. Με ιδιωτικότητα."> -<!ENTITY aboutTor.ready2.label "Είσαι έτοιμος για την πιο ιδιωτική εμπειρία περιήγησης."> +<!ENTITY aboutTor.ready2.label "Είστε έτοιμος για την πιο ιδιωτική εμπειρία περιήγησης."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser."> @@ -15,7 +15,7 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ερωτήσεις?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Κοιτάξτε το εγχειρίδιό μας για τον Tor Browser»"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Κοιτάξτε το εγχειρίδιο μας για τον Tor Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Εγχειρίδιο του Tor Browser"> @@ -24,10 +24,10 @@ <!ENTITY aboutTor.getInvolved.label "Βοηθήστε κι εσείς »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενά σας."> +<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Η ισχύς των πολλών. "> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Ισχύς εν τη ενώσει."> <!ENTITY aboutTor.donationBanner.line2a "Η ανωνυμία αγαπά την παρέα."> <!ENTITY aboutTor.donationBanner.line2b "Προωθήστε τα ανθρώπινα δικαιώματα παγκοσμίως."> diff --git a/src/chrome/locale/el/browserOnboarding.properties b/src/chrome/locale/el/browserOnboarding.properties index 766e982a..680a904d 100644 --- a/src/chrome/locale/el/browserOnboarding.properties +++ b/src/chrome/locale/el/browserOnboarding.properties @@ -13,7 +13,7 @@ onboarding.tour-tor-privacy.description=Ο Tor Browser απομονώνει τα onboarding.tour-tor-privacy.button=Πάμε στο Δίκτυο Tor onboarding.tour-tor-network=Δίκτυο Tor -onboarding.tour-tor-network.title=Ας ταξιδεύσουμε σε ένα αποκεντρωμένο δίκτυο. +onboarding.tour-tor-network.title=Ας ταξιδέψουμε σε ένα αποκεντρωμένο δίκτυο. onboarding.tour-tor-network.description=Ο Tor Browser σας συνδέει στο δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές από όλο τον κόσμο. Σε αντίθεση με ένα VPN, δεν υπάρχει κανένα σημείο αποτυχίας ή κεντρική οντότητα που πρέπει να εμπιστευτείτε για να απολαύσετε το διαδίκτυο ιδιωτικά. onboarding.tour-tor-network.button=Πάμε στην προεπισκόπηση κυκλώματος @@ -24,7 +24,7 @@ onboarding.tour-tor-circuit-display.button=Βλέπω το μονοπάτι μο onboarding.tour-tor-security=Ασφάλεια onboarding.tour-tor-security.title=Επιλέξτε την εμπειρία σας. -onboarding.tour-tor-security.description=Μπορούμε να προσφέρουμε επιπρόσθετες ρυθμίσεις για να ενισχύσουμε την ασφάλεια του περιηγητή σας. Οι Ρυθμίσεις Ασφάλειας σας επιτρέπουν να μπλοκάρεετε στοιχεία που θα μπορούσαν να χρηστιμοποιηθούν για επιθέσεις στον υπολογιστή σας. Επίλεξτε παρακάτω για να δείτε τι κάνουν οι διαφορετικές ρυθμίσεις. +onboarding.tour-tor-security.description=Μπορούμε να προσφέρουμε επιπρόσθετες ρυθμίσεις για να ενισχύσουμε την ασφάλεια του περιηγητή σας. Οι Ρυθμίσεις Ασφαλείας σας επιτρέπουν να μπλοκάρεετε στοιχεία που θα μπορούσαν να χρησιμοποιηθούν για επιθέσεις στον υπολογιστή σας. Επίλεξτε παρακάτω για να δείτε τι κάνουν οι διαφορετικές ρυθμίσεις. onboarding.tour-tor-security.button=Έλεγχος Ρυθμίσεων onboarding.tour-tor-expect-differences=Προτάσεις εμπειρίας @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=Δείτε τις Συχνές Ε onboarding.tour-tor-onion-services=Υπηρεσίες Onion onboarding.tour-tor-onion-services.title=Προστατευτείτε πιο πολύ. -onboarding.tour-tor-onion-services.description=Οι υπηρεσίες του Onion είναι ιστοσελίδες που τελειώνουν σε .onion και παρέχουν επιπλέον προστασία σε όσους δημοσιεύουν και επισκέπτονται, συμπεριλαμβανομένου και ασφαλειών ενάντια στη λογοκρισία. Οι υπηρεσίες του Onion επιτρέπουν στον καθένα να παράσχει υλικά και υπηρεσίες ανώνυμα. Επιλέξτε κάτω για να επισκεφτείτε τη σελίδα του Onion DuckDuckGo. +onboarding.tour-tor-onion-services.description=Οι υπηρεσίες του Onion είναι ιστοσελίδες που τελειώνουν σε .onion και παρέχουν επιπλέον προστασία στους δημοσιευτές και τους επισκέπτες, συμπεριλαμβανομένων και μέτρων ασφάλειας ενάντια στη λογοκρισία. Οι υπηρεσίες του Onion επιτρέπουν στον καθένα να παράσχει υλικά και υπηρεσίες ανώνυμα. Επιλέξτε κάτω για να επισκεφτείτε τη σελίδα του Onion DuckDuckGo. onboarding.tour-tor-onion-services.button=Επισκεφτείτε ένα Onion # Circuit Display onboarding. @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Τα κυκλώματα δημιουρ onboarding.tor-circuit-display.diagram.title=Προεπισκόπηση κυκλώματος onboarding.tor-circuit-display.diagram.msg=Αυτό το διάγραμμα δείχνει τις συνδέσεις που αποτελούν το κύκλωμα για αυτήν την ιστοσελίδα. Για να αποφύγετε τη σύνδεση της δραστηριότητας από σελίδα σε σελίδα, κάθε ιστοσελίδα παίρνει διαφορετικό κύκλωμα. -onboarding.tor-circuit-display.new-circuit.title=Χρειάζεσαι καινούριο κύκλωμα; +onboarding.tor-circuit-display.new-circuit.title=Χρειάζεστε καινούριο κύκλωμα; onboarding.tor-circuit-display.new-circuit.msg=Αν δεν μπορείτε να συνδεθείτε στην ιστοσελίδα που προσπαθείτε να συνδεθείτε ή αν δεν φορτώνει σωστά, τότε μπορείτε να χρησιμοποιήσετε αυτό το κουμπί για να ανανεώσετε τη σελίδα με νέο κύκλωμα. diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index a6d1ec4b..f67c4434 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -16,4 +16,4 @@ <!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  <!ENTITY bottomLinks.license "Informations de licence"> -<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques de commerce de « The Tor Project, Inc. »"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index f373d753..959842c6 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> <!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du Navigateur Tor"> -<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies d’anonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> +<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies d’anonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> <!ENTITY aboutTor.getInvolved.label "Impliquez-vous »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html"> diff --git a/src/chrome/locale/fr/brand.dtd b/src/chrome/locale/fr/brand.dtd index b3fe3f1c..a55f3014 100644 --- a/src/chrome/locale/fr/brand.dtd +++ b/src/chrome/locale/fr/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Navigateur Tor"> <!ENTITY brandFullName "Navigateur Tor"> <!ENTITY vendorShortName "Projet Tor"> -<!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques déposées de la Fondation Mozilla."> +<!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques de commerce de la Fondation Mozilla.">  <!ENTITY plugins.installed.find "Cliquer pour charger les greffons système installés"> diff --git a/src/chrome/locale/ja/aboutTBUpdate.dtd b/src/chrome/locale/ja/aboutTBUpdate.dtd index 4ded2bf7..8be08aa4 100644 --- a/src/chrome/locale/ja/aboutTBUpdate.dtd +++ b/src/chrome/locale/ja/aboutTBUpdate.dtd @@ -7,4 +7,4 @@ <!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "さらに詳しく"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 8c573564..19a54e77 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -6,19 +6,19 @@ <!ENTITY aboutTor.title "Torについて"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "探索する。プライベートに。"> +<!ENTITY aboutTor.ready2.label "世界で最もプライベートなブラウジングを体験する準備が整いました。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> <!ENTITY aboutTor.failure2.label "Torは、このブラウザでは動作しません。"> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "DuckDuckGoで検索"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "質問がありますか？"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser マニュアル"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> <!ENTITY aboutTor.getInvolved.label "Get Involved »"> @@ -31,12 +31,12 @@ <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2c "自由のために立ち上がる。"> <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2f "我々にはあなたのサポートが必要です!"> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties index 2261c993..e3f09909 100644 --- a/src/chrome/locale/ja/browserOnboarding.properties +++ b/src/chrome/locale/ja/browserOnboarding.properties @@ -5,14 +5,14 @@ onboarding.tour-tor-welcome=ようこそ onboarding.tour-tor-welcome.title=You’re ready. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.button=今すぐ開始 onboarding.tour-tor-privacy=プライバシー onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Torネットワーク onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=よくある質問を見る onboarding.tour-tor-onion-services=Onion Services onboarding.tour-tor-onion-services.title=Be extra protected. @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assign onboarding.tor-circuit-display.diagram.title=Circuit Display onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=新しいサーキットが必要ですか? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index 21d96e32..cbe0d8b0 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -24,7 +24,7 @@ torbutton.popup.dontask = ავტომატურად ჩამოიტ torbutton.popup.no_newnym = Torbutton ვერ ახერხებს ახალი ვინაობის უსაფრთხოდ მონიჭებას. წვდომა არ აქვს წვდომა Tor-ის მართვის პორტთან.\n\nAre you running Tor Browser Bundle? torbutton.security_settings.menu.title = უსაფრთხოების პარამეტრები torbutton.title.prompt_torbrowser = მნიშვნელოვანი ინფორმაცია Torbutton-ის შესახებ -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton ახლა უკვე სხვანაირად მუშაობს: მისი გამორთვა აღარ შეგიძლიათ.\n\nეს ცვლილება იმიტომ გავაკეთეთ, რომ არაა უსაფრთხო Torbutton-ის იმ ბრაუზერში გამოყენება, რომელიც Tor-ის გარეშეც მუშაობს. ამ ყველაფერს უამრავი ხარვეზი ახლავს თან, რომელთა მოგვარებაც სხვა გზით ვერ მოვახერხებთ.\n\nთუ გსურთ განაგრძოთ Firefox-ის ჩვეულებრივ გამოყენება, უნდა ამოშალოთ Torbutton და ჩამოტვირთოთ Tor-ბრაუზერის კრებ ული. პირადი მონაცემების დაცვის შესაძლებლობები გაცილებით უკეთესია Tor-ბრაუზერში, ვიდრე ჩვეულებრივ Firefox-ში, მისი Torbutton-თან ერთად გამოყენების შემთხვევაშიც კი.\n\nTorbutton-ის წასაშლელად, გადადით ხელსაწყოები->დამატებები->გაფართოებები და შემდეგ დააწკაპეთ ამოშლის ღილაკს Torbutton-ის გვერდით. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = მოდულობს, როგორიცაა Flash შეუძლია საფრთხის ქვეშ დააყენოს თქვენი პირადი მონაცემები და ვინაობის გაუმხელობა.\n\nმათი საშუალებით, შესაძლებელია Tor-ის გვერდის ავლით დადგინდეს თქვენი მდებარეობა და IP-მისამართი.\n\nნამდვილად გსურთ მოდულების ჩართვა?\n\n diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index 02a58303..7b757280 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Ändringslogg:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ny, omformad kretsrutan"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor-kretsrutan har flyttats och förbättrats! Klicka på webbplatsen Identitetsknapp (ligger på vänster sida av webbadressfältet) för att se den nya kretsrutan."> +<!ENTITY aboutTBUpdate.learnMore "Läs mer"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 94cea14a..76dcfa01 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -6,37 +6,37 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Utforska. Privat."> +<!ENTITY aboutTor.ready2.label "Du är redo för världens mest privata surfupplevelse."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Sök med DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor-webbläsaren »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor-webbläsaren"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> +<!ENTITY aboutTor.getInvolved.label "Engagera dig »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> +<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrka i antal"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2a "Anonymitet älskar sällskap."> +<!ENTITY aboutTor.donationBanner.line2b "Främja universella mänskliga rättigheter."> +<!ENTITY aboutTor.donationBanner.line2c "Stå upp för frihet."> +<!ENTITY aboutTor.donationBanner.line2d "Skydda miljontals privatliv."> +<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> +<!ENTITY aboutTor.donationBanner.line2f "Vi behöver ert stöd!"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha din donation."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Räkna med mig"> diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties index 847225d6..779564db 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Välkommen +onboarding.tour-tor-welcome.title=Du är redo. +onboarding.tour-tor-welcome.description=Tor-webbläsaren erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. +onboarding.tour-tor-welcome.button=Börja nu onboarding.tour-tor-privacy=Sekretess -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. +onboarding.tour-tor-privacy.description=Tor-webbläsaren isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. +onboarding.tour-tor-privacy.button=Gå till Tor-nätverket -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Tor-nätverk +onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. +onboarding.tour-tor-network.description=Tor-webbläsaren ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.button=Gå till kretsvisning -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Kretsvisning +onboarding.tour-tor-circuit-display.title=Se din väg. +onboarding.tour-tor-circuit-display.description=För varje domän du besöker förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets genom att klicka på "ny krets för denna webbplats" på vår kretsvisning. +onboarding.tour-tor-circuit-display.button=Se Min väg onboarding.tour-tor-security=Säkerhet -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Välj din upplevelse. +onboarding.tour-tor-security.description=Vi ger dig också ytterligare inställningar för att stöta upp din webbläsares säkerhet. Våra säkerhetsinställningar kan du blockera element som kan användas för att attackera din dator. Klicka nedan för att se vad de olika alternativen gör. +onboarding.tour-tor-security.button=Granska Inställningar -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Erfarenhets tips +onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader. +onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare, och beroende på din säkerhetsnivå, vissa element kanske inte fungerar eller ladda. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. +onboarding.tour-tor-expect-differences.button=Se Vanliga frågor onboarding.tour-tor-onion-services=Onion tjänster -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Var extra skyddad. +onboarding.tour-tor-onion-services.description=Onion-tjänster är webbplatser som slutar med en .onion som ger extra skydd till utgivare och besökare, inklusive extra garantier mot censur. Onion-tjänster tillåter alla att tillhandahålla innehåll och tjänster anonymt. Klicka nedan för att besöka DuckDuckGo-onion webbplatsen. +onboarding.tour-tor-onion-services.button=Besök en Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Nästa onboarding.tor-circuit-display.done=Färdig -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 av 3 +onboarding.tor-circuit-display.two-of-three=2 av 3 +onboarding.tor-circuit-display.three-of-three=3 av 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hur fungerar kretsar? +onboarding.tor-circuit-display.intro.msg=Kretsar består av slumpmässigt tilldelade reläer, som är datorer runt om i världen konfigurerade för att vidarebefordra Tor-trafik. Kretsar kan du bläddra privat och ansluta till onion-tjänster. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Kretsvisning +onboarding.tor-circuit-display.diagram.msg=Detta diagram visar reläer som utgör kretsen för denna webbplats. För att förhindra länkning av aktivitet över olika platser, varje webbplats får en annan krets. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Behöver du en ny krets? +onboarding.tor-circuit-display.new-circuit.msg=Om du inte kan ansluta till webbplatsen du försöker besöka eller det inte laddas ordentligt, kan du använda den här knappen för att ladda om webbplatsen med en ny krets. diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 5069c79e..83f5eee7 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -51,5 +51,5 @@ profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen änd profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Anslutning krypterad (Onion-tjänst, %1$S, %2$S bit nycklar, %3$S) +pageInfo_OnionEncryption=Anslutning krypterad (Onion-tjänst) diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties index 219f3037..1b10fd9a 100644 --- a/src/chrome/locale/tr/browserOnboarding.properties +++ b/src/chrome/locale/tr/browserOnboarding.properties @@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.button=Başlayın onboarding.tour-tor-privacy=Kişisel Gizlilik onboarding.tour-tor-privacy.title=İzleyenlere ve meraklılara hadlerini bildirin. -onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattıığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağo' üzerine tıklayın. +onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağı' üzerine tıklayın. onboarding.tour-tor-privacy.button=Tor Ağına Geç onboarding.tour-tor-network=Tor Ağı diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index e349d913..358a958a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -42,7 +42,7 @@ <!ENTITY torbutton.prefs.sec_safest_description "Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler."> <!ENTITY torbutton.prefs.sec_safest_list_label "En güvenli ayarlar kullanıldığında:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Ayrıntılı bilgi alın"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript,,HTTPS kullanmayan sitelerde devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript, HTTPS kullanmayan sitelerde devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript betikleri tüm sitelerde varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_typography "Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır."> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 502cbb8c..f61e2a91 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor：众人拾柴火焰高"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2a "匿名的表示对公司的爱意。"> +<!ENTITY aboutTor.donationBanner.line2b "推进基本人权。"> +<!ENTITY aboutTor.donationBanner.line2c "为自由呐喊。"> +<!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。"> +<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> +<!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。"> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> +<!ENTITY aboutTor.donationBanner.buttonB "算我一个">

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit e00084a6a67ba6ab0c504421ed13a49765dc83d2 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Nov 6 15:47:31 2018 -0800 Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading Large pdf files download in parts via range-based requests so that users can begin reading before the entire file has finished downloading. This is implemented using XMLHttpRequests. However, since these requests are created in the chrome, they are given the System Principal and lack the correct firstPartyDomain associated with the parent window. This patch manually sets the XMLHttpRequest's originAttributes to the one provided by the real owning window cached in the RangedChromeActions object. This is done via the chrome-only setOriginAttributes method. The method is called in the xhr_onreadystatechanged() callback rather than directly after construction in getXhr() because the setOriginAttributes implementation requires the internal nsIChannel object to have been created but not used. Fortunately, the XMLHttpRequest object fires the readStateChangedEvent precisely after the channel has been created in the XmlHttpRequest's Open() method. The nsIChannel's nsILoadInfo's OriginAttributes are now overwritten with the known OriginAttributes of the parent window before anything else has had a chance to use it. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index a2ebec9450d4..a9978f7e7863 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -233,6 +233,15 @@ class ChromeActions { return PrivateBrowsingUtils.isContentWindowPrivate(this.domWindow); } + getWindowOriginAttributes() + { + try { + return this.domWindow.document.nodePrincipal.originAttributes; + } catch(err) { + return {}; + } + } + download(data, sendResponse) { var self = this; var originalUrl = data.originalUrl; @@ -591,6 +600,9 @@ class RangedChromeActions extends ChromeActions { var self = this; var xhr_onreadystatechange = function xhr_onreadystatechange() { if (this.readyState === 1) { // LOADING + // override this XMLHttpRequest's OriginAttributes with our cached parent window's + // OriginAttributes, as we are currently running under the SystemPrincipal + this.setOriginAttributes(self.getWindowOriginAttributes()); var netChannel = this.channel; if ("nsIPrivateBrowsingChannel" in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) {

1 0

[torbutton/master] bug 25013: Remove non needed import, it is already available in the window object
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 9c2adcecd64ab6a390e305509fbe77d1acb9ea90 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Oct 22 07:56:35 2018 -0200 bug 25013: Remove non needed import, it is already available in the window object --- src/chrome/content/torbutton.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fc1a38d8..90da5827 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,8 +13,6 @@ let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", { let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); -Cu.importGlobalProperties(["XMLHttpRequest"]); - const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck";

1 0

[torbutton/master] bug 25013: Create symlink to en locale folder following mozilla standard naming
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 78d26b12542bc8b05c3624f0ce17096d0e6cb5db Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 12 02:12:53 2018 -0200 bug 25013: Create symlink to en locale folder following mozilla standard naming Additionally, remove it when using the makexpi to create a xpi package. XPI packages are using the chrome.manifest and they support multi lang bundle. --- makexpi.sh | 4 ++-- src/chrome/locale/en-US | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index 243fbd6b..aa3e665b 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ---------- # create the pkg directory if it doesn't exist yet mkdir -p pkg cd src -echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*" +echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*" +zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*" #mv ../$APP_NAME.jar ./chrome #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar cd .. diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US new file mode 120000 index 00000000..2c4c454f --- /dev/null +++ b/src/chrome/locale/en-US @@ -0,0 +1 @@ +en \ No newline at end of file

1 0

[torbutton/master] Merge remote-tracking branch 'igt0/25013-v4'
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 831c8bee11a464b42dcee9c84ad52fca07e5e241 Merge: 923fd850 78d26b12 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 11:21:30 2018 +0000 Merge remote-tracking branch 'igt0/25013-v4' makexpi.sh | 4 +-- moz.build | 12 ++++++++ src/chrome/content/torbutton.js | 2 -- src/chrome/locale/en-US | 1 + src/jar.mn | 68 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 4 deletions(-)

1 0

[torbutton/master] bug 25013: Add Gecko build system infrastructure into tor button
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 5f10327ae16666ff4beb64a206a64a7760898b01 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Oct 22 07:56:04 2018 -0200 bug 25013: Add Gecko build system infrastructure into tor button --- moz.build | 12 +++++++++++ src/jar.mn | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/moz.build b/moz.build new file mode 100644 index 00000000..5e067c98 --- /dev/null +++ b/moz.build @@ -0,0 +1,12 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +JAR_MANIFESTS += ['src/jar.mn'] +JS_PREFERENCE_FILES += [ + 'src/defaults/preferences/preferences.js', +] +FINAL_TARGET_FILES.features['torbutton(a)torproject.org'] += [ + 'src/install.rdf' +] diff --git a/src/jar.mn b/src/jar.mn new file mode 100644 index 00000000..142a5773 --- /dev/null +++ b/src/jar.mn @@ -0,0 +1,68 @@ +#filter substitution + +torbutton.jar: + +% content torbutton %content/ + + content/ (chrome/content/*) + components/ (components/*) + defaults/ (defaults/*) + modules/ (modules/*) + skin/ (chrome/skin/*) + +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/torbutton.xul +% overlay chrome://browser/content/preferences/connection.xul chrome://torbutton/content/pref-connection.xul +% overlay chrome://messenger/content/messenger.xul chrome://torbutton/content/torbutton_tb.xul +% overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://torbutton/content/torbutton_tb.xul +% overlay about:addons chrome://torbutton/content/torbutton-extensions.xul +% overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul +% resource torbutton % +% resource torbutton-assets resource://torbutton/skin/ contentaccessible=yes + +# browser branding +% override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd +% override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties +% overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul + +# UI customization +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul +% overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul + +# Strings for the about:tbupdate page +% override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd + +% locale torbutton @AB_CD@ %locale/@AB_CD@/ + locale/@AB_CD@/ (chrome/locale/@AB_CD@/*) + +% skin torbutton classic/1.0 %skin/ +% style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css + +# Firefox 4-style component registration +% component {f605ec27-d867-44b5-ad97-2a29276642c3} %components/dragDropFilter.js +% contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} + +% component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} %components/external-app-blocker.js +% contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} + +% component {06322def-6fde-4c06-aef6-47ae8e799629} %components/startup-observer.js +% contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} + +% component {e6204253-b690-4159-bfe8-d4eedab6b3be} %components/cookie-jar-selector.js +% contract @torproject.org/cookie-jar-selector;1 {e6204253-b690-4159-bfe8-d4eedab6b3be} + +% component {5d57312b-5d8c-4169-b4af-e80d6a28a72e} %components/torCheckService.js +% contract @torproject.org/torbutton-torCheckService;1 {5d57312b-5d8c-4169-b4af-e80d6a28a72e} + +% component {f36d72c9-9718-4134-b550-e109638331d7} %components/torbutton-logger.js +% contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d7} + +% component {e33fd6d4-270f-475f-a96f-ff3140279f68} %components/domain-isolator.js +% contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68} + +% category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1 + +% category profile-after-change StartupObserver @torproject.org/startup-observer;1 +% category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 +% category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1

1 0

[tor-browser-build/master] Bug 28260: Use Rust 1.28.0 to build Tor
by gk＠torproject.org 11 Nov '18

11 Nov '18

commit 0a633e6289822f316b838b32fe0135d5b7c9967d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 31 11:04:03 2018 +0100 Bug 28260: Use Rust 1.28.0 to build Tor As rbm currently does not do deep merge of options hashes (bug 26185) we cannot modify var/* options from the input_files section (or we lose all the other var/* options). As a workaround we move the two options we need to modify under input_file_var/ instead of var/. --- projects/rust/build | 4 ++-- projects/rust/config | 11 +++++++++-- projects/tor/config | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 5f421c7..7ae3073 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -2,7 +2,7 @@ [% c('var/setarch') %] [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist +mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] @@ -32,7 +32,7 @@ export PATH="$distdir-rust-old/bin:$PATH" done cd .. ln -s x86_64-apple-darwin11 x86_64-apple-darwin - mkdir -p $distdir/helper + mkdir $distdir/helper # We need to adapt our CFLAGS and make sure our flags are passed down to all # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort diff --git a/projects/rust/config b/projects/rust/config index d3f9c40..83ae690 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,8 +1,15 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.26.1 -var: +version: '[% c("input_file_var/rust_version") %]' + +# those values can be changed from the input_files section of other +# projects. See projects/tor/config and bug 28260. +input_file_var: + rust_version: 1.26.1 prev_version: 1.25.0 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' rust_arch: '[% c("arch") %]' container: use_container: 1 diff --git a/projects/tor/config b/projects/tor/config index bb743ca..cc6df23 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -60,4 +60,9 @@ input_files: project: '[% c("var/compiler") %]' - name: rust project: rust + # Tor needs rust >= 1.28.0 + # See bug 28260 + input_file_var: + rust_version: 1.28.0 + prev_version: 1.27.2 enable: '[% c("var/linux") && c("var/nightly") %]'

1 0

[torbutton/master] Bug 28039: Enable dump() if log method is 0
by gk＠torproject.org 09 Nov '18

09 Nov '18

commit 923fd8500a16b0a343450621a62ea10175c38b3d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 22 11:37:19 2018 +0000 Bug 28039: Enable dump() if log method is 0 Without setting `browser.dom.window.dump.enabled` explicitly to `true` it is not possible anymore to capture output in the terminal when the log method is set to 0. We make sure that `browser.dom.window.dump.enabled` is set to `true` in that case and disable it again otherwise, unless Tor Launcher has enabled logging in a terminal as well. For context see: https://bugzilla.mozilla.org/show_bug.cgi?id=379797 https://bugzilla.mozilla.org/show_bug.cgi?id=1395711 --- src/components/torbutton-logger.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index b25d039b..fdf7bb7d 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -154,6 +154,16 @@ TorbuttonLogger.prototype = switch (data) { case "extensions.torbutton.logmethod": this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); + if (this.logmethod === 0) { + Services.prefs.setBoolPref("browser.dom.window.dump.enabled", + true); + } else if (Services.prefs. + getIntPref("extensions.torlauncher.logmethod", 3) !== 0) { + // If Tor Launcher is not available or its log method is not 0 + // then let's reset the dump pref. + Services.prefs.setBoolPref("browser.dom.window.dump.enabled", + false); + } break; case "extensions.torbutton.loglevel": this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel");

1 0

[tor-launcher/master] Bug 28039: Enable dump() if log method is 0
by gk＠torproject.org 09 Nov '18

09 Nov '18

commit 80749f18beb93f94cb6be9a5e2c17438ff133ab8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 22 11:40:28 2018 +0000 Bug 28039: Enable dump() if log method is 0 Without setting `browser.dom.window.dump.enabled` explicitly to `true` it is not possible anymore to capture output in the terminal when the log method is set to 0. We make sure that `browser.dom.window.dump.enabled` is set to `true` in that case and disable it again otherwise, unless Torbutton has enabled logging in a terminal as well. For context see: https://bugzilla.mozilla.org/show_bug.cgi?id=379797 https://bugzilla.mozilla.org/show_bug.cgi?id=1395711 --- src/modules/tl-logger.jsm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index a2ea404..551ad92 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -151,6 +151,14 @@ let TLLoggerInternal = // Private case "extensions.torlauncher.logmethod": this.mLogMethod = TorLauncherUtil.getIntPref( "extensions.torlauncher.logmethod"); + if (this.mLogMethod === 0) { + TorLauncherUtil.setBoolPref("browser.dom.window.dump.enabled", true); + } else if (TorLauncherUtil. + getIntPref("extensions.torbutton.logmethod", 3) !== 0) { + // If Torbutton is not available or its log method is not 0 + // then let's reset the dump pref. + TorLauncherUtil.setBoolPref("browser.dom.window.dump.enabled", false); + } break; case "extensions.torlauncher.loglevel": this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-browser-build/maint-8.0] Cleaning up HTTPS-Everywhere keys
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit 7daa78893b9b6a2034617233a0bb85c272d07fa1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 8 18:33:53 2018 +0000 Cleaning up HTTPS-Everywhere keys Adding Alexis' and keeping only Bill's in addition to that --- keyring/https-everywhere.gpg | Bin 203297 -> 13943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index f6a9dfc..98b0ec6 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[tor-browser-build/master] Cleaning up HTTPS-Everywhere keys
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit ee32f3ea93954ab5d13cdcf333a1f85aa3dca02a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 8 18:33:53 2018 +0000 Cleaning up HTTPS-Everywhere keys Adding Alexis' and keeping only Bill's in addition to that --- keyring/https-everywhere.gpg | Bin 203297 -> 13943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index f6a9dfc..98b0ec6 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[torbutton/master] Bug 28187: Change tor circuit icon to torbutton.svg
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit 6a9a4f528d8b8254402802a7a86cd722b747a5a6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 2 10:03:35 2018 -0700 Bug 28187: Change tor circuit icon to torbutton.svg Also, introduce a "new circuit" icon (designed by Antonela Debiasi) to hamburger menu. --- src/chrome/content/menu-items-overlay.xul | 2 ++ src/chrome/skin/new_circuit.svg | 8 ++++++++ src/chrome/skin/relay.svg | 10 ---------- src/chrome/skin/tor-circuit-display.css | 6 +++--- src/chrome/skin/torbutton.css | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/menu-items-overlay.xul b/src/chrome/content/menu-items-overlay.xul index 274c9c71..b2e862b3 100644 --- a/src/chrome/content/menu-items-overlay.xul +++ b/src/chrome/content/menu-items-overlay.xul @@ -15,10 +15,12 @@ label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> <toolbarbutton id="appMenuNewIdentity" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-identity-key" label="&torbutton.context_menu.new_identity;" oncommand="torbutton_new_identity();"/> <toolbarbutton id="appMenuNewCircuit" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-circuit-key" label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> diff --git a/src/chrome/skin/new_circuit.svg b/src/chrome/skin/new_circuit.svg new file mode 100644 index 00000000..e0a93cc8 --- /dev/null +++ b/src/chrome/skin/new_circuit.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Icon / New Circuit(a)1.5x</title> + <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> +</svg> diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg deleted file mode 100644 index b2f5f16c..00000000 --- a/src/chrome/skin/relay.svg +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>relay</title> - <desc>Created with Sketch.</desc> - <defs></defs> - <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> - <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> - </g> -</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index ed17f91d..576590a4 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -8,12 +8,12 @@ and lines drawn between them to represent Tor network inter-relay connections. #circuit-display-content { - background-image: url(chrome://torbutton/skin/relay.svg); + background-image: url(chrome://torbutton/skin/torbutton.svg); background-position: 1em 1em; background-repeat: no-repeat; background-size: 24px auto; - background-color: rgba(255,255,255,0.4); - background-blend-mode: lighten; + background-color: rgba(255,255,255,0.15); + background-blend-mode: overlay; cursor: default; padding: 0.5em 0px 0.5em; padding-inline-end: 1em; diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 928ba93d..28333874 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -80,5 +80,5 @@ svg#tor-circuit circle.node-circle { } #appMenuNewCircuit { - list-style-image: url("chrome://torbutton/skin/relay.svg"); + list-style-image: url("chrome://torbutton/skin/new_circuit.svg"); }

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 06 Nov '18

06 Nov '18

commit 78574ef55b33501a61fa3fbb9fc266ceb6de86fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 6 13:03:28 2018 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 38b0b9a..3bd05ed 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -35,6 +35,20 @@ Tor Browser 8.5a4 -- October 23 2018 * OS X * Bug 27320: Build certutil for macOS +Tor Browser 8.0.3 -- October 23 2018 + * All platforms + * Update Firefox to 60.3.0esr + * Update Torbutton to 2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + * Update HTTPS Everywhere to 2018.9.19 + * Update NoScript to 10.1.9.9 + * Linux + * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 + * Bug 27552: Use bundled dir on CentOS/RHEL 6 + Tor Browser 8.5a3 -- October 4 2018 * All platforms * Update Firefox to 60.2.1esr

1 0

[tor-browser-build/master] Bug 28310: don't build obfs4 with module versioning support
by gk＠torproject.org 05 Nov '18

05 Nov '18

commit 2e468e7b9b13cec82bd8034925433a7fd394a97d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 5 11:26:06 2018 +0100 Bug 28310: don't build obfs4 with module versioning support --- projects/obfs4/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/obfs4/build b/projects/obfs4/build index 287704a..2c3f933 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -16,6 +16,12 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +[% IF c("var/nightly") -%] + # Remove go.mod and go.sum files until we can build using Go module + # versioning (see bug 28325). + rm -f go.mod go.sum +[% END -%] + mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy

1 0

[tor-browser-build/master] Bug 27827: pass -tmpdir to the linker in snowflake build
by gk＠torproject.org 31 Oct '18

31 Oct '18

commit 28abf57bd5bd307262741ac679a80e98aa389d20 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 16 18:40:59 2018 -0600 Bug 27827: pass -tmpdir to the linker in snowflake build The update to go 1.11.1 fixed part of #27827, namely the /tmp/go-buildRANDOMNUM paths embedded in the binary. However there is still a single /tmp/go-link-RANDOMNUM/go.o path remaining -- it comes from here: https://github.com/golang/go/blob/go1.11.1/src/cmd/link/internal/ld/lib.go#… The random path affects the Go build ID even if we overwrite the random digits in the binary. Luckily there's a -tmpdir flag that lets us override the random path. --- projects/snowflake/build | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 693d853..777d360 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -35,32 +35,13 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - [% c("var/faketime") %] go build -ldflags '-s' + # The -tmpdir flag overrides what would otherwise be a randomly generated + # path, /tmp/go-link-RANDOMNUM/go.o. + mkdir -p /var/tmp/go-link.tmpdir + [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' [% ELSE -%] go build -ldflags '-s' [% END -%] -[% IF c("var/osx") -%] - # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 - # on Darwin embeds such paths and the issue is unsolved in upstream Go as of - # 2016-06-28: - # https://github.com/golang/go/issues/9206#issuecomment-310476743 - # The two kinds of paths are ("000000000" stands for 9 random digits): - # /tmp/go-build000000000 - # /tmp/go-link-000000000 - # Such paths are the output of ioutil.TempDir("", "go-build") and - # ioutil.TempDir("", "go-link-"). - cp -a client client.stomped - sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped - # Sanity check: make sure the file actually changed. If it did not, it could - # mean that a change in go or clang has made this step unnecessary. - if cmp client client.stomped - then - echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." - echo "Check projects/snowflake/build" - exit 1 - fi - mv -f client.stomped client -[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Bug 27827: update go to 1.11.1
by gk＠torproject.org 31 Oct '18

31 Oct '18

commit 1ca5a195c785f70cac791117a4e12d49482a206f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 17 09:28:58 2018 -0600 Bug 27827: update go to 1.11.1 For some reason, this version of go requires setting _GLIBCXX_USE_CXX11_ABI=1 in the snowflake build, not only in go-webrtc. https://bugs.torproject.org/27827#comment:12 --- projects/go/config | 4 ++-- projects/snowflake/build | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 2a3b1ad..1841705 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.3 +version: 1.11.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 + sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/snowflake/build b/projects/snowflake/build index f3616f4..693d853 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -5,6 +5,11 @@ [% IF c("var/linux") %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" + # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with + # the prebuilt libwebrtc-magic.a libraries. Since we build our own + # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, + # using CGO_CXXFLAGS. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" [% END -%] distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%]

1 0

[tor-browser-build/master] Bug 28258: Don't look for webrtc headers under talk/.
by gk＠torproject.org 31 Oct '18

31 Oct '18

commit 3e75d4bbf273c1494ff9442c67c0dda1f86c6eac Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 31 00:58:26 2018 -0600 Bug 28258: Don't look for webrtc headers under talk/. This avoids a harmless error message in the build log: find: `talk/': No such file or directory Compare to https://github.com/keroserene/go-webrtc/commit/bfbd31b3f439346e9cac73df0578… --- projects/webrtc/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 32a66b7..d3975b3 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -146,7 +146,7 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -for h in $(find talk/ webrtc/ -type f -name '*.h'); +for h in $(find webrtc/ -type f -name '*.h'); do mkdir -p "$INCLUDE_DIR/$(dirname $h)" cp -f "$h" "$INCLUDE_DIR/$h"

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28125 - Prevent non-Necko network connections
by gk＠torproject.org 30 Oct '18

30 Oct '18

commit 2c4b103cfef5eafe276713478abf8bd1db057730 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 25 19:17:09 2018 +0000 Bug 28125 - Prevent non-Necko network connections --- .../base/java/org/mozilla/gecko/CrashReporter.java | 5 ++ .../base/java/org/mozilla/gecko/SuggestClient.java | 5 ++ .../homepanel/topstories/PocketStoriesLoader.java | 5 ++ .../mozilla/gecko/distribution/Distribution.java | 5 ++ .../java/org/mozilla/gecko/dlc/BaseAction.java | 6 ++ .../java/org/mozilla/gecko/home/ImageLoader.java | 7 ++ .../mozilla/gecko/icons/loader/IconDownloader.java | 11 +++ .../mozilla/gecko/search/SearchEngineManager.java | 5 ++ .../org/mozilla/gecko/switchboard/SwitchBoard.java | 6 ++ .../org/mozilla/gecko/updater/UpdateService.java | 11 +++ .../gecko/media/GeckoMediaDrmBridgeV21.java | 77 +++++++++++--------- .../exoplayer2/upstream/DefaultHttpDataSource.java | 85 ++++++++++++---------- .../service/utils/AbstractCommunicator.java | 5 ++ 13 files changed, 157 insertions(+), 76 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java index f1305cfc5398..618278773c38 100644 --- a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java +++ b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java @@ -472,6 +472,11 @@ public class CrashReporter extends AppCompatActivity } private void sendReport(File minidumpFile, Map<String, String> extras, File extrasFile) { + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "sendReport: This is Tor Browser. Skipping."); + return; + } + Log.i(LOGTAG, "sendReport: " + minidumpFile.getPath()); final CheckBox includeURLCheckbox = (CheckBox) findViewById(R.id.include_url); diff --git a/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java b/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java index 0ebffeccdf21..137e53cc5c03 100644 --- a/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java +++ b/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java @@ -72,6 +72,11 @@ public class SuggestClient { return mPrevResults; ArrayList<String> suggestions = new ArrayList<String>(); + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return suggestions; + } + if (TextUtils.isEmpty(mSuggestTemplate) || TextUtils.isEmpty(query)) { return suggestions; } diff --git a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java index 7ebead4cfa3f..516c13610047 100644 --- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java @@ -124,6 +124,11 @@ public class PocketStoriesLoader extends AsyncTaskLoader<List<TopStory>> { } protected String makeAPIRequestWithKey(final String apiKey) { + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + HttpURLConnection connection = null; final Uri uri = Uri.parse(GLOBAL_ENDPOINT) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index 7b93eb568acc..ea9534bfd741 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -534,6 +534,11 @@ public class Distribution { return false; } + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return false; + } + URI uri = getReferredDistribution(referrer); if (uri == null) { return false; diff --git a/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java b/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java index 5b1e0004fef1..56cfde26160c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java +++ b/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java @@ -151,6 +151,12 @@ public abstract class BaseAction { protected HttpURLConnection buildHttpURLConnection(String url) throws UnrecoverableDownloadContentException, IOException { try { + if (AppConstants.isTorBrowser()) { + String erdcl = "This is Tor Browser. Downloading is disabled for: " + url; + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + throw new UnrecoverableDownloadContentException(erdcl); + } + System.setProperty("http.keepAlive", "true"); HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(new URI(url)); diff --git a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java index cbbe7babbba4..b6ea0249445c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java @@ -15,6 +15,7 @@ import com.squareup.picasso.Picasso; import com.squareup.picasso.Downloader.Response; import com.squareup.picasso.UrlConnectionDownloader; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.util.ProxySelector; import java.io.File; @@ -91,6 +92,12 @@ public class ImageLoader { @Override protected HttpURLConnection openConnection(Uri path) throws IOException { + if (AppConstants.isTorBrowser()) { + String err = "This is Tor Browser. Downloading is disabled for: " + path.toString(); + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + throw new IOException(err); + } + try { // This is annoying, but |path| is an android.net.Uri and // openConnectionWithProxy() accepts a java.net.URI diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java b/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java index 4a03d440556d..84eb7736e94e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java @@ -12,6 +12,7 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.util.Log; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.icons.decoders.FaviconDecoder; import org.mozilla.gecko.icons.decoders.LoadFaviconResult; @@ -132,6 +133,11 @@ public class IconDownloader implements IconLoader { return null; } + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + HttpURLConnection connection = null; try { @@ -183,6 +189,11 @@ public class IconDownloader implements IconLoader { @VisibleForTesting @NonNull HttpURLConnection connectTo(String uri) throws URISyntaxException, IOException { + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + throw new IOException(); + } + final HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy( new URI(uri)); diff --git a/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java b/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java index 1004b7b25ef1..df9b6d67b467 100644 --- a/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java +++ b/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java @@ -379,6 +379,11 @@ public class SearchEngineManager implements SharedPreferences.OnSharedPreference * @return String containing the country code */ private String fetchCountryCode() { + if (AppConstants.isTorBrowser()) { + Log.i(LOG_TAG, "This is Tor Browser. Skipping."); + return null; + } + // First, we look to see if we have a cached code. final String region = GeckoSharedPrefs.forApp(context).getString(PREF_REGION_KEY, null); if (region != null) { diff --git a/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java b/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java index d78663060f99..e32b50ebadb5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java +++ b/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java @@ -409,6 +409,12 @@ public class SwitchBoard { HttpURLConnection connection = null; InputStreamReader inputStreamReader = null; BufferedReader bufferReader = null; + + if (AppConstants.isTorBrowser()) { + Log.i(TAG, "This is Tor Browser. Skipping."); + return null; + } + try { connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); connection.setRequestProperty("User-Agent", HardwareUtils.isTablet() ? diff --git a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java index 0598105fe108..71e1097711d9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java +++ b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java @@ -379,6 +379,11 @@ public class UpdateService extends IntentService { try { URI uri = getUpdateURI(force); + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + if (uri == null) { Log.e(LOGTAG, "failed to get update URI"); return null; @@ -527,6 +532,12 @@ public class UpdateService extends IntentService { private File downloadUpdatePackage(UpdateInfo info, boolean overwriteExisting) { URL url = null; + + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + try { url = info.uri.toURL(); } catch (java.net.MalformedURLException e) { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java index d0973f3dcc17..39d10615d35c 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java @@ -473,43 +473,48 @@ public class GeckoMediaDrmBridgeV21 implements GeckoMediaDrm { @Override protected Void doInBackground(Void... params) { - try { - URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); - HttpURLConnection urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); - urlConnection.setRequestMethod("POST"); - if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); - - // Add data - urlConnection.setRequestProperty("Accept", "*/*"); - urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); - urlConnection.setRequestProperty("Content-Type", "application/json"); - - // Execute HTTP Post Request - urlConnection.connect(); - - int responseCode = urlConnection.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - BufferedReader in = - new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8)); - String inputLine; - StringBuffer response = new StringBuffer(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - mResponseBody = String.valueOf(response).getBytes(StringUtils.UTF_8); - if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); - if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); - } else { - Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); - } - } catch (IOException e) { - Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); - } catch (URISyntaxException e) { - Log.e(LOGTAG, "Got exception during creating uri ...", e); - } + // AppConstants.isTorBrowser() is in base/, so it's not available in geckoview/ + Log.i(LOGTAG, "This is Tor Browser. Skipping."); return null; + + /* Dead code */ + //try { + // URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); + // HttpURLConnection urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); + // urlConnection.setRequestMethod("POST"); + // if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); + + // // Add data + // urlConnection.setRequestProperty("Accept", "*/*"); + // urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); + // urlConnection.setRequestProperty("Content-Type", "application/json"); + + // // Execute HTTP Post Request + // urlConnection.connect(); + + // int responseCode = urlConnection.getResponseCode(); + // if (responseCode == HttpURLConnection.HTTP_OK) { + // BufferedReader in = + // new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8)); + // String inputLine; + // StringBuffer response = new StringBuffer(); + + // while ((inputLine = in.readLine()) != null) { + // response.append(inputLine); + // } + // in.close(); + // mResponseBody = String.valueOf(response).getBytes(StringUtils.UTF_8); + // if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); + // if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); + // } else { + // Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); + // } + //} catch (IOException e) { + // Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); + //} catch (URISyntaxException e) { + // Log.e(LOGTAG, "Got exception during creating uri ...", e); + //} + //return null; } @Override diff --git a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 75e1f675c5eb..22e9e1ffcb9b 100644 --- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -395,51 +395,56 @@ public class DefaultHttpDataSource implements HttpDataSource { */ private HttpURLConnection makeConnection(URL url, byte[] postBody, long position, long length, boolean allowGzip, boolean followRedirects) throws IOException, URISyntaxException { + // AppConstants.isTorBrowser() is in base/, so it's not available in geckoview/ + Log.i(TAG, "This is Tor Browser. Skipping."); + throw new IOException(); + /** * Tor Project modified the way the connection object was created. For the sake of * simplicity, instead of duplicating the whole file we changed the connection object * to use the ProxySelector. */ - HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); - - connection.setConnectTimeout(connectTimeoutMillis); - connection.setReadTimeout(readTimeoutMillis); - if (defaultRequestProperties != null) { - for (Map.Entry<String, String> property : defaultRequestProperties.getSnapshot().entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - } - for (Map.Entry<String, String> property : requestProperties.getSnapshot().entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - if (!(position == 0 && length == C.LENGTH_UNSET)) { - String rangeRequest = "bytes=" + position + "-"; - if (length != C.LENGTH_UNSET) { - rangeRequest += (position + length - 1); - } - connection.setRequestProperty("Range", rangeRequest); - } - connection.setRequestProperty("User-Agent", userAgent); - if (!allowGzip) { - connection.setRequestProperty("Accept-Encoding", "identity"); - } - connection.setInstanceFollowRedirects(followRedirects); - connection.setDoOutput(postBody != null); - if (postBody != null) { - connection.setRequestMethod("POST"); - if (postBody.length == 0) { - connection.connect(); - } else { - connection.setFixedLengthStreamingMode(postBody.length); - connection.connect(); - OutputStream os = connection.getOutputStream(); - os.write(postBody); - os.close(); - } - } else { - connection.connect(); - } - return connection; + /* Dead code */ + //HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); + + //connection.setConnectTimeout(connectTimeoutMillis); + //connection.setReadTimeout(readTimeoutMillis); + //if (defaultRequestProperties != null) { + // for (Map.Entry<String, String> property : defaultRequestProperties.getSnapshot().entrySet()) { + // connection.setRequestProperty(property.getKey(), property.getValue()); + // } + //} + //for (Map.Entry<String, String> property : requestProperties.getSnapshot().entrySet()) { + // connection.setRequestProperty(property.getKey(), property.getValue()); + //} + //if (!(position == 0 && length == C.LENGTH_UNSET)) { + // String rangeRequest = "bytes=" + position + "-"; + // if (length != C.LENGTH_UNSET) { + // rangeRequest += (position + length - 1); + // } + // connection.setRequestProperty("Range", rangeRequest); + //} + //connection.setRequestProperty("User-Agent", userAgent); + //if (!allowGzip) { + // connection.setRequestProperty("Accept-Encoding", "identity"); + //} + //connection.setInstanceFollowRedirects(followRedirects); + //connection.setDoOutput(postBody != null); + //if (postBody != null) { + // connection.setRequestMethod("POST"); + // if (postBody.length == 0) { + // connection.connect(); + // } else { + // connection.setFixedLengthStreamingMode(postBody.length); + // connection.connect(); + // OutputStream os = connection.getOutputStream(); + // os.write(postBody); + // os.close(); + // } + //} else { + // connection.connect(); + //} + //return connection; } /** diff --git a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java index 9b3ee98f89db..fc3248d72219 100644 --- a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java +++ b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java @@ -68,6 +68,11 @@ public abstract class AbstractCommunicator { } private void openConnectionAndSetHeaders() { + if (AppConstants.isTorBrowser()) { + Log.i(LOG_TAG, "This is Tor Browser. Skipping."); + throw new Exception(); + } + try { Prefs prefs = Prefs.getInstanceWithoutContext(); if (sMozApiKey == null || prefs != null) {

1 0

[tor-browser-build/master] Bug 27439: Add android target for rust compiler
by gk＠torproject.org 26 Oct '18

26 Oct '18

commit 61cdddfa4b7daf96f6bd1a52fb25a3ec055cc401 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Sep 4 09:42:09 2018 -0700 Bug 27439: Add android target for rust compiler --- projects/rust/build | 2 +- projects/rust/config | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 61a5d50..5f421c7 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -6,7 +6,7 @@ mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux-gnu +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('var/rust_arch') %]-unknown-linux-gnu ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" diff --git a/projects/rust/config b/projects/rust/config index b5547f9..d3f9c40 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -3,10 +3,20 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil version: 1.26.1 var: prev_version: 1.25.0 + rust_arch: '[% c("arch") %]' container: use_container: 1 targets: + android-armv7: + var: + rust_arch: x86_64 + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.ar=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-ar --set=target.armv7-linux-androideabi.linker=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-clang --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc + linux: var: arch_deps: @@ -66,7 +76,7 @@ input_files: sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-[% c("arch") %]-unknown-linux-gnu.tar.xz' + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-[% c("var/rust_arch") %]-unknown-linux-gnu.tar.xz' name: prev_rust sig_ext: asc file_gpg_id: 1

1 0

[tor-browser-build/master] Revert "Revert "Bug 28082: Add locales cs, el, hu, ka""
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit e0701803216baa74b4166c34a7b85e00f8e327af Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 25 13:31:36 2018 +0000 Revert "Revert "Bug 28082: Add locales cs, el, hu, ka"" This reverts commit 6803d9a8a4e7c851629cab47342a6579a60f64cd. --- rbm.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rbm.conf b/rbm.conf index 23f3598..5e981ac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -53,17 +53,21 @@ var: locales: - ar - ca + - cs - da - de + - el - es-ES - fa - fr - ga-IE - he + - hu - id - is - it - '[% c("var/locale_ja") %]' + - ka - ko - nb-NO - nl

1 0

[tor-launcher/master] Revert "Revert "Bug 28082: Add locales cs, el, hu, ka""
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit 30fee1c708e5e6cae9c41105847e4d95deec2f20 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 25 11:16:43 2018 +0000 Revert "Revert "Bug 28082: Add locales cs, el, hu, ka"" This reverts commit 670882ad2936a906f3e2d84230714446e98a214c. --- src/chrome/content/network-settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index aaa91ac..1599c28 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,17 +306,21 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", + "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", + "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", + "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", + "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Translations update
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit bff597351775e60648e37e3328e424176d41b712 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 25 11:22:17 2018 +0000 Translations update --- src/chrome/locale/cs/aboutDialog.dtd | 19 ++++++ src/chrome/locale/cs/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/cs/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/cs/brand.dtd | 13 +++- src/chrome/locale/cs/brand.properties | 15 ++-- src/chrome/locale/cs/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/cs/torbutton.dtd | 71 +++++++++++++------ src/chrome/locale/cs/torbutton.properties | 72 ++++++++++++++------ src/chrome/locale/el/aboutDialog.dtd | 19 ++++++ src/chrome/locale/el/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/el/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/el/brand.dtd | 9 ++- src/chrome/locale/el/brand.properties | 11 +-- src/chrome/locale/el/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/el/torbutton.dtd | 53 +++++++++++---- src/chrome/locale/el/torbutton.properties | 60 +++++++++++----- src/chrome/locale/es-AR/aboutDialog.dtd | 19 ++++++ src/chrome/locale/es-AR/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/es-AR/aboutTor.dtd | 42 ++++++++++++ src/chrome/locale/es-AR/brand.dtd | 15 ++++ src/chrome/locale/es-AR/brand.properties | 16 +++++ .../locale/es-AR/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/es-AR/torbutton.dtd | 51 ++++++++++++++ src/chrome/locale/es-AR/torbutton.properties | 55 +++++++++++++++ src/chrome/locale/fr/browserOnboarding.properties | 2 +- src/chrome/locale/hu/aboutDialog.dtd | 19 ++++++ src/chrome/locale/hu/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/hu/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/hu/brand.dtd | 9 ++- src/chrome/locale/hu/brand.properties | 11 +-- src/chrome/locale/hu/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/hu/torbutton.dtd | 39 +++++++++-- src/chrome/locale/hu/torbutton.properties | 52 ++++++++++---- src/chrome/locale/ka/aboutDialog.dtd | 19 ++++++ src/chrome/locale/ka/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/ka/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/ka/brand.dtd | 15 ++-- src/chrome/locale/ka/brand.properties | 15 ++-- src/chrome/locale/ka/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/ka/torbutton.dtd | 73 ++++++++++++++------ src/chrome/locale/ka/torbutton.properties | 72 ++++++++++++++------ 41 files changed, 1168 insertions(+), 334 deletions(-) diff --git a/src/chrome/locale/cs/aboutDialog.dtd b/src/chrome/locale/cs/aboutDialog.dtd new file mode 100644 index 00000000..fd2f3110 --- /dev/null +++ b/src/chrome/locale/cs/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "Aplikace &brandShortName; je vyvÃjena"> + +<!ENTITY project.tpoLink "spoleÄnostÃ &vendorShortName;"> +<!ENTITY project.end ", neziskovou organizacÃ chrÃ¡nÃcÃ vaÅ¡e soukromÃ a svobodu na internetu."> + +<!ENTITY help.start "Chcete pomoci?"> + +<!ENTITY help.donateLink "PÅispÄjte"> +<!ENTITY help.or "nebo"> + +<!ENTITY help.getInvolvedLink "se zapojte"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "OtÃ¡zky?"> + +<!ENTITY bottomLinks.grow "Pomozte sÃti Tor rÅ¯st!"> + +<!ENTITY bottomLinks.license "Informace o licencÃch"> +<!ENTITY tor.TrademarkStatement ""Tor" a "Onion logo" jsou registrovanÃ© ochrannÃ© znÃ¡mky spoleÄnosti Tor Project, Inc."> diff --git a/src/chrome/locale/cs/aboutTBUpdate.dtd b/src/chrome/locale/cs/aboutTBUpdate.dtd new file mode 100644 index 00000000..5c10f2cb --- /dev/null +++ b/src/chrome/locale/cs/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "Aktualizace prohlÃÅŸeÄe Tor"> +<!ENTITY aboutTBUpdate.updated "ProhlÃÅŸeÄ Tor byl aktualizovÃ¡n."> +<!ENTITY aboutTBUpdate.linkPrefix "Informace o tomto vydÃ¡nÃ najdete na "> +<!ENTITY aboutTBUpdate.linkLabel "naÅ¡i webovÃ© strÃ¡nce"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "PÅehled zmÄn:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "NovÃ© zobrazenÃ okruhÅ¯"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "VylepÅ¡ili jsme zobrazenÃ okruhÅ¯ Toru. Pro jeho otevÅenÃ klepnÄte na tlaÄÃtko âIdentita&160#strÃ¡nkyâ umÃstÄnÃ© v levÃ© ÄÃ¡sti adresnÃho ÅÃ¡dku."> +<!ENTITY aboutTBUpdate.learnMore "Zjistit vÃce"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 9f14022b..435bdfdc 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "O Toru"> + +<!ENTITY aboutTor.ready.label "ProhlÃÅŸejte v soukromÃ."> +<!ENTITY aboutTor.ready2.label "VÅ¡e je pÅipraveno pro maximÃ¡lnÃ soukromÃ pro vaÅ¡e prohlÃÅŸenÃ."> +<!ENTITY aboutTor.failure.label "NÄco se nepovedlo!"> +<!ENTITY aboutTor.failure2.label "Tor v tomto prohlÃÅŸeÄi nefunguje."> + +<!ENTITY aboutTor.search.label "Vyhledejte s DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "OtÃ¡zky?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "PodÃvejte se do naÅ¡Ã pÅÃruÄky k prohlÃÅŸeÄi Tor Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "PÅÃruÄka prohlÃÅŸeÄe Tor"> + +<!ENTITY aboutTor.tor_mission.label "Tor Project je neziskovÃ¡ organizace podle US 501(c)(3), kterÃ¡ prosazuje lidskÃ¡ prÃ¡va a svobodu vytvÃ¡ÅenÃm svobodnÃœch a otevÅenÃœch technologiÃ podporujÃcÃ anonymitu a soukromÃ, bez omezenÃ jejich dostupnosti a pouÅŸÃvÃ¡nÃ, vÄetnÄ podpory jejich vÄdeckÃ©ho a vÅ¡eobecnÃ©ho rozvoje."> +<!ENTITY aboutTor.getInvolved.label "Zapojte se Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer"> + +<!ENTITY aboutTor.newsletter.tagline "Nechte si posÃlat nejnovÄjÅ¡Ã informace o Toru."> +<!ENTITY aboutTor.newsletter.link_text "PÅihlaste se k odbÄru zpravodaje Toru."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: SÃla je v poÄtu"> + +<!ENTITY aboutTor.donationBanner.line2a "SpoleÄnost se zÃ¡libou v anonymitÄ."> +<!ENTITY aboutTor.donationBanner.line2b "PosÃlenÃ vÅ¡eobecnÃœch lidskÃœch prÃ¡v."> +<!ENTITY aboutTor.donationBanner.line2c "Postavte se za svobodu."> +<!ENTITY aboutTor.donationBanner.line2d "ChrÃ¡nÃme soukromÃ milionÅ¯ lidÃ."> +<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sÃlit."> +<!ENTITY aboutTor.donationBanner.line2f "PotÅebujeme vaÅ¡i podporu!"> + +<!ENTITY aboutTor.donationBanner.line3 "PÅispÄjte hned a Mozilla vÃ¡s dar zdvojnÃ¡sobÃ."> + +<!ENTITY aboutTor.donationBanner.buttonA "PÅispÄjte"> +<!ENTITY aboutTor.donationBanner.buttonB "Jdu do toho"> diff --git a/src/chrome/locale/cs/brand.dtd b/src/chrome/locale/cs/brand.dtd index 59f665e8..acdcfbf6 100644 --- a/src/chrome/locale/cs/brand.dtd +++ b/src/chrome/locale/cs/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> +<!ENTITY brandShorterName "ProhlÃÅŸeÄ Tor"> +<!ENTITY brandShortName "ProhlÃÅŸeÄ Tor"> +<!ENTITY brandFullName "ProhlÃÅŸeÄ Tor"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "Firefox a loga Firefoxu jsou ochrannou znÃ¡mkou Mozilla Foundation."> + + +<!ENTITY plugins.installed.find "KlepnutÃm naÄtete nainstalovanÃ© systÃ©movÃ© zÃ¡suvnÃ© moduly"> +<!ENTITY plugins.installed.enable "Povolit zÃ¡suvnÃ© moduly"> +<!ENTITY plugins.installed.disable "ZakÃ¡zat zÃ¡suvnÃ© moduly"> +<!ENTITY plugins.installed.disable.tip "KlepnutÃm zabrÃ¡nÃte naÄÃtÃ¡nÃ systÃ©movÃœch zÃ¡suvnÃœch modulÅ¯"> diff --git a/src/chrome/locale/cs/brand.properties b/src/chrome/locale/cs/brand.properties index f63def38..1ac05c0b 100644 --- a/src/chrome/locale/cs/brand.properties +++ b/src/chrome/locale/cs/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=ProhlÃÅŸeÄ Tor +brandShortName=ProhlÃÅŸeÄ Tor +brandFullName=ProhlÃÅŸeÄ Tor vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, domovskÃ¡ strÃ¡nka s vestavÄnÃœch vyhledÃ¡vaÄem +homePageImport=Importovat vaÅ¡i domovskou strÃ¡nku z aplikace %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=VÃœbÄr domovskÃ© strÃ¡nky +homePageMigrationDescription=Vyberte prosÃm domovskou strÃ¡nku, kterou chcete pouÅŸÃvat: -syncBrandShortName=Sync +syncBrandShortName=Synchronizace diff --git a/src/chrome/locale/cs/browserOnboarding.properties b/src/chrome/locale/cs/browserOnboarding.properties new file mode 100644 index 00000000..24234cb2 --- /dev/null +++ b/src/chrome/locale/cs/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=VÃtejte +onboarding.tour-tor-welcome.title=Jste pÅipraveni. +onboarding.tour-tor-welcome.description=ProhlÃÅŸeÄ Tor nabÃzÃ nejvyÅ¡Å¡Ã ÃºroveÅ soukromÃ a bezpeÄnosti pÅi prohlÃÅŸenÃ internetu. OchrÃ¡nÃ vÃ¡s pÅed sledovÃ¡nÃm i cenzurou. RychlÃœ prÅ¯vodce vÃ¡m ukÃ¡ÅŸe, jak ho pouÅŸÃvat. +onboarding.tour-tor-welcome.button=ZaÄÃt + +onboarding.tour-tor-privacy=SoukromÃ +onboarding.tour-tor-privacy.title=OdeÅŸeÅte sledovacÃ a Å¡mÃrujÃcÃ prvky. +onboarding.tour-tor-privacy.description=ProhlÃÅŸeÄ Tor izoluje cookies a smaÅŸe vaÅ¡i historii prohlÃÅŸenÃ hned po ukonÄenÃ relace. Tyto Ãºpravy vÃ¡m zajistÃ maximÃ¡lnÃ mÃru soukromÃ a bezpeÄnosti. Pro informace o ochranÄ pÅÃmo sÃtÃ Tor klepnÄte na âSÃÅ¥ Torâ. +onboarding.tour-tor-privacy.button=PÅejÃt na sÃÅ¥ Tor + +onboarding.tour-tor-network=SÃÅ¥ Tor +onboarding.tour-tor-network.title=PouÅŸÃvejte decentralizovanou sÃÅ¥. +onboarding.tour-tor-network.description=ProhlÃÅŸeÄ Tor se k internetu pÅipojuje skrze sÃÅ¥ Tor sestavenou dÃky tisÃcÅ¯m dobrovolnÃkÅ¯ po celÃ©m svÄtÄ. Na rozdÃl od VPN nemÃ¡ sÃÅ¥ Tor ÅŸÃ¡dnÃœ centrÃ¡lnÃ prvek, kterÃ©mu musÃte do rukou svÄÅit svÃ© soukromÃ. +onboarding.tour-tor-network.button=Zobrazit okruhy + +onboarding.tour-tor-circuit-display=ZobrazenÃ okruhÅ¯ +onboarding.tour-tor-circuit-display.title=PodÃvejte se na svou cestu. +onboarding.tour-tor-circuit-display.description=Pro kaÅŸdou domÃ©nu, kterou navÅ¡tÃvÃte, je vytvoÅeno Å¡ifrovanÃ© spojenÃ pÅes tÅi uzly Toru rÅ¯znÄ po svÄtÄ. ÅœÃ¡dnÃ¡ webovÃ¡ strÃ¡nka nevÃ, odkud se k nÃ pÅipojujete. NovÃ© spojenÃ si mÅ¯ÅŸete vyÅŸÃ¡dat klepnutÃm na âNovÃœ okruh pro tuto strÃ¡nkuâ v zobrazenÃ okruhÅ¯. +onboarding.tour-tor-circuit-display.button=Moje cesta + +onboarding.tour-tor-security=ZabezpeÄenÃ +onboarding.tour-tor-security.title=UrÄujte svÅ¯j proÅŸitek. +onboarding.tour-tor-security.description=K dispozici mÃ¡te rozÅ¡ÃÅenÃ¡ nastavenÃ pro dalÅ¡Ã zvÃœÅ¡enÃ zabezpeÄenÃ, napÅ. blokovÃ¡nÃ vÅ¡ech prvkÅ¯, kterÃ© mohou bÃœt potenciÃ¡lnÄ pouÅŸity k Ãºtoku na vÃ¡Å¡ poÄÃtaÄ. Pro zobrazenÃ rÅ¯znÃœch moÅŸnostÃ a jejich fungovÃ¡nÃ klepnÄte nÃÅŸe. +onboarding.tour-tor-security.button=Zkontrolovat nastavenÃ + +onboarding.tour-tor-expect-differences=Tipy +onboarding.tour-tor-expect-differences.title=OÄekÃ¡vejte rozdÃly. +onboarding.tour-tor-expect-differences.description=VÃ¡Å¡ proÅŸitek z prohlÃÅŸenÃ se dÃky vÅ¡em bezpeÄnostnÃm funkcÃm Toru mÅ¯ÅŸe liÅ¡it. StrÃ¡nky mohou bÃœt pomalejÅ¡Ã a v zÃ¡vislosti na Ãºrovni zabezpeÄenÃ nemusÃ nÄkterÃ© prvky fungovat. MÅ¯ÅŸete bÃœt takÃ© dotazovÃ¡ni na dÅ¯kaz, ÅŸe jste opravdu lidÃ© a ne roboti. +onboarding.tour-tor-expect-differences.button=Äasto kladenÃ© otÃ¡zky + +onboarding.tour-tor-onion-services=SluÅŸby Onion +onboarding.tour-tor-onion-services.title=Extra ochrana +onboarding.tour-tor-onion-services.description=SluÅŸby Onion jsou strÃ¡nky, kterÃ© konÄÃ na .onion a poskytujÃ extra ochranu pro autory i nÃ¡vÅ¡tÄvnÃky, vÄetnÄ pojistek proti cenzuÅe. UmoÅŸÅujÃ kaÅŸdÃ©mu poskytovat obsah a sluÅŸby anonymnÄ. Pro otevÅenÃ anonymnÃ onion strÃ¡nky DuckDuckGo klepnÄte nÃÅŸe. +onboarding.tour-tor-onion-services.button=NavÅ¡tÃvit Onion + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=DalÅ¡Ã +onboarding.tor-circuit-display.done=Hotovo +onboarding.tor-circuit-display.one-of-three=1 ze 3 +onboarding.tor-circuit-display.two-of-three=2 ze 3 +onboarding.tor-circuit-display.three-of-three=3 ze 3 + +onboarding.tor-circuit-display.intro.title=Jak okruhy fungujÃ? +onboarding.tor-circuit-display.intro.msg=Okruhy jsou sestaveny z nÃ¡hodnÄ vybranÃœch uzlÅ¯, poÄÃtaÄÅ¯ rozmÃstÄnÃœch po svÄtÄ a nastavenÃœch pro pÅeposÃlÃ¡nÃ toku v sÃti Tor. Okruhy vÃ¡m zajiÅ¡Å¥ujÃ soukromÃ pÅi prohlÃÅŸenÃ a spojenÃ s onion sluÅŸbami. + +onboarding.tor-circuit-display.diagram.title=ZobrazenÃ okruhÅ¯ +onboarding.tor-circuit-display.diagram.msg=Tento diagram ukazuje uzly tvoÅÃcÃ okruh pro tuto strÃ¡nku. Aby nebylo moÅŸnÃ© spojit vaÅ¡e aktivity na rÅ¯znÃœch strÃ¡nkÃ¡ch, pro kaÅŸdou je vytvoÅen okruh novÃœ. + +onboarding.tor-circuit-display.new-circuit.title=PotÅebujete novÃœ okruh? +onboarding.tor-circuit-display.new-circuit.msg=Pokud se vÃ¡m nedaÅÃ k nÄjakÃ© strÃ¡nce pÅipojit, nebo se strÃ¡nka nenaÄÃtÃ¡ sprÃ¡vnÄ, mÅ¯ÅŸete pouÅŸÃt toto tlaÄÃtko k obnovenÃ strÃ¡nky skrze novÃœ okruh. diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 60b96ded..825fa309 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -1,22 +1,51 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identita"> -<!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Ochrana pÅed cookies"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "KliknÄte pro inicializaci Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "PÅ¯vodnÃ nastavenÃ"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "JmÃ©no"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.context_menu.new_identity_key "i"> +<!ENTITY torbutton.context_menu.new_circuit "NovÃœ okruh Toru pro tuto strÃ¡nku"> +<!ENTITY torbutton.context_menu.new_circuit_key "o"> +<!ENTITY torbutton.context_menu.preferences "NastavenÃ zabezpeÄenÃâŠ"> +<!ENTITY torbutton.context_menu.preferences.key "b"> +<!ENTITY torbutton.context_menu.networksettings "NastavenÃ sÃtÄ Tor..."> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vyhledat aktualizace prohlÃÅŸeÄe TorâŠ"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "a"> +<!ENTITY torbutton.context_menu.cookieProtections "Ochrany cookiesâŠ"> +<!ENTITY torbutton.context_menu.cookieProtections.key "c"> +<!ENTITY torbutton.button.tooltip "KlepnÄte pro inicializaci Torbutton"> +<!ENTITY torbutton.prefs.security_settings "NastavenÃ zabezpeÄenÃ prohlÃÅŸeÄe Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Obnovit vÃœchozÃ"> +<!ENTITY torbutton.prefs.custom_warning "VaÅ¡e nastavenÃ prohlÃÅŸeÄe neodpovÃdÃ¡ standardnÃmu nastavenÃ zabezpeÄenÃ. Z dÅ¯vodu ochrany soukromÃ a zvÃœÅ¡enÃ bezpeÄnosti vÃ¡m doporuÄujeme vybrat si jednu z vÃœchozÃch bezpeÄnostnÃch ÃºrovnÃ."> +<!ENTITY torbutton.cookiedialog.title "SprÃ¡va ochrany cookies"> +<!ENTITY torbutton.cookiedialog.lockCol "ChrÃ¡nÄnÃ©"> +<!ENTITY torbutton.cookiedialog.domainCol "Server"> +<!ENTITY torbutton.cookiedialog.nameCol "NÃ¡zev"> +<!ENTITY torbutton.cookiedialog.pathCol "Cesta"> +<!ENTITY torbutton.cookiedialog.protectCookie "ChrÃ¡nit cookies"> +<!ENTITY torbutton.cookiedialog.removeCookie "Odstranit cookies"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "PÅestat chrÃ¡nit cookies"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Odstranit vÅ¡echny nechrÃ¡nÄnÃ©"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "ChrÃ¡nit novÃ© cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "PÅestat chrÃ¡nit novÃ© cookies"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Omezit cookies tÅetÃch stran a dalÅ¡Ã sledovacÃ data"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "O"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Ponechte toto pole zaÅ¡krtnutÃ© pro ochranu pÅed zneuÅŸitÃm nÄkterÃœch funkcÃ prohlÃÅŸeÄe k sledovÃ¡nÃ vaÅ¡eho prohlÃÅŸenÃ webu. ZneuÅŸitelnÃ© funkce zahrnujÃ blob URL adresy, vysÃlacÃ kanÃ¡ly, mezipamÄÅ¥ prohlÃÅŸeÄe, cookies, favicony, autorizaÄnÃ hlaviÄky HTTP, pÅednaÄÃtÃ¡nÃ odkazÅ¯, localStorage, URL adresy mediaSource, OCSP dotazy, SharedWorkers a tickety TLS relacÃ."> +<!ENTITY torbutton.prefs.resist_fingerprinting "ZmÄnit podrobnosti, kterÃ© vÃ¡s odliÅ¡ujÃ od ostatnÃch uÅŸivatelÅ¯ prohlÃÅŸeÄe Tor."> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ponechte toto pole zaÅ¡krtnutÃ©, abyste pÅed webovÃœmi strÃ¡nkami skryli unikÃ¡tnÃ informace, kterÃ© vÃ¡s mohou identifikovat, napÅÃklad vÃœkon vaÅ¡eho poÄÃtaÄe, rozloÅŸenÃ klÃ¡vesnice, jazyk, umÃstÄnÃ nainstalovanÃœch zÃ¡suvnÃœch modulÅ¯ a jejich seznam, stav vaÅ¡Ã sÃtÄ, otoÄenÃ obrazovky, velikost obrazovky, ÃºrovnÄ pÅiblÃÅŸenÃ pro jednotlivÃ© strÃ¡nky, podporovanÃ© typy souborÅ¯, systÃ©movÃ© barvy a podporovanÃ© funkce WebGL."> +<!ENTITY torbutton.prefs.sec_caption "ÃroveÅ zabezpeÄenÃ"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "ÃrovnÄ zabezpeÄenÃ vÃ¡m umoÅŸÅujÃ vypnout nÄkterÃ© funkce, kvÅ¯li kterÃœm mÅ¯ÅŸe bÃœt vÃ¡Å¡ prohlÃÅŸeÄ vÃce nÃ¡chylnÃœ k hackerskÃœm ÃºtokÅ¯m."> +<!ENTITY torbutton.prefs.sec_standard_label "StandardnÃ"> +<!ENTITY torbutton.prefs.sec_standard_description "VÅ¡echny funkce prohlÃÅŸeÄe Tor jsou zapnutÃ©."> +<!ENTITY torbutton.prefs.sec_safer_label "BezpeÄnÄjÅ¡Ã"> +<!ENTITY torbutton.prefs.sec_safer_description "NÄkterÃ© mÃ©nÄ bezpeÄnÃ© funkce jsou vypnuty, ale nÄkterÃ© strÃ¡nky nemusÃ fungovat."> +<!ENTITY torbutton.prefs.sec_safer_list_label "PÅi nastavenÃ bezpeÄnÄjÅ¡Ã ÃºrovnÄ:"> +<!ENTITY torbutton.prefs.sec_safest_label "NejbezpeÄnÄjÅ¡Ã"> +<!ENTITY torbutton.prefs.sec_safest_description "PovolÃ jen funkce pro zobrazenÃ statickÃœch webovÃœch strÃ¡nek a fungovÃ¡nÃ zÃ¡kladnÃch sluÅŸeb. OvlivnÄno bude zobrazenÃ obrÃ¡zkÅ¯, mÃ©diÃ a fungovÃ¡nÃ skriptÅ¯."> +<!ENTITY torbutton.prefs.sec_safest_list_label "PÅi nastavenÃ nejbezpeÄnÄjÅ¡Ã ÃºrovnÄ:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Zjistit vÃce"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript je na strÃ¡nkÃ¡ch bez HTTPS vypnut."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript je ve vÃœchozÃm nastavenÃ vypnut na vÅ¡ech strÃ¡nkÃ¡ch."> +<!ENTITY torbutton.prefs.sec_limit_typography "NÄkterÃ¡ pÃsma a matematickÃ© symboly jsou zablokovÃ¡ny."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "NÄkterÃ¡ pÃsma, matematickÃ© symboly a obrÃ¡zky jsou zablokovÃ¡ny."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio a video (HTML5 mÃ©dia) se pÅehrÃ¡vajÃ po kliknutÃ."> +<!ENTITY torbutton.circuit_display.title "Tor okruh"> +<!ENTITY torbutton.circuit_display.new_circuit "NovÃœ okruh Toru pro tuto strÃ¡nku"> diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties index c53d4462..ef9b8092 100644 --- a/src/chrome/locale/cs/torbutton.properties +++ b/src/chrome/locale/cs/torbutton.properties @@ -1,27 +1,55 @@ -torbutton.panel.tooltip.disabled = Klikni pro povolenÃ Tor -torbutton.panel.tooltip.enabled = Klikni pro zakÃ¡zÃ¡nÃ Tor -torbutton.panel.label.disabled = Tor Zapnut -torbutton.panel.label.enabled = Tor Vypnut -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = NaÄÃst vnÄjÅ¡Ã obsah? -torbutton.popup.external.app = Je potÅeba vnÄjÅ¡Ã aplikace k jednÃ¡nÃ s: \n -torbutton.popup.external.note = \nPOZNÃMKA: VnÄjÅ¡Ã aplikace NEJSOU Torem zabezpeÄenÃ© a mohou odkrÃœt VaÅ¡e informace!\n -torbutton.popup.external.suggest = \nPokud tomuto souboru nevÄÅÃte, mÅ¯ÅŸete ho buÄ uloÅŸit a prohlÃ©dnout ho offline nebo ve VM, nebo zkusit pouÅŸÃt prÅ¯hlednou Tor proxy jako napÅ. Tails LiveCD nebo torsocks\n -torbutton.popup.launch = Spustit aplikaci +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = NeznÃ¡mÃ¡ IP adresa +torbutton.circuit_display.onion_site = Onion strÃ¡nka +torbutton.circuit_display.this_browser = Tento prohlÃÅŸeÄ +torbutton.circuit_display.relay = Uzel +torbutton.circuit_display.tor_bridge = Most +torbutton.circuit_display.unknown_country = NeznÃ¡mÃ¡ zemÄ +torbutton.circuit_display.guard = Ochrana +torbutton.circuit_display.guard_note = VÃ¡Å¡ uzel typu Ochrana se nemusÃ zmÄnit. +torbutton.circuit_display.learn_more = Zjistit vÃce +torbutton.content_sizer.margin_tooltip = ProhlÃÅŸeÄ Tor upravuje velikost vaÅ¡eho okna, aby znesnadnil moÅŸnost vaÅ¡eho vysledovÃ¡nÃ. +torbutton.panel.tooltip.disabled = KlepnÄte pro zapnutÃ Toru +torbutton.panel.tooltip.enabled = KlepnÄte pro vypnutÃ Toru +torbutton.panel.label.disabled = Tor vypnut +torbutton.panel.label.enabled = Tor zapnut +extensions.torbutton(a)torproject.org.description = TorButton je tlaÄÃtko pro nastavenÃ Toru a rychlÃ© a jednoduchÃ© smazÃ¡nÃ soukromÃœch ÃºdajÅ¯ o vaÅ¡em prohlÃÅŸenÃ. +torbutton.popup.external.title = StÃ¡hnout externÃ soubor? +torbutton.popup.external.app = ProhlÃÅŸeÄ Tor nemÅ¯ÅŸe zobrazit tento soubor. Budete ho muset otevÅÃt v jinÃ© aplikaci.\n\n +torbutton.popup.external.note = NÄkterÃ© typy souborÅ¯ mohou zpÅ¯sobit, ÅŸe se aplikace pÅipojÃ k internetu bez pouÅŸitÃ Toru.\n\n +torbutton.popup.external.suggest = Chcete-li bÃœt v bezpeÄÃ, otevÃrejte staÅŸenÃ© soubory pouze v reÅŸimu offline, nebo pouÅŸijte Tor Live CD, napÅ. Tails.\n +torbutton.popup.launch = StÃ¡hnout soubor torbutton.popup.cancel = ZruÅ¡it -torbutton.popup.dontask = OdteÄ vÅŸdy spouÅ¡tÄt aplikace -torbutton.popup.prompted_language = K poskytnutÃ vÄtÅ¡Ãho soukromÃ, Torbutton mÅ¯ÅŸe poÅŸadovat anglickou verzi internetovÃœch strÃ¡nek. StrÃ¡nky kterÃ© chcete ÄÃst ve svÃ©m jazyce se mohou zobrazit namÃsto toho v angliÄtinÄ.\n\nChtÄli byste poÅŸadovat anglicky psanÃ© strÃ¡nky pro vÄtÅ¡Ã soukromÃ? -torbutton.popup.no_newnym = Torbutton nemÅ¯ÅŸe bezpeÄnÄ poskytnout novou identitu. NemÃ¡ pÅÃstup k pÅÃstupovÃ©mu portu Tor.\n\nMÃ¡te spuÅ¡tÄn Tor Browser Bundle? -torbutton.title.prompt_torbrowser = Important Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. +torbutton.popup.dontask = Od teÄ stahovat soubory automaticky +torbutton.popup.no_newnym = Torbutton vÃ¡m nemÅ¯ÅŸe bezpeÄnÄ poskytnout novou identitu, protoÅŸe nemÃ¡ pÅÃstup ke controlnÃmu portu Tor.\n\nMÃ¡te spuÅ¡tÄn Tor Browser Bundle? +torbutton.security_settings.menu.title = NastavenÃ zabezpeÄenÃ +torbutton.title.prompt_torbrowser = DÅ¯leÅŸitÃ¡ zprÃ¡va Torbutton +torbutton.popup.prompt_torbrowser = Torbutton nynÃ pracuje jinak: nemÅ¯ÅŸete jej nynÃ vypnout.\n\nPro tuto zmÄnu jsme se rozhodli kvÅ¯li bezpeÄnosti pouÅŸÃvvÃ¡nÃ Torbutton v prohlÃÅŸeÄi. kterÃœ je zÃ¡roveÅ vyuÅŸÃvÃ¡n pro prohlÃÅŸenÃ mimo sÃÅ¥ Tor. DochÃ¡zelo kvÅ¯li tomu k pÅÃliÅ¡ mnoha chybÃ¡m, kterÃ© jsme nemohli jinak opravit.\n\nPokud chcete dÃ¡le pouÅŸÃvat Firefox bÄÅŸnÃœm zpÅ¯sobem, nainstalujte si Tor Browser Bundle. NastavenÃ soukromÃ prohlÃÅŸeÄe Tor jsou nadÅazeny tÄm ve Firefoxu, dokonce i kdyÅŸ Firefox pouÅŸÃvÃ¡te spoleÄnÄ s Torbutton. \n\nTorbutton mÅ¯ÅŸete odstranit v NÃ¡stroje > DoplÅky > RozÅ¡ÃÅenÃ a klepnutÃm na tlaÄÃtko Odebrat. +torbutton.popup.short_torbrowser = DÅ¯leÅŸitÃ¡ informace!\n\nTorbutton je nynÃ stÃ¡le aktivnÃ.\n\nPro vÃce informacÃ klepnÄte na Torbutton. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.confirm_plugins = ZÃ¡suvnÃ© moduly, jako je tÅeba Flash, mohou naruÅ¡it vaÅ¡e soukromÃ a anonymitu.\n\nTakÃ© mohou obejÃt Tor a vyzradit vaÅ¡e umÃstÄnÃ a IP adresu.\n\nOpravdu chcete zÃ¡suvnÃ© moduly povolit?\n\n +torbutton.popup.never_ask_again = Znovu se neptat +torbutton.popup.confirm_newnym = ProhlÃÅŸeÄ Tor zavÅe vÅ¡echna okna a panely. VÅ¡echny relace budou ztraceny.\nOpravdu chcete restartovat prohlÃÅŸeÄ Tor pro resetovÃ¡nÃ vaÅ¡Ã identity?\n + +torbutton.maximize_warning = MaximalizovÃ¡nÃm prohlÃÅŸeÄe Tor dovolÃ webovÃœm strÃ¡nkÃ¡m zjistit velikost a vaÅ¡eho monitoru a pouÅŸÃt tuto informaci k vaÅ¡emu sledovÃ¡nÃ. DoporuÄujeme ponechat okno prohlÃÅŸeÄe Tor v pÅednastavenÃ© velikosti. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future -canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.siteprompt=Server %S se pokusil zÃskat obrazovÃ¡ data HTML5 canvasu, kterÃ¡ mohou bÃœt pouÅŸita pro unikÃ¡tnÃ identifikaci vaÅ¡eho poÄÃtaÄe.\n\nChcete serveru povolit zÃskÃ¡nÃ obrazovÃœch dat HTML5 canvasu? +canvas.notNow=NynÃ ne +canvas.notNowAccessKey=N +canvas.allow=Povolit v budoucnu +canvas.allowAccessKey=P +canvas.never=Nikdy na tomto serveru (doporuÄeno) canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S ProfilovÃœ problÃ©m +profileReadOnly=Aplikaci %S nelze spustit ze souborovÃ©ho systÃ©mu pouze pro ÄtenÃ. ZkopÃrujte ji prosÃm na jinÃ© mÃsto. +profileReadOnlyMac=Aplikaci %S nelze spustit ze souborovÃ©ho systÃ©mu pouze pro ÄtenÃ. ZkopÃrujte ji prosÃm na plochu nebo do sloÅŸky s aplikacemi. +profileAccessDenied=%S nemÃ¡ oprÃ¡vnÄnÃ k pÅÃstupu k profilu. Upravte prosÃm oprÃ¡vnÄnÃ vaÅ¡eho souborovÃ©ho systÃ©mu a zkuste to znovu. +profileMigrationFailed=Migrace vaÅ¡eho stÃ¡vajÃcÃho profilu se nezdaÅila.\nBude pouÅŸito novÃ© nastavenÃ. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=Å ifrovanÃ© spojenÃ (Onion sluÅŸba, %1$S, %2$S bitovÃ© klÃÄe, %3$S) +pageInfo_OnionEncryption=Å ifrovanÃ© spojenÃ (Onion sluÅŸba) diff --git a/src/chrome/locale/el/aboutDialog.dtd b/src/chrome/locale/el/aboutDialog.dtd new file mode 100644 index 00000000..a5c0cf69 --- /dev/null +++ b/src/chrome/locale/el/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; ÎÏÎµÎ¹ ÏÏÎ¹Î±ÏÏÎµÎ¯ Î±ÏÏ"> + +<!ENTITY project.tpoLink "Î¿ &vendorShortName;"> +<!ENTITY project.end ",ÎŒÎ¹Î± ÎŒÎ· ÎºÎµÏÎŽÎ¿ÏÎºÎ¿ÏÎ¹ÎºÎ® Î¿ÏÎ³Î¬ÎœÏÏÎ· ÏÎ¿Ï ÏÏÎµÏÎ±ÏÏÎ¯Î¶ÎµÏÎ±Î¹ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÏÎ·Îœ ÎµÎ»ÎµÏÎžÎµÏÎµÎ¯Î± ÏÎ±Ï ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÏÎºÏÎ¹Î¿."> + +<!ENTITY help.start "ÎÎÎ»ÎµÏÎµ ÎœÎ± Î²Î¿Î·ÎžÎ®ÏÎµÏÎµ?"> + +<!ENTITY help.donateLink "ÎÏÏÎ¯ÏÏÎµ"> +<!ENTITY help.or "Î®"> + +<!ENTITY help.getInvolvedLink "Î²Î¿Î·ÎžÎ®ÏÏÎµ"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "ÎÏÏÏÎ®ÏÎµÎ¹Ï?"> + +<!ENTITY bottomLinks.grow "ÎÎ¿Î·ÎžÎ®ÏÏÎµ ÏÎ¿ ÎÎ¯ÎºÏÏÎ¿ Tor ÎœÎ± ÎŒÎµÎ³Î±Î»ÏÏÎµÎ¹!"> + +<!ENTITY bottomLinks.license "Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÎÎŽÎµÎ¹Î¿ÎŽÏÏÎ·ÏÎ·Ï"> +<!ENTITY tor.TrademarkStatement "Î€Î¿ 'Tor' ÎºÎ±Î¹ ÏÎ¿ 'Onion Logo' ÎµÎ¯ÎœÎ±Î¹ ÎµÎ³Î³ÎµÎ³ÏÎ±ÎŒÎÎœÎ± Î»Î¿Î³ÏÏÏÏÎ± ÏÎ¿Ï Tor Project, Inc."> diff --git a/src/chrome/locale/el/aboutTBUpdate.dtd b/src/chrome/locale/el/aboutTBUpdate.dtd new file mode 100644 index 00000000..085896d0 --- /dev/null +++ b/src/chrome/locale/el/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "ÎÎœÎ±Î²Î¬ÎžÎŒÎ¹ÏÎ· ÏÎ¿Ï Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Î Tor Browser Î±ÎœÎ±Î²Î±ÎžÎŒÎ¯ÏÏÎ·ÎºÎµ."> +<!ENTITY aboutTBUpdate.linkPrefix "ÎÎ¹Î± ÏÎ¹Ï ÏÎ¹Î¿ ÏÏÏÏÏÎ±ÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Îœ ÎÎºÎŽÎ¿ÏÎ·,"> +<!ENTITY aboutTBUpdate.linkLabel "ÎµÏÎ¹ÏÎºÎµÏÎžÎµÎ¯ÏÎµ ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÎŒÎ±Ï"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "ÎÎ»Î»Î±Î³ÎÏ:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "ÎÎÎ±, ÎµÏÎ±ÎœÎ±ÏÏÎµÎŽÎ¹Î±ÏÎŒÎÎœÎ· ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Î€Î¿ ÎºÏÎºÎ»ÏÎŒÎ± ÏÎ¿Ï Tor ÎÏÎµÎ¹ Î±Î»Î»Î¬ÎŸÎµÎ¹ ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î± ÎºÎ±Î¹ Î²ÎµÎ»ÏÎ¹ÏÎžÎ·ÎºÎµ! ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº ÏÏÎ· ÏÎµÎ»Î¯ÎŽÎ± ÎÎ¿ÏÎŒÏÎ¯ ÏÎ±ÏÏÏÏÎ·ÏÎ±Ï (Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÏÏÎ·Îœ Î±ÏÎ¹ÏÏÎµÏÎ® ÏÎ»ÎµÏÏÎ¬ ÏÎ·Ï Î³ÏÎ±ÎŒÎŒÎ®Ï ÎŽÎ¹ÎµÏÎžÏÎœÏÎ·Ï) Î³Î¹Î± ÎœÎ± ÎŽÎµÎ¯ÏÎµ ÏÎ·Îœ ÎºÎ±Î¹ÎœÎ¿ÏÏÎ¹Î± ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï."> +<!ENTITY aboutTBUpdate.learnMore "ÎÎ¬ÎžÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 9f14022b..738b81ac 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "Î£ÏÎµÏÎ¹ÎºÎ¬ ÎŒÎµ ÏÎ¿ Tor"> + +<!ENTITY aboutTor.ready.label "ÎÎŸÎµÏÎµÏÎœÎ®ÏÏÎµ. ÎÎµ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±."> +<!ENTITY aboutTor.ready2.label "ÎÎ¯ÏÎ±Î¹ ÎÏÎ¿Î¹ÎŒÎ¿Ï Î³Î¹Î± ÏÎ·Îœ ÏÎ¹Î¿ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ® ÎµÎŒÏÎµÎ¹ÏÎ¯Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï."> +<!ENTITY aboutTor.failure.label "ÎÎ¬ÏÎ¹ ÏÎ®Î³Îµ ÏÏÏÎ±Î²Î¬!"> +<!ENTITY aboutTor.failure2.label "Î€Î¿ Tor ÎŽÎµÎœ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÏÎµ Î±ÏÏÏÎœ ÏÎ¿Îœ browser."> + +<!ENTITY aboutTor.search.label "ÎÎ¬ÎœÎµ Î±ÎœÎ±Î¶Î®ÏÎ·ÏÎ· ÎŒÎµ ÏÎ¿ DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ÎÏÏÏÎ®ÏÎµÎ¹Ï?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "ÎÎ¿Î¹ÏÎ¬ÎŸÏÎµ ÏÎ¿ ÎµÎ³ÏÎµÎ¹ÏÎ¯ÎŽÎ¹Ï ÎŒÎ±Ï Î³Î¹Î± ÏÎ¿Îœ Tor BrowserÂ»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "ÎÎ³ÏÎµÎ¹ÏÎ¯ÎŽÎ¹Î¿ ÏÎ¿Ï Tor Browser"> + +<!ENTITY aboutTor.tor_mission.label "Î€Î¿ ÏÏÏÏÎ¶ÎµÎºÏ ÏÎ¿Ï Tor ÎµÎ¯ÎœÎ±Î¹ ÎŒÎ¯Î± US 501(c)(3) ÎŒÎ· ÎºÎµÏÎŽÎ¿ÏÎºÎ¿ÏÎ¹ÎºÎ® Î¿ÏÎ³Î¬ÎœÏÏÎ·, ÏÎ¿Ï ÏÏÎ¿ÏÎžÎµÎ¯ ÏÎ± Î±ÎœÎžÏÏÏÎ¹ÎœÎ± ÎŽÎ¹ÎºÎ±Î¹ÏÎŒÎ±ÏÎ± ÎºÎ±Î¹ ÏÎ¹Ï ÎµÎ»ÎµÏÎžÎµÏÎ¯ÎµÏ ÎŽÎ·ÎŒÎ¹Î¿ÏÏÎ³ÏÎœÏÎ±Ï ÎºÎ±Î¹ ÏÎ±ÏÎÏÎ¿ÎœÏÎ±Ï ÎŽÏÏÎµÎ¬Îœ ÎºÎ±Î¹ Î±ÎœÎ¿Î¹ÏÏÎ¬ Î±ÎœÏÎœÏÎŒÎ¯Î± ÏÎ·Î³Î®Ï ÎºÎ±Î¹ ÏÎµÏÎœÎ¿Î»Î¿Î³Î¯Î±Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï, ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶Î¿ÎœÏÎ±Ï ÏÎ·Îœ Î±ÏÎµÏÎ¹ÏÏÎ¹ÏÏÎ· ÏÎ±ÏÎ¿ÏÎ® ÎºÎ±Î¹ ÏÏÎ®ÏÎ· ÏÎ¿ÏÏ ÎºÎ±Î¹ ÎµÏÎµÎºÏÎµÎ¯ÎœÎ¿ÎœÏÎ±Ï ÏÎ·Îœ ÎµÏÎ¹ÏÏÎ·ÎŒÎ¿ÎœÎ¹ÎºÎ® ÎºÎ±Î¹ ÎºÎ¿Î¹ÎœÎ® ÎºÎ±ÏÎ±ÎœÏÎ·ÏÎ·."> +<!ENTITY aboutTor.getInvolved.label "ÎÎ¿Î·ÎžÎ®ÏÏÎµ ÎºÎ¹ ÎµÏÎµÎ¯Ï Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "ÎÎ¬Î²ÎµÏÎµ ÏÎ± ÏÎµÎ»ÎµÏÏÎ±Î¯Î± ÎœÎÎ± ÏÎ¿Ï Tor ÎºÎ±ÏÎµÏÎžÎµÎ¯Î±Îœ ÏÏÎ± ÎµÎ¹ÏÎµÏÏÏÎŒÎµÎœÎ¬ ÏÎ±Ï."> +<!ENTITY aboutTor.newsletter.link_text "ÎÎ³Î³ÏÎ±ÏÏÎµÎ¯ÏÎµ Î³Î¹Î± ÏÎ± ÎœÎÎ± ÏÎ¿Ï Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Î Î¹ÏÏÏÏ ÏÏÎœ ÏÎ¿Î»Î»ÏÎœ.Â "> + +<!ENTITY aboutTor.donationBanner.line2a "Î Î±ÎœÏÎœÏÎŒÎ¯Î± Î±Î³Î±ÏÎ¬ ÏÎ·Îœ ÏÎ±ÏÎÎ±."> +<!ENTITY aboutTor.donationBanner.line2b "Î ÏÎ¿ÏÎžÎ®ÏÏÎµ ÏÎ± Î±ÎœÎžÏÏÏÎ¹ÎœÎ± ÎŽÎ¹ÎºÎ±Î¹ÏÎŒÎ±ÏÎ± ÏÎ±Î³ÎºÎ¿ÏÎŒÎ¯ÏÏ."> +<!ENTITY aboutTor.donationBanner.line2c "Î¥ÏÎµÏÎ±ÏÏÎ¹ÏÏÎµÎ¯ÏÎµ ÏÎ·Îœ ÎµÎ»ÎµÏÎžÎµÏÎ¯Î± "> +<!ENTITY aboutTor.donationBanner.line2d "Î ÏÎ¿ÏÏÎ±ÏÎÏÏÎµ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎµÎºÎ±ÏÎ¿ÎŒÎŒÏÏÎ¯ÏÎœ."> +<!ENTITY aboutTor.donationBanner.line2e "ÎÎ¹Î±ÏÎ·ÏÎ®ÏÏÎµ ÏÎ¿ Tor Î¹ÏÏÏÏÏ."> +<!ENTITY aboutTor.donationBanner.line2f "Î§ÏÎµÎ¹Î±Î¶ÏÎŒÎ±ÏÏÎµ ÏÎ·Îœ ÏÏÎ¿ÏÏÎ®ÏÎ¹ÎŸÎ· ÏÎ±Ï!"> + +<!ENTITY aboutTor.donationBanner.line3 "ÎÏÏÎ¯ÏÏÎµ ÏÎ®ÎŒÎµÏÎ± ÎºÎ±Î¹ ÏÎ¿ Mozilla ÎžÎ± ÎŽÏÏÎ¯ÏÎµÎ¹ ÏÎ¿ Î¯ÎŽÎ¹Î¿ ÏÎ¿ÏÏ!"> + +<!ENTITY aboutTor.donationBanner.buttonA "ÎÎ¬ÎœÏÎµ ÎŒÎ¹Î± ÎŽÏÏÎµÎ¬ ÏÏÏÎ±!"> +<!ENTITY aboutTor.donationBanner.buttonB "Î¥ÏÎ¿Î»Î¿Î³Î¯ÏÏÎµ ÎŒÎµ"> diff --git a/src/chrome/locale/el/brand.dtd b/src/chrome/locale/el/brand.dtd index 59f665e8..65bd74eb 100644 --- a/src/chrome/locale/el/brand.dtd +++ b/src/chrome/locale/el/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "O Firefox ÎºÎ±Î¹ ÏÎ¿ Î»Î¿Î³ÏÏÏÏÎ¿ Firefox ÎµÎ¯ÎœÎ±Î¹ ÎµÎŒÏÎ¿ÏÎ¹ÎºÎ¬ ÏÎ®ÎŒÎ±ÏÎ± ÏÎ¿Ï Mozilla Foundation."> + + +<!ENTITY plugins.installed.find "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÏÎ¿ÏÏÏÏÎµÏÎµ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·ÎŒÎÎœÎ± ÏÏÏÏÎžÎµÏÎ± ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï"> +<!ENTITY plugins.installed.enable "ÎÎœÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· Î ÏÏÏÎžÎµÏÏÎœ"> +<!ENTITY plugins.installed.disable "ÎÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· Î ÏÏÏÎžÎµÏÏÎœ"> +<!ENTITY plugins.installed.disable.tip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎŒÎ·Îœ ÏÎ¿ÏÏÏÎžÎ¿ÏÎœ ÏÎ± ÏÏÏÏÎžÎµÏÎ± ÏÎ¿Ï ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï"> diff --git a/src/chrome/locale/el/brand.properties b/src/chrome/locale/el/brand.properties index f63def38..0d040dd6 100644 --- a/src/chrome/locale/el/brand.properties +++ b/src/chrome/locale/el/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, ÎŒÎ¹Î± Î³ÏÎ®Î³Î¿ÏÎ· Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯ÎŽÎ± ÎŒÎµ ÎµÎœÏÏÎŒÎ±ÏÏÎŒÎÎœÎ· Î±ÎœÎ±Î¶Î®ÏÎ·ÏÎ· +homePageImport=ÎÎ¹ÏÎ±Î³ÏÎ³Î® ÏÎ·Ï Î±ÏÏÎ¹ÎºÎ®Ï ÏÎµÎ»Î¯ÎŽÎ±Ï Î±ÏÏ %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=ÎÏÎ¹Î»Î¿Î³Î® ÎÏÏÎ¹ÎºÎ® Î£ÎµÎ»Î¯ÎŽÎ±Ï +homePageMigrationDescription=Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎŒÎµ ÎµÏÎ¹Î»ÎÎŸÏÎµ ÏÎ·Îœ Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï ÎµÏÎ¹ÎžÏÎŒÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ: -syncBrandShortName=Sync +syncBrandShortName=Î£ÏÎ³ÏÏÎ¿ÎœÎ¹ÏÎŒÏÏ diff --git a/src/chrome/locale/el/browserOnboarding.properties b/src/chrome/locale/el/browserOnboarding.properties new file mode 100644 index 00000000..766e982a --- /dev/null +++ b/src/chrome/locale/el/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=ÎÎ±Î»ÏÏ Î®Î»ÎžÎ±ÏÎµ +onboarding.tour-tor-welcome.title=ÎÎ¯ÏÏÎµ ÎÏÎ¿Î¹ÎŒÎ¿Ï. +onboarding.tour-tor-welcome.description=Î Tor Browser ÏÏÎ¿ÏÏÎÏÎµÎ¹ ÏÎ± ÏÏÎ·Î»ÏÏÎµÏÎ± ÏÏÎ¬ÎœÏÎ±Ï ÏÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î± ÎºÎ±ÏÎ¬ ÏÎ·Îœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ· ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿. Î€ÏÏÎ± ÎµÎ¯ÏÏÎµ ÏÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÎ¿Ï Î±ÏÏ ÏÎ¿Îœ ÎµÎœÏÎ¿ÏÎ¹ÏÎŒÏ, ÏÎ·Îœ ÎºÎ±ÏÎ±ÏÎºÎ¿ÏÎ¯Î± ÎºÎ±Î¹ ÏÎ· Î»Î¿Î³Î¿ÎºÏÎ¹ÏÎ¯Î±. ÎÎ¯Î± Î³ÏÎ®Î³Î¿ÏÎ· ÎŽÎ¿ÎºÎ¹ÎŒÎ® ÎžÎ± ÏÎ±Ï ÎŽÎµÎ¯ÎŸÎµÎ¹ ÏÏÏ. +onboarding.tour-tor-welcome.button=ÎÎµÎºÎ¹ÎœÎ®ÏÏÎµ Î€ÏÏÎ± + +onboarding.tour-tor-privacy=ÎÏÏÏÏÎ·ÏÎ¿ +onboarding.tour-tor-privacy.title=ÎÏÎ¿ÏÏÎ³ÎµÏÎµ ÎµÎœÏÎ¿ÏÎ¹ÏÏÎÏ ÎºÎ±Î¹ Î±ÎŽÎ¹Î¬ÎºÏÎ¹ÏÎ¿ÏÏ. +onboarding.tour-tor-privacy.description=Î Tor Browser Î±ÏÎ¿ÎŒÎ¿ÎœÏÎœÎµÎ¹ ÏÎ± cookies ÎºÎ±Î¹ ÎŽÎ¹Î±Î³ÏÎ¬ÏÎµÎ¹ ÏÎ¿ Î¹ÏÏÎ¿ÏÎ¹ÎºÏ ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï ÎŒÏÎ»Î¹Ï ÎºÎ»ÎµÎ¯ÏÎµÏÎµ ÏÎ·Îœ ÎºÎ±ÏÏÎÎ»Î± ÏÎ±Ï. ÎÏÏÎÏ Î¿Î¹ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÏÎ¿Ï ÎµÎŸÎ±ÏÏÎ±Î»Î¯Î¶Î¿ÏÎœ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ¬ ÏÎ±Ï ÎºÎ±Î¹ ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î¬ ÏÎ±Ï ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎ¿ÎžÎ·ÎºÎµÏÎŒÎÎœÎµÏ ÏÏÎ¿Îœ ÏÎµÏÎ¹Î·Î³Î·ÏÎ®. ÎÏÎ¹Î»ÎÎŸÏÎµ "ÎÎ¯ÎºÏÏÎ¿ Tor" Î³Î¹Î± ÎœÎ± ÎŒÎ¬ÎžÎµÏÎµ ÏÏÏ ÏÎ±Ï ÏÏÎ¿ÏÏÎ±ÏÎµÏÎ¿ÏÎŒÎµ ÏÎµ ÎµÏÎ¯ÏÎµÎŽÎ¿ ÎŽÎ¹ÎºÏÏÎ¿Ï. +onboarding.tour-tor-privacy.button=Î Î¬ÎŒÎµ ÏÏÎ¿ ÎÎ¯ÎºÏÏÎ¿ Tor + +onboarding.tour-tor-network=ÎÎ¯ÎºÏÏÎ¿ Tor +onboarding.tour-tor-network.title=ÎÏ ÏÎ±ÎŸÎ¹ÎŽÎµÏÏÎ¿ÏÎŒÎµ ÏÎµ ÎÎœÎ± Î±ÏÎ¿ÎºÎµÎœÏÏÏÎŒÎÎœÎ¿ ÎŽÎ¯ÎºÏÏÎ¿. +onboarding.tour-tor-network.description=Î Tor Browser ÏÎ±Ï ÏÏÎœÎŽÎÎµÎ¹ ÏÏÎ¿ ÎŽÎ¯ÎºÏÏÎ¿ Tor, ÏÎ¿Ï Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÏÎ¬ÏÎ· ÏÎµ ÏÎ¹Î»Î¹Î¬ÎŽÎµÏ ÎµÎžÎµÎ»Î¿ÎœÏÎÏ Î±ÏÏ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿. Î£Îµ Î±ÎœÏÎ¯ÎžÎµÏÎ· ÎŒÎµ ÎÎœÎ± VPN, ÎŽÎµÎœ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±ÎœÎÎœÎ± ÏÎ·ÎŒÎµÎ¯Î¿ Î±ÏÎ¿ÏÏÏÎ¯Î±Ï Î® ÎºÎµÎœÏÏÎ¹ÎºÎ® Î¿ÎœÏÏÏÎ·ÏÎ± ÏÎ¿Ï ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎŒÏÎ¹ÏÏÎµÏÏÎµÎ¯ÏÎµ Î³Î¹Î± ÎœÎ± Î±ÏÎ¿Î»Î±ÏÏÎµÏÎµ ÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ¬. +onboarding.tour-tor-network.button=Î Î¬ÎŒÎµ ÏÏÎ·Îœ ÏÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï + +onboarding.tour-tor-circuit-display=Î ÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï +onboarding.tour-tor-circuit-display.title=ÎÎµÎ¯ÏÎµ ÏÎ¿ ÎŒÎ¿ÎœÎ¿ÏÎ¬ÏÎ¹ ÏÎ±Ï. +onboarding.tour-tor-circuit-display.description=ÎÎ¹Î± ÎºÎ¬ÎžÎµ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï ÎµÏÎ¹ÏÎºÎÏÏÎµÏÏÎµ Î· ÎºÎ¯ÎœÎ·ÏÎ® ÏÎ±Ï ÏÏÎœÎŽÎÎµÏÎ±Î¹ ÎºÎ±Î¹ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎµÎ¯ÏÎ±Î¹ ÏÎµ ÎÎœÎ± ÎºÏÎºÎ»ÏÎŒÎ± ÎµÎœÏÏÏ ÏÏÎ¹ÏÎœ ÏÏÎœÎŽÎÏÎµÏÎœ ÏÎ¿Ï Tor ÏÎµ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿. ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± Î±Î¹ÏÎ·ÎžÎµÎ¯ÏÎµ ÎºÎ±ÎœÎ¿ÏÏÎ¹Î¿Ï ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï ÎµÏÎ¹Î»ÎÎ³Î¿ÎœÏÎ±Ï "ÎÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Î³Î¹Î± Î±ÏÏÎ®Îœ ÏÎ· ÏÎµÎ»Î¯ÎŽÎ±" ÏÏÎ·Îœ ÏÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÏÏ ÎŒÎ±Ï. +onboarding.tour-tor-circuit-display.button=ÎÎ»ÎÏÏ ÏÎ¿ ÎŒÎ¿ÎœÎ¿ÏÎ¬ÏÎ¹ ÎŒÎ¿Ï + +onboarding.tour-tor-security=ÎÏÏÎ¬Î»ÎµÎ¹Î± +onboarding.tour-tor-security.title=ÎÏÎ¹Î»ÎÎŸÏÎµ ÏÎ·Îœ ÎµÎŒÏÎµÎ¹ÏÎ¯Î± ÏÎ±Ï. +onboarding.tour-tor-security.description=ÎÏÎ¿ÏÎ¿ÏÎŒÎµ ÎœÎ± ÏÏÎ¿ÏÏÎÏÎ¿ÏÎŒÎµ ÎµÏÎ¹ÏÏÏÏÎžÎµÏÎµÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î³Î¹Î± ÎœÎ± ÎµÎœÎ¹ÏÏÏÏÎ¿ÏÎŒÎµ ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î± ÏÎ¿Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ® ÏÎ±Ï. ÎÎ¹ Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÎÏÏÎ¬Î»ÎµÎ¹Î±Ï ÏÎ±Ï ÎµÏÎ¹ÏÏÎÏÎ¿ÏÎœ ÎœÎ± ÎŒÏÎ»Î¿ÎºÎ¬ÏÎµÎµÏÎµ ÏÏÎ¿Î¹ÏÎµÎ¯Î± ÏÎ¿Ï ÎžÎ± ÎŒÏÎ¿ÏÎ¿ÏÏÎ±Îœ ÎœÎ± ÏÏÎ·ÏÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î³Î¹Î± ÎµÏÎ¹ÎžÎÏÎµÎ¹Ï ÏÏÎ¿Îœ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï. ÎÏÎ¯Î»ÎµÎŸÏÎµ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î³Î¹Î± ÎœÎ± ÎŽÎµÎ¯ÏÎµ ÏÎ¹ ÎºÎ¬ÎœÎ¿ÏÎœ Î¿Î¹ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï. +onboarding.tour-tor-security.button=ÎÎ»ÎµÎ³ÏÎ¿Ï Î¡ÏÎžÎŒÎ¯ÏÎµÏÎœ + +onboarding.tour-tor-expect-differences=Î ÏÎ¿ÏÎ¬ÏÎµÎ¹Ï ÎµÎŒÏÎµÎ¹ÏÎ¯Î±Ï +onboarding.tour-tor-expect-differences.title=ÎÎ¬ÏÎ¿Î¹ÎµÏ ÎŽÎ¹Î±ÏÎ¿ÏÎÏ ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÎ±ÎŒÎµÎœÏÎŒÎµÎœÎµÏ. +onboarding.tour-tor-expect-differences.description=ÎÎµ ÏÎ»Î· ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î± ÎºÎ±Î¹ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÏÎ¿Ï ÏÎ±ÏÎÏÎµÎ¹ ÏÎ¿ Tor, Î· ÎµÎŒÏÎµÎ¹ÏÎ¯Î± ÏÎ±Ï ÎºÎ±ÏÎ¬ ÏÎ·Îœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ· ÎžÎ± ÎµÎ¯ÎœÎ±Î¹ Î»Î¯Î³Î¿ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ®. ÎÎ¬ÏÎ¿Î¹Î± ÏÏÎ¬Î³ÎŒÎ±ÏÎ± ÎžÎ± Î³Î¯ÎœÎ¿ÏÎœ Î»Î¯Î³Î¿ ÏÎ¹Î¿ Î±ÏÎ³Î¬ ÎºÎ±Î¹ Î±ÎœÎ¬Î»Î¿Î³Î± ÎŒÎµ ÏÎ¿ ÎµÏÎ¯ÏÎµÎŽÎ¿ Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï, ÎºÎ¬ÏÎ¿Î¹Î± ÏÏÎ¿Î¹ÏÎµÎ¯Î± ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎŒÎ·Îœ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎœ Î® ÎœÎ± ÎŒÎ·Îœ ÏÎ¿ÏÏÏÎœÎ¿ÎœÏÎ±Î¹. ÎÏÎ¯ÏÎ·Ï, ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎµÏÏÏÎ·ÎžÎµÎ¯ÏÎµ Î±Îœ ÎµÎ¯ÏÏÎµ Î¬ÎœÎžÏÏÏÎ¿Ï ÎºÎ±Î¹ ÏÏÎ¹ ÏÎ¿ÎŒÏÏÏ. +onboarding.tour-tor-expect-differences.button=ÎÎµÎ¯ÏÎµ ÏÎ¹Ï Î£ÏÏÎœÎÏ ÎÏÏÏÎ®ÏÎµÎ¹Ï + +onboarding.tour-tor-onion-services=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ Onion +onboarding.tour-tor-onion-services.title=Î ÏÎ¿ÏÏÎ±ÏÎµÏÏÎµÎ¯ÏÎµ ÏÎ¹Î¿ ÏÎ¿Î»Ï. +onboarding.tour-tor-onion-services.description=ÎÎ¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎ¿Ï Onion ÎµÎ¯ÎœÎ±Î¹ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÎ¿Ï ÏÎµÎ»ÎµÎ¹ÏÎœÎ¿ÏÎœ ÏÎµ .onion ÎºÎ±Î¹ ÏÎ±ÏÎÏÎ¿ÏÎœ ÎµÏÎ¹ÏÎ»ÎÎ¿Îœ ÏÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎµ ÏÏÎ¿ÏÏ ÎŽÎ·ÎŒÎ¿ÏÎ¹ÎµÏÎ¿ÏÎœ ÎºÎ±Î¹ ÎµÏÎ¹ÏÎºÎÏÏÎ¿ÎœÏÎ±Î¹, ÏÏÎŒÏÎµÏÎ¹Î»Î±ÎŒÎ²Î±ÎœÎ¿ÎŒÎÎœÎ¿Ï ÎºÎ±Î¹ Î±ÏÏÎ±Î»ÎµÎ¹ÏÎœ ÎµÎœÎ¬ÎœÏÎ¹Î± ÏÏÎ· Î»Î¿Î³Î¿ÎºÏÎ¹ÏÎ¯Î±. ÎÎ¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎ¿Ï Onion ÎµÏÎ¹ÏÏÎÏÎ¿ÏÎœ ÏÏÎ¿Îœ ÎºÎ±ÎžÎÎœÎ± ÎœÎ± ÏÎ±ÏÎ¬ÏÏÎµÎ¹ ÏÎ»Î¹ÎºÎ¬ ÎºÎ±Î¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ Î±ÎœÏÎœÏÎŒÎ±. ÎÏÎ¹Î»ÎÎŸÏÎµ ÎºÎ¬ÏÏ Î³Î¹Î± ÎœÎ± ÎµÏÎ¹ÏÎºÎµÏÏÎµÎ¯ÏÎµ ÏÎ· ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï Onion DuckDuckGo. +onboarding.tour-tor-onion-services.button=ÎÏÎ¹ÏÎºÎµÏÏÎµÎ¯ÏÎµ ÎÎœÎ± Onion + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=ÎÏÏÎŒÎµÎœÎ¿ +onboarding.tor-circuit-display.done=Î€ÎÎ»Î¿Ï +onboarding.tor-circuit-display.one-of-three=1 Î±ÏÏ 3 +onboarding.tor-circuit-display.two-of-three=2 Î±ÏÏ 3 +onboarding.tor-circuit-display.three-of-three=3 Î±ÏÏ 3 + +onboarding.tor-circuit-display.intro.title=Î ÏÏ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎœ ÏÎ± ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ±; +onboarding.tor-circuit-display.intro.msg=Î€Î± ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ± ÎŽÎ·ÎŒÎ¹Î¿ÏÏÎ³Î¿ÏÎœÏÎ±Î¹ ÏÎµ ÏÏÏÎ±Î¯Î± Î±ÎœÎ±ÏÎ¹ÎžÎÎŒÎµÎœÎµÏ ÏÏÎœÎŽÎÏÎµÎ¹Ï, ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎ¿ÎœÏÎ±Î¹ ÏÎµ ÏÏÎ¿Î»ÏÎ³Î¹ÏÏÎµÏ ÏÎµ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿ ÏÏÎžÎŒÎ¹ÏÎŒÎÎœÎ¿Î¹ ÎœÎ± ÏÏÎ¿ÏÎžÎ¿ÏÎœ ÏÎ·Îœ ÎºÎ¯ÎœÎ·ÏÎ· ÏÏÎ¿ Tor. Î€Î± ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ± ÏÎ±Ï ÎµÏÎ¹ÏÏÎÏÎ¿ÏÎœ ÎœÎ± ÏÎµÏÎ¹Î·Î³Î·ÎžÎµÎ¯ÏÎµ ÎŒÎµ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ ÏÎµ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎ¿Ï Tor. + +onboarding.tor-circuit-display.diagram.title=Î ÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï +onboarding.tor-circuit-display.diagram.msg=ÎÏÏÏ ÏÎ¿ ÎŽÎ¹Î¬Î³ÏÎ±ÎŒÎŒÎ± ÎŽÎµÎ¯ÏÎœÎµÎ¹ ÏÎ¹Ï ÏÏÎœÎŽÎÏÎµÎ¹Ï ÏÎ¿Ï Î±ÏÎ¿ÏÎµÎ»Î¿ÏÎœ ÏÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Î³Î¹Î± Î±ÏÏÎ®Îœ ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±. ÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÏÏÎ³ÎµÏÎµ ÏÎ· ÏÏÎœÎŽÎµÏÎ· ÏÎ·Ï ÎŽÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±Ï Î±ÏÏ ÏÎµÎ»Î¯ÎŽÎ± ÏÎµ ÏÎµÎ»Î¯ÎŽÎ±, ÎºÎ¬ÎžÎµ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÏÎ±Î¯ÏÎœÎµÎ¹ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ ÎºÏÎºÎ»ÏÎŒÎ±. + +onboarding.tor-circuit-display.new-circuit.title=Î§ÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ ÎºÎ±Î¹ÎœÎ¿ÏÏÎ¹Î¿ ÎºÏÎºÎ»ÏÎŒÎ±; +onboarding.tor-circuit-display.new-circuit.msg=ÎÎœ ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ ÏÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÎžÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ Î® Î±Îœ ÎŽÎµÎœ ÏÎ¿ÏÏÏÎœÎµÎ¹ ÏÏÏÏÎ¬, ÏÏÏÎµ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿ÏÎŒÏÎ¯ Î³Î¹Î± ÎœÎ± Î±ÎœÎ±ÎœÎµÏÏÎµÏÎµ ÏÎ· ÏÎµÎ»Î¯ÎŽÎ± ÎŒÎµ ÎœÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ±. diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 4b1bb436..96c81d34 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -1,22 +1,51 @@ <!ENTITY torbutton.context_menu.new_identity "ÎÎÎ± Î€Î±ÏÏÏÏÎ·ÏÎ±"> -<!ENTITY torbutton.context_menu.new_identity_key "Î€"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "ÎÏÏÎ· ÏÎ¿Ï Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "ÎÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Tor Î³Î¹Î± Î±ÏÏÎ®Îœ ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±"> +<!ENTITY torbutton.context_menu.new_circuit_key "C"> +<!ENTITY torbutton.context_menu.preferences "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÎÏÏÎ±Î»ÎµÎ¯Î±Ï..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÏÎ¿Ï ÎÎ¹ÎºÏÏÎ¿Ï Tor..."> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "ÎÎ»ÎµÎ³ÏÎ¿Ï Î³Î¹Î± ÎµÎœÎ·ÎŒÎÏÏÏÎ· ÏÎ¿Ï Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± Cookies"> +<!ENTITY torbutton.context_menu.cookieProtections "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎºÎºÎ¯ÎœÎ·ÏÎ· ÏÎ¿Ï Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "ÎÏÎ¿ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÏÏÎ¹ÎºÏÎœ ÏÏÎžÎŒÎ¯ÏÎµÏÎœ"> +<!ENTITY torbutton.button.tooltip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎºÎºÎ¹ÎœÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton"> +<!ENTITY torbutton.prefs.security_settings "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï ÏÎ¿Ï Tor Browser"> +<!ENTITY torbutton.prefs.restore_defaults "ÎÏÎ±ÎœÎ±ÏÎ¿ÏÎ¬ ÏÏÎ¿ÎµÏÎ¹Î»Î¿Î³ÏÎœ"> +<!ENTITY torbutton.prefs.custom_warning "ÎÎ¹ ÏÏÎ¿ÏÎ±ÏÎŒÎ¿ÏÎŒÎÎœÎµÏ ÏÏÎ¿ÏÎ¹ÎŒÎ®ÏÎµÎ¹Ï ÏÎ¿Ï browser ÏÎ±Ï ÎÏÎ¿ÏÎœ Î¿ÎŽÎ·Î³Î®ÏÎµÎ¹ ÏÎµ Î±ÏÏÎœÎ®ÎžÎ¹ÏÏÎµÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï. ÎÎ¹Î± Î»ÏÎ³Î¿ÏÏ Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï ÎºÎ±Î¹ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï, ÏÏÎ¿ÏÎµÎ¯ÎœÎ¿ÏÎŒÎµ ÎœÎ± ÎµÏÎ¹Î»ÎÎŸÎµÏÎµ ÎÎœÎ± Î±ÏÏ ÏÎ± ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³ÎŒÎÎœÎ± ÎµÏÎ¯ÏÎµÎŽÎ± Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï."> <!ENTITY torbutton.cookiedialog.title "ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î ÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Î ÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÎ±"> <!ENTITY torbutton.cookiedialog.domainCol "ÎÎ¹ÎºÎ¿ÎŽÎµÏÏÏÏÎ·Ï"> <!ENTITY torbutton.cookiedialog.nameCol "ÎÎœÎ¿ÎŒÎ±"> <!ENTITY torbutton.cookiedialog.pathCol "ÎÎ¿ÎœÎ¿ÏÎ¬ÏÎ¹"> -<!ENTITY torbutton.cookiedialog.protectCookie "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Cookie"> +<!ENTITY torbutton.cookiedialog.protectCookie "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± Cookie"> <!ENTITY torbutton.cookiedialog.removeCookie "ÎÏÎ±Î¯ÏÎµÏÎ· Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "ÎÎµÏÏÎ¿ÏÏÎ¬ÏÎµÏÏÎ· Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "ÎÏÎ±Î¯ÏÎµÏÎ· ÎÎ»ÏÎœ ÎÎºÏÏÏ Î±ÏÏ ÏÏÎœ Î ÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÏÎœ"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎÎÏÎœ Cookie"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "ÎÎºÎžÎµÏÎ· Cookie"> +<!ENTITY torbutton.cookiedialog.removeAllBut "ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ»ÏÎœ ÎµÎºÏÏÏ ÏÏÎœ ÏÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÏÎœ"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎœÎÏÎœ Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÎÎ± ÎÎ· Î³Î¯ÎœÎµÏÎ±Î¹ Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎÎÏÎœ Cookie"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏÎ¹Î¿ÏÎ¹ÏÎŒÎ¿Ï ÏÏÎœ cookies ÏÏÎ¹ÏÏÎœ ÎºÎ±Î¹ Î±Î»Î»ÏÎœ ÎŽÎµÎŽÎ¿ÎŒÎµÎœÏÎœ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ·ÏÎ·Ï"> -<!ENTITY torbutton.prefs.resist_fingerprinting "ÎÎ»Î»Î¬ÎŸÏÎµ ÏÎ¹Ï Î»ÎµÏÏÎ¿ÎŒÎÏÎµÎ¹ÎµÏ ÏÎ¿Ï ÏÎ±Ï ÎŽÎ¹Î±ÎºÏÎ¯ÎœÎµÎ¹ Î±ÏÏ Î¬Î»Î»Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï Tor Browser "> +<!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏÎ¹Î¿ÏÎ¹ÏÎŒÎ¿Ï ÏÏÎœ cookies ÏÏÎ¯ÏÏÎœ ÎºÎ±Î¹ Î±Î»Î»ÏÎœ ÎŽÎµÎŽÎ¿ÎŒÎµÎœÏÎœ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ·ÏÎ·Ï"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ÎÏÎ¹Î»ÎÎŸÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿ÏÏÎ¬ÎºÎ¹ Î³Î¹Î± ÎœÎ± Î±ÏÎ¿ÏÏÎ³ÎµÏÎµ ÎŽÎ¹Î¬ÏÎ¿ÏÎµÏ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ browser ÎœÎ± ÎµÏÎ¹ÏÎµÎžÎ¿ÏÎœ Î³Î¹Î± ÎœÎ± ÏÎ±Ï ÎµÎœÏÎ¿ÏÎ¯ÏÎ¿ÏÎœ ÎºÎ±ÏÎ¬ ÏÎ·Îœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ® ÏÎ±Ï ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿. Î€ÏÎ¿ÏÎ¿ÏÎ¿Î¹Î·ÎŒÎÎœÎµÏ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎµÏÎ¹Î»Î±ÎŒÎ²Î¬ÎœÎ¿ÏÎœ blob URLs, ÎºÎ±ÎœÎ¬Î»Î¹Î± ÏÏÎ¿Î²Î¿Î»Î®Ï, ÎŒÎœÎ®ÎŒÎ· cache, cookies, ÏÏÎœÏÎ¿ÎŒÎµÏÏÎµÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÏÎœ, ÏÎµÎ»Î¹ÎŽÎ¿ÎŽÎµÎ¯ÎºÏÎµÏ ÏÎ±ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï HTTP, ÏÏÎ¿ÏÏÎœÎŽÎÏÎµÎ¹Ï ÏÏÎœÎŽÎÏÎŒÏÎœ, ÏÎ¿ÏÎ¹ÎºÎ® Î±ÏÎ¿ÎžÎ®ÎºÎµÏÏÎ·, URLs ÏÎ·Î³ÏÎœ ÎŒÎÏÏÎœ, Î±Î¹ÏÎ®ÎŒÎ±ÏÎ± OCSP, SharedWorkers ÎºÎ±Î¹ ÎµÎ¹ÏÎ¹ÏÎ®ÏÎ¹Î± Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±Ï TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "ÎÎ»Î»Î¬ÎŸÏÎµ ÏÎ¹Ï Î»ÎµÏÏÎ¿ÎŒÎÏÎµÎ¹ÎµÏ ÏÎ¿Ï ÏÎ±Ï ÎŽÎ¹Î±ÎºÏÎ¯ÎœÎ¿ÏÎœ Î±ÏÏ Î¬Î»Î»Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï Tor Browser "> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ÎÎ¹Î±ÏÎ·ÏÎ®ÏÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿ÏÏÎ¯ ÎµÏÎ¹Î»ÎµÎ³ÎŒÎÎœÎ¿ Î³Î¹Î± ÎœÎ± ÎºÏÏÏÎµÏÎµ Î±ÏÏ ÏÎ¿ÏÏ Î¹ÏÏÎ¿ÏÏÏÎ¿ÏÏ ÏÏÎ¬Î³ÎŒÎ±ÏÎ± ÏÎ¿Ï ÎžÎ± ÎŒÏÎ¿ÏÎ¿ÏÏÎ±Îœ ÎœÎ± ÎµÎ¯ÎœÎ±Î¹ ÎŒÎ¿ÎœÎ±ÎŽÎ¹ÎºÎ¬ Î³Î¹Î± ÎµÏÎ¬Ï, ÏÏÎŒÏÎµÏÎ¹Î»Î±ÎŒÎ²Î±ÎœÎ¿ÎŒÎÎœÏÎœ ÏÎ·Ï Î±ÏÏÎŽÎ¿ÏÎ·Ï ÏÎ¿Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®, ÏÎ·Ï ÎŽÎ¹Î¬ÏÎ±ÎŸÎ·Ï ÏÎ¿Ï ÏÎ»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï, ÏÎ·Ï Î³Î»ÏÏÏÎ±Ï, ÏÎ·Ï ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î±Ï ÏÏÎœ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·ÎŒÎÎœÏÎœ ÏÏÎ¿ÏÎžÎÏÏÎœ, ÏÎ·Ï ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¿Ï ÎŽÎ¹ÎºÏÏÎ¿Ï, ÏÎ¿Ï ÏÏÎ¿ÏÎ±ÎœÎ±ÏÎ¿Î»Î¹ÏÎŒÎ¿Ï ÏÎ·Ï Î¿ÎžÏÎœÎ·Ï, ÏÎ¿Ï ÎŒÎµÎ³ÎÎžÎ¿ÏÏ ÏÎ·Ï Î¿ÎžÏÎœÎ·Ï, ÏÏÎœ ÎµÏÎ¹ÏÎÎŽÏÎœ zoom Î±ÎœÎ¬ site, ÏÏÎœ ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎŒÎµÎœÏÎœ ÏÏÏÏÎœ Î±ÏÏÎµÎ¯ÏÎœ, ÏÏÎœ ÏÏÏÎŒÎ¬ÏÏÎœ ÏÎ¿Ï ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï ÎºÎ±Î¹ ÏÏÎœ ÎŽÏÎœÎ±ÏÎ¿ÏÎ®ÏÏÎœ WebGL."> +<!ENTITY torbutton.prefs.sec_caption "ÎÏÎ¯ÏÎµÎŽÎ¿ Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Î€Î¿ Slider ÎÏÏÎ¬Î»ÎµÎ¹Î±Ï ÏÎ±Ï Î±ÏÎ®ÎœÎµÎ¹ ÎœÎ± Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î¿ÏÎ¹ÏÎŒÎÎœÎ± ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬ ÏÎ¿Ï ÏÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® ÏÎ¿Ï ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ¿Îœ ÎºÎ¬ÎœÎ¿ÏÎœ ÏÎ¹Î¿ ÎµÏÎ¬Î»ÏÏÎ¿ ÏÎµ ÏÏÎ¿ÏÏÎ¬ÎžÎµÎ¹ÎµÏ hacking."> +<!ENTITY torbutton.prefs.sec_standard_label "ÎÎ±ÏÎ¹ÎºÎ¬"> +<!ENTITY torbutton.prefs.sec_standard_description "ÎÎ»ÎµÏ Î¿Î¹ ÏÎ±ÏÎ¿ÏÎÏ ÏÎ¿Ï Tor Browser ÎºÎ±Î¹ ÏÎ·Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±Ï ÎµÎ¯ÎœÎ±Î¹ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎµÏ."> +<!ENTITY torbutton.prefs.sec_safer_label "ÎÏÏÎ±Î»ÎÏÏÎµÏÎ±"> +<!ENTITY torbutton.prefs.sec_safer_description "ÎÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹ÎµÎ¯ ÏÎ±ÏÎ¿ÏÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÏÎœ ÏÎ¿Ï ÎµÎ¯ÎœÎ±Î¹ ÎµÏÎ¹ÎºÎ¯ÎœÎŽÏÎœÎµÏ ÎºÎ±Î¹ Î¿ÎŽÎ·Î³Î¿ÏÎœ ÎºÎ¬ÏÎ¿Î¹ÎµÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÏÎ¿ ÎœÎ± ÏÎ¬ÎœÎ¿ÏÎœ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏÏÎ·ÏÎ±."> +<!ENTITY torbutton.prefs.sec_safer_list_label "Î£ÏÎ·Îœ Î±ÏÏÎ±Î»ÎÏÏÎµÏÎ· ÏÏÎœÎŽÎµÏÎ·:"> +<!ENTITY torbutton.prefs.sec_safest_label "ÎÏÏÎ±Î»ÎÏÏÎ±ÏÎ¿"> +<!ENTITY torbutton.prefs.sec_safest_description "ÎÏÎ¹ÏÏÎÏÎµÎ¹ ÎŒÏÎœÎ¿ ÏÎ¹Ï ÏÎ±ÏÎ¿ÏÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±Ï ÏÎ¿Ï Î±ÏÎ±Î¹ÏÎ¿ÏÎœÏÎ±Î¹ Î³Î¹Î± Î²Î±ÏÎ¹ÎºÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÎºÎ±Î¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ. ÎÏÏÏ ÎµÏÎ·ÏÎµÎ¬Î¶ÎµÎ¹ ÎµÎ¹ÎºÏÎœÎµÏ, ÎŒÎÏÎ± ÎºÎ±Î¹ scripts."> +<!ENTITY torbutton.prefs.sec_safest_list_label "Î£ÏÎ·Îœ ÏÎ¹Î¿ Î±ÏÏÎ±Î»Î® ÏÏÎžÎŒÎ¹ÏÎ·:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "ÎÎ¬ÎžÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Î JavaScript ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ· ÏÎµ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ ÏÎ¿Ï ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "Î JavaScript ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ· ÏÎµ ÏÎ»Î¿ÏÏ ÏÎ¿ÏÏ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ ÏÏ ÏÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î®."> +<!ENTITY torbutton.prefs.sec_limit_typography "ÎÎµÏÎ¹ÎºÎÏ Î³ÏÎ±ÎŒÎŒÎ±ÏÎ¿ÏÎµÎ¹ÏÎÏ ÎºÎ±Î¹ ÎŒÎ±ÎžÎ·ÎŒÎ±ÏÎ¹ÎºÎ¬ ÏÏÎŒÎ²Î¿Î»Î± ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ±."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ÎÏÎ¹ÏÎŒÎÎœÎµÏ Î³ÏÎ±ÎŒÎŒÎ±ÏÎ¿ÏÎµÎ¹ÏÎÏ, ÎµÎ¹ÎºÎ¿ÎœÎ¯ÎŽÎ¹Î±, ÎŒÎ±ÎžÎ·ÎŒÎ±ÏÎ¹ÎºÎ¬ ÏÏÎŒÎ²Î¿Î»Î± ÎºÎ±Î¹ ÎµÎ¹ÎºÏÎœÎµÏ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ±."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "ÎÏÎ¿Ï ÎºÎ±Î¹ Î²Î¯ÎœÏÎµÎ¿ (ÎŒÎÏÎ± HTML5) ÎµÎ¯ÎœÎ±Î¹ ÎºÎ»Î¯ÎºÎ±ÏÎµ-ÎºÎ±Î¹-ÏÎ±Î¯Î¶ÎµÎ¹."> +<!ENTITY torbutton.circuit_display.title "ÎÏÎºÎ»ÏÎŒÎ± Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "ÎÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±"> diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties index 3c68094b..9d71a2f9 100644 --- a/src/chrome/locale/el/torbutton.properties +++ b/src/chrome/locale/el/torbutton.properties @@ -1,27 +1,55 @@ +torbutton.circuit_display.internet = ÎÎœÏÎµÏÎœÎµÏ +torbutton.circuit_display.ip_unknown = ÎÎ³ÎœÏÏÏÎ· ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· IP +torbutton.circuit_display.onion_site = ÎÏÏÏÏÎ¿ÏÎ¿Ï Onion +torbutton.circuit_display.this_browser = ÎÏÏÏÏ Î¿ browser +torbutton.circuit_display.relay = ÎÎœÎ±ÎŒÎµÏÎ±ÎŽÎ¿ÏÎ· +torbutton.circuit_display.tor_bridge = ÎÎÏÏÏÎ± +torbutton.circuit_display.unknown_country = ÎÎ³ÎœÏÏÏÎ· ÏÏÏÎ± +torbutton.circuit_display.guard = ÎŠÏÎ»Î±ÎºÎ±Ï +torbutton.circuit_display.guard_note = Î [ÎŠÏÎ»Î±ÎºÎ±Ï] ÎºÏÎŒÎ²Î¿Ï ÏÎ±Ï ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± Î±Î»Î»Î¬ÎŸÎµÎ¹. +torbutton.circuit_display.learn_more = ÎÎ¬ÎžÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± +torbutton.content_sizer.margin_tooltip = Î Tor Browser ÏÏÎ¿ÏÎžÎÏÎµÎ¹ Î±ÏÏÏ ÏÎ¿ ÏÎµÏÎ¹ÎžÏÏÎ¹Î¿ Î³Î¹Î± ÎœÎ± ÎºÎ¬ÎœÎµÎ¹ ÏÎ¿ ÏÎ»Î¬ÏÎ¿Ï ÎºÎ±Î¹ ÏÎ¿ ÏÏÎ¿Ï ÏÎ¿Ï ÏÎ±ÏÎ±ÎžÏÏÎ¿Ï ÏÎ¿Ï Î»Î¹Î³ÏÏÎµÏÎ¿ ÎŸÎµÏÏÏÎ¹ÏÏÏ, Î¿ÏÏÏÎµ ÎŒÎµÎ¹ÏÎœÎµÏÎ±Î¹ Î· Î¹ÎºÎ±ÎœÏÏÎ·ÏÎ± ÏÏÎœ Î¬Î»Î»ÏÎœ ÎœÎ± ÏÎµ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ¿ÏÎœ ÎŽÎ¹Î±ÎŽÎ¹ÎºÏÏÎ±ÎºÎ¬. torbutton.panel.tooltip.disabled = ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ¿ Tor torbutton.panel.tooltip.enabled = ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ¿ Tor torbutton.panel.label.disabled = Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿ torbutton.panel.label.enabled = Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿ extensions.torbutton(a)torproject.org.description = Î€Î¿ Torbutton ÏÏÎ¿ÏÏÎÏÎµÎ¹ ÎÎœÎ± ÎºÎ¿ÏÎŒÏÎ¯ Î³Î¹Î± ÏÎ· ÏÏÎžÎŒÎ¹ÏÎ· ÏÏÎœ ÏÎ±ÏÎ±ÎŒÎÏÏÏÎœ ÏÎ¿Ï Tor ÎºÎ±Î¹ Î³Î¹Î± ÏÎ· Î³ÏÎ®Î³Î¿ÏÎ· ÎºÎ±Î¹ ÎµÏÎºÎ¿Î»Î· ÎµÎºÎºÎ±ÎžÎ¬ÏÎ¹ÏÎ· ÏÏÎœ ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎœ ÏÏÎ¿Î¹ÏÎµÎ¯ÏÎœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï. -torbutton.popup.external.title = ÎÎ± ÏÎ¿ÏÏÏÎžÎµÎ¯ ÎµÎŸÏÏÎµÏÎ¹ÎºÏ ÏÎµÏÎ¹ÎµÏÏÎŒÎµÎœÎ¿; -torbutton.popup.external.app = ÎÎ¹Î± ÎµÎŸÏÏÎµÏÎ¹ÎºÎ® ÎµÏÎ±ÏÎŒÎ¿Î³Î® ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎ±ÏÎ±Î¯ÏÎ·ÏÎ· Î³Î¹Î± ÏÎ¿Îœ ÏÏÏÏÏ ÏÎµÎ¹ÏÎ¹ÏÎŒÏ:\n\n -torbutton.popup.external.note = \n\nÎ£ÎÎÎÎÎ©Î£Î: ÎÎ¹ ÎµÎŸÏÏÎµÏÎ¹ÎºÎÏ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÎÎÎ ÎµÎ¯ÎœÎ±Î¹ ÎµÎŸÎ¿ÏÎ¹ÏÎŒÎ¿Ï Î±ÏÏÎ±Î»Î®Ï Î³Î¹Î± ÏÎ¿ Tor ÎºÎ±Î¹ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÎ±Ï Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ!\n -torbutton.popup.external.suggest = \nÎÎœ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿ Î±ÏÏÏ ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ ÎÎŒÏÎ¹ÏÏÎ¿, ÏÏÎÏÎµÎ¹ ÎœÎ± ÏÎ¿ Î±ÏÎ¿ÎžÎ·ÎºÎµÏÏÎµÏÎµ ÏÏÏÎµ ÎœÎ± ÏÎ¿ ÏÏÎ¿Î²Î¬Î»ÎµÏÎµ ÏÏÎ±Îœ ÎŽÎµÎœ ÎµÎ¯ÏÏÎµ ÏÏÎœÎŽÎµÎŽÎµÎŒÎÎœÎ¿Î¹ Î® ÎŒÎÏÏ ÎŒÎ¹Î±Ï VM,\nÎ® ÎœÎ± ÏÏÎ¿ÎœÏÎ¯ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÎÎœÎ±Îœ ÎŽÎ¹Î±ÏÎ±ÎœÎ® ÏÎ»Î·ÏÎµÎŸÎ¿ÏÏÎ¹Î¿ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ·ÏÏÎ® Tor ÏÏÏÏ ÏÎ¿ Tails LiveCD Î® ÏÎ¿ torsocks.\n -torbutton.popup.launch = ÎÎºÏÎÎ»ÎµÏÎ· ÎµÏÎ±ÏÎŒÎ¿Î³Î®Ï -torbutton.popup.cancel = ÎÎºÏÏÎ¿Îœ -torbutton.popup.dontask = ÎÏÏ ÏÏÏÎ± ÎºÎ±Î¹ ÏÏÎ¿ ÎµÎŸÎ®Ï ÎœÎ± ÎµÎºÏÎµÎ»Î¿ÏÎœÏÎ±Î¹ ÏÎ¬ÎœÏÎ¿ÏÎµ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ -torbutton.popup.prompted_language = ÎÎ¹Î± ÏÎ·Îœ ÎµÎœÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï ÏÎ±Ï ÏÎ¿ Torbutton ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± Î¶Î·ÏÎ®ÏÎµÎ¹ ÏÎ·Îœ ÎÎºÎŽÎ¿ÏÎ· ÏÎ·Ï Î±Î³Î³Î»Î¹ÎºÎ®Ï Î³Î»ÏÏÏÎ±Ï Î³Î¹Î± ÏÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ. ÎÏÏÏ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎÏÎµÎ¹ ÏÎ±Îœ Î±ÏÎ¿ÏÎÎ»ÎµÏÎŒÎ±, Î¿Î¹ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÎ¿Ï ÎµÏÎ¹Î»ÎÎŸÎ±ÏÎµ ÎœÎ± ÎµÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Î¹ ÏÏÎ·Îœ ÎµÎžÎœÎ¹ÎºÎ® ÏÎ±Ï Î³Î»ÏÏÎ±, ÎœÎ± ÏÏÎ¿Î²Î¬Î»Î¿ÎœÏÎ±Î¹ Î±ÎœÏ' Î±ÏÏÎ®Ï ÏÏÎ·Îœ ÎÎ³Î³Î»Î¹ÎºÎ®.\n\nÎÎÎ»ÎµÏÎµ ÎœÎ± Î±Î¹ÏÎ¿ÏÎœÏÎ±Î¹ ÏÎµÎ»Î¯ÎŽÎµÏ Î³ÏÎ±ÎŒÎŒÎÎœÎµÏ ÏÏÎ± ÎÎ³Î³Î»Î¹ÎºÎ¬, Î³Î¹Î± ÏÎ·Îœ Î²ÎµÎ»ÏÎ¯ÏÏÎ· ÏÎ¿Ï Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï; -torbutton.popup.no_newnym = Î€Î¿ Torbutton ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ±Ï ÎŽÏÏÎµÎ¹ ÎŒÎ¹Î± Î±ÏÏÎ±Î»Î® ÎœÎÎ± ÏÎ±ÏÏÏÏÎ·ÏÎ±, ÎŽÎ¹ÏÏÎ¹ ÎŽÎµÎœ ÎÏÎµÎ¹ ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Tor Control Port:\n\nÎ§ÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Î Î±ÎºÎÏÎ¿ ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor; +torbutton.popup.external.title = ÎÎ®ÏÎ· ÎÎœÎ¿Ï ÎµÎŸÏÏÎµÏÎ¹ÎºÎ¿Ï ÏÏÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï; +torbutton.popup.external.app = Î Tor Browser ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎµÎŒÏÎ±ÎœÎ¯ÏÎµÎ¹ Î±ÏÏÏ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿. ÎÎ± ÏÏÎµÎ¹Î±ÏÏÎµÎ¯ ÎœÎ± ÏÎ¿ Î±ÎœÎ¿Î¯ÎŸÎµÏÎµ ÎŒÎµ ÎºÎ¬ÏÎ¿Î¹Î± Î¬Î»Î»Î· ÎµÏÎ±ÏÎŒÎ¿Î³Î®.\n\n +torbutton.popup.external.note = ÎÏÎ¹ÏÎŒÎÎœÎ¿Î¹ ÏÏÏÎ¿Î¹ Î±ÏÏÎµÎ¯ÏÎœ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÏÎ¿ÎºÎ±Î»ÎÏÎ¿ÏÎœ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÎœÎ± ÏÏÎœÎŽÎµÎžÎ¿ÏÎœ ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ ÏÏÏÎ¯Ï ÏÎ· ÏÏÎ®ÏÎ· ÏÎ¿Ï Tor.\n\n +torbutton.popup.external.suggest = ÎÎ¹Î± ÎœÎ± ÎµÎ¯ÏÏÎµ Î±ÏÏÎ±Î»ÎµÎ¯Ï, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± Î±ÎœÎ¿Î¯Î³ÎµÏÎµ ÏÎ± Î»Î·ÏÎžÎÎœÏÎ± Î±ÏÏÎµÎ¯Î± ÎŒÏÎœÎ¿ ÎµÎœÏ Î²ÏÎ¯ÏÎºÎµÏÏÎµ ÎµÎºÏÏÏ ÏÏÎœÎŽÎµÏÎ·Ï, Î® ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÎÎœÎ± Tor Live CD, ÏÏÏÏ ÏÎ¿ Tails.\n +torbutton.popup.launch = ÎÎ®ÏÎ· Î±ÏÏÎµÎ¯Î¿Ï +torbutton.popup.cancel = ÎÎºÏÏÎ¿ +torbutton.popup.dontask = ÎÏÏÏÎŒÎ±ÏÎ· Î»Î®ÏÎ· Î±ÏÏÎµÎ¯ÏÎœ Î±ÏÏ ÏÏÏÎ± ÎºÎ±Î¹ ÏÏÎ¿ ÎµÎŸÎ®Ï +torbutton.popup.no_newnym = Î€Î¿ Torbutton ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ±Ï ÎŽÏÏÎµÎ¹ ÎŒÎ¹Î± Î±ÏÏÎ±Î»Î® ÎœÎÎ± ÏÎ±ÏÏÏÏÎ·ÏÎ±, ÎŽÎ¹ÏÏÎ¹ ÎŽÎµÎœ ÎÏÎµÎ¹ ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Tor Control Port:\n\nÎ§ÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Î Î±ÎºÎÏÎ¿ ÏÎ¿Ï Tor Browser; +torbutton.security_settings.menu.title = Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï torbutton.title.prompt_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± ÏÎ¿ Torbutton -torbutton.popup.prompt_torbrowser = Î€Î¿ Torbutton Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ¬, ÏÏÏÎ±: ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÏÎ»ÎÎ¿Îœ ÎœÎ± ÏÎ¿ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ\n\nÎ ÏÎ¿Î²Î®ÎºÎ±ÎŒÎµ ÏÎµ Î±ÏÏÎ® ÏÎ·Îœ Î±Î»Î»Î±Î³Î® ÎŽÎ¹ÏÏÎ¹, ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÏÎ±Î»ÎÏ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÏÎ¿ Torbutton ÎŒÎÏÎ± Î±ÏÏ ÎÎœÎ± ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï Î¿ Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ·ÏÎ¹ÎŒÎµÏÎµÎ¹ ÎºÎ±Î¹ Î³Î¹Î± ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÏÏÎ¯Ï ÏÎ·Îœ ÏÏÎ®ÏÎ· Tor. ÎÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Îœ ÎŽÎ¹Î¬ÏÎ¿ÏÎ± ÏÏÎ¬Î»ÎŒÎ±ÏÎ±-bugs ÏÎ± Î¿ÏÎ¿Î¯Î± ÎŽÎµÎœ ÎŒÏÎ¿ÏÎ¿ÏÏÎ±ÎŒÎµ ÎœÎ± ÎŽÎ¹Î¿ÏÎžÏÏÎ¿ÏÎŒÎµ.\n\nÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± ÎµÎŸÎ±ÎºÎ¿Î»Î¿ÏÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿Îœ Firefox ÎºÎ±ÎœÎ¿ÎœÎ¹ÎºÎ¬, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton ÎºÎ±Î¹ ÎœÎ± ÎºÎ¬ÎœÎµÏÎµ Î»Î®ÏÎ· ÏÎ¿Ï Î Î±ÎºÎÏÎ¿Ï ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor. ÎÎ¹ Î¹ÎŽÎ¹ÏÏÎ·ÏÎµÏ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï ÏÎ¿Ï Î ÎµÏÎ¹Î·Î³Î·ÏÎ® Tor ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÏ ÏÎµÏÎµÏ Î±ÏÏ ÎµÎºÎµÎ¯ÎœÎµÏ ÏÎ¿Ï Î±ÏÎ»Î¿Ï Firefox, Î±ÎºÏÎŒÎ· ÎºÎ±Î¹ ÏÏÎ·Îœ ÏÎµÏÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î¿ Firefox ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÎŒÎ±Î¶Î¯ ÎŒÎµ ÏÎ¿ Torbutton.\n\nÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÎŒÎ±ÎºÏÏÎœÎµÏÎµ ÏÎ¿ Torbutton, ÏÎ·Î³Î±Î¯ÎœÎµÏÎµ ÎÏÎ³Î±Î»ÎµÎ¯Î±->Î ÏÏÏÎžÎµÏÎ±->Extensions ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÏÎ»Î®ÎºÏÏÎ¿ ÎÏÎ¿ÎŒÎ¬ÎºÏÏÎœÏÎ· ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÎŽÎ¯ÏÎ»Î± Î±ÏÏ ÏÎ¿ Torbutton. -torbutton.popup.short_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎ® Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î± Î³Î¹Î± ÏÎ¿ Torbutton\n\nÎ€Î¿ Torbutton ÎµÎ¯ÎœÎ±Î¹ ÏÏÏÎ± ÏÏÎœÎµÏÏÏ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿.\n\nÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ, ÎºÎ¬ÎœÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Torbutton. +torbutton.popup.prompt_torbrowser = Î€Î¿ Torbutton Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ¬, ÏÏÏÎ±: ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÏÎ»ÎÎ¿Îœ ÎœÎ± ÏÎ¿ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ\n\nÎ ÏÎ¿Î²Î®ÎºÎ±ÎŒÎµ ÏÎµ Î±ÏÏÎ® ÏÎ·Îœ Î±Î»Î»Î±Î³Î® ÎŽÎ¹ÏÏÎ¹, ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÏÎ±Î»ÎÏ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÏÎ¿ Torbutton ÎŒÎÏÎ± Î±ÏÏ ÎÎœÎ± browser Î¿ Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ·ÏÎ¹ÎŒÎµÏÎµÎ¹ ÎºÎ±Î¹ Î³Î¹Î± ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÏÏÎ¯Ï ÏÎ· ÏÏÎ®ÏÎ· Tor. ÎÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Îœ ÎŽÎ¹Î¬ÏÎ¿ÏÎ± ÏÏÎ¬Î»ÎŒÎ±ÏÎ±-bugs ÏÎ± Î¿ÏÎ¿Î¯Î± ÎŽÎµÎœ ÎŒÏÎ¿ÏÎ¿ÏÏÎ±ÎŒÎµ ÎœÎ± ÎŽÎ¹Î¿ÏÎžÏÏÎ¿ÏÎŒÎµ.\n\nÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± ÎµÎŸÎ±ÎºÎ¿Î»Î¿ÏÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Firefox ÎºÎ±ÎœÎ¿ÎœÎ¹ÎºÎ¬, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton ÎºÎ±Î¹ ÎœÎ± ÎºÎ¬ÎœÎµÏÎµ Î»Î®ÏÎ· ÏÎ¿Ï Î Î±ÎºÎÏÎ¿Ï Tor Browser. ÎÎ¹ Î¹ÎŽÎ¹ÏÏÎ·ÏÎµÏ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï ÏÎ¿Ï Tor Browser ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÏÏÎµÏÎµÏ Î±ÏÏ ÎµÎºÎµÎ¯ÎœÎµÏ ÏÎ¿Ï Î±ÏÎ»Î¿Ï Fir efox, Î±ÎºÏÎŒÎ· ÎºÎ±Î¹ ÏÏÎ·Îœ ÏÎµÏÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î¿ Firefox ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÎŒÎ±Î¶Î¯ ÎŒÎµ ÏÎ¿ Torbutton.\n\nÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÎŒÎ±ÎºÏÏÎœÎµÏÎµ ÏÎ¿ Torbutton, ÏÎ·Î³Î±Î¯ÎœÎµÏÎµ ÎÏÎ³Î±Î»ÎµÎ¯Î± -> Î ÏÏÏÎžÎµÏÎ± -> Extensions ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÏÎ»Î®ÎºÏÏÎ¿ ÎÏÎ¿ÎŒÎ¬ÎºÏÏÎœÏÎ· ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÎŽÎ¯ÏÎ»Î± Î±ÏÏ ÏÎ¿ Torbutton. +torbutton.popup.short_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎ® Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î± Î³Î¹Î± ÏÎ¿ Torbutton!\n\nÎ€Î¿ Torbutton ÎµÎ¯ÎœÎ±Î¹ ÏÏÏÎ± ÏÏÎœÎµÏÏÏ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿.\n\nÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ, ÎºÎ¬ÎœÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Torbutton. -torbutton.popup.confirm_plugins = Plugins ÏÏÏÏ ÏÎ¿ Flash ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± Î²Î»Î¬ÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎ·Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ®Ï Î¶ÏÎ®Ï ÎºÎ±Î¹ ÏÎ·Îœ Î±ÎœÏÎœÏÎŒÎ¯Î± ÏÎ±Ï. â â ÎÏÎ¿ÏÎ¿ÏÎœ ÎµÏÎ¯ÏÎ·Ï ÎœÎ± ÏÎ±ÏÎ±ÎºÎ¬ÎŒÏÎ¿ÏÎœ ÏÎ¿ Tor Î³Î¹Î± ÎœÎ± Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎÏÎ¿ÏÏÎ± ÎžÎÏÎ· ÏÎ±Ï ÎºÎ±Î¹ ÏÎ· ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· IP.â â ÎÎ¹ÏÏÎµ ÏÎ¹Î³Î¿ÏÏÎ¿Ï ÏÏÏ ÎžÎµÎ»ÎµÏÎµ ÎœÎ± ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î±ÏÏÎ± ÏÎ± plugins?â â\n -torbutton.popup.never_ask_again = ÎÎ±ÎŒÎŒÎ¹Î± ÎµÏÏÏÎ·ÏÎ· ÎŸÎ±ÎœÎ± +torbutton.popup.confirm_plugins = Plugins ÏÏÏÏ ÏÎ¿ Flash ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± Î²Î»Î¬ÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎ·Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ®Ï Î¶ÏÎ®Ï ÎºÎ±Î¹ ÏÎ·Îœ Î±ÎœÏÎœÏÎŒÎ¯Î± ÏÎ±Ï. \n\nÎÏÎ¿ÏÎ¿ÏÎœ ÎµÏÎ¯ÏÎ·Ï ÎœÎ± ÏÎ±ÏÎ±ÎºÎ¬ÎŒÏÎ¿ÏÎœ ÏÎ¿ Tor Î³Î¹Î± ÎœÎ± Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎÏÎ¿ÏÏÎ± ÎžÎÏÎ· ÏÎ±Ï ÎºÎ±Î¹ ÏÎ· ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· IP.\n\nÎÎ¹ÏÏÎµ ÏÎ¹Î³Î¿ÏÏÎ¿Ï ÏÏÏ ÎžÎµÎ»ÎµÏÎµ ÎœÎ± ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î±ÏÏÎ± ÏÎ± plugins?\n\n +torbutton.popup.never_ask_again = ÎÎ± ÎŒÎ·Îœ ÎµÏÏÏÎ·ÎžÏ ÎŸÎ±ÎœÎ¬ +torbutton.popup.confirm_newnym = Î Tor Browser ÎžÎ± ÎºÎ»ÎµÎ¯ÏÎµÎ¹ ÏÎ»Î± ÏÎ± ÏÎ±ÏÎ¬ÎžÏÏÎ± ÎºÎ±Î¹ ÏÎ¹Ï ÎºÎ±ÏÏÎÎ»ÎµÏ. ÎÎ»ÎµÏ Î¿Î¹ ÏÏÎœÎµÎŽÏÎ¯ÎµÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¹ÎŽÏÎœ ÎžÎ± ÏÎ±ÎžÎ¿ÏÎœ.\n\nÎÏÎ±ÎœÎµÎºÎºÎ¯ÎœÎ·ÏÎ· ÏÎ¿Ï Tor Browser Î³Î¹Î± ÎµÏÎ±ÎœÎ±ÏÎ¿ÏÎ¬ ÏÎ·Ï ÏÎ±ÏÏÏÏÎ·ÏÎ¬Ï ÏÎ¿Ï;\n\n + +torbutton.maximize_warning = ÎÎµÎ³Î¹ÏÏÎ¿ÏÎ¿Î¹ÏÎœÏÎ±Ï ÏÎ¿Îœ Tor Browser, Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÎŽÎ¿ÏÎœ ÏÎ¹Ï ÎŽÎ¹Î±ÏÏÎ¬ÏÎµÎ¹Ï ÏÎ·Ï Î¿ÎžÏÎœÎ·Ï ÏÎ¿Ï, ÎºÎ¬ÏÎ¹ ÏÎ¿Ï ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎµÎ¯ Î³Î¹Î± ÎœÎ± ÏÎµ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ¿ÏÎœ. Î ÏÎ¿ÏÎµÎ¯ÎœÎ¿ÏÎŒÎµ ÎœÎ± Î±ÏÎ®ÏÎµÎ¹Ï ÏÎ± ÏÎ±ÏÎ¬ÎžÏÏÎ± ÏÎ¿Ï Tor Browser ÏÏÎ¿ ÏÏÎ¿ÎºÎ±ÎžÎ¿ÏÎ¹ÏÎŒÎÎœÎ¿ ÏÎ¿ÏÏ ÎŒÎÎ³ÎµÎžÎ¿Ï. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=ÎÏÏÏÏ Î¿ Î¹ÏÏÏÏÎ¿ÏÎ¿Ï (%S) ÏÏÎ¿ÏÏÎ¬ÎžÎ·ÏÎµ ÎœÎ± Î±ÏÎ¿ÎºÏÎ®ÏÎ· ÏÏÏÏÎ²Î±ÏÎ· ÏÎµ ÎŽÎµÎŽÎ¿ÎŒÎÎœÎ± ÎµÎ¹ÎºÏÎœÏÎœ ÏÎ¬ÎœÏ ÏÎµ ÎÎœÎ± ÎºÎ±ÎŒÎ²Î¬. ÎÏÏ ÏÎ·Îœ ÏÏÎ¹Î³ÎŒÎ® ÏÎ¿Ï ÎŽÎµÎŽÎ¿ÎŒÎÎœÎ± ÎµÎ¹ÎºÏÎœÏÎœ ÏÎµ ÎºÎ±ÎŒÎ²Î¬ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î³Î¹Î± ÎœÎ± Î±ÎœÎ±ÎºÎ±Î»ÏÏÎžÎ¿ÏÎœ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎÏ ÎŒÎµ ÏÎ¿Îœ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï, ÎºÎµÎœÎ¬ ÎŽÎµÎŽÎ¿ÎŒÎÎœÎ± ÎµÎ¹ÎºÏÎœÎ±Ï ÎµÏÎ¹ÏÏÏÎ¬ÏÎ·ÎºÎ±Îœ Î±ÏÏÎ® ÏÎ· ÏÎ¿ÏÎ¬. -canvas.allow=ÎÎ± ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ ÏÏÎ¿ ÎÎÎ»Î»Î¿Îœ +canvas.siteprompt=Î Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± (%S) ÏÏÎ¿ÏÏÎ¬ÎžÎ·ÏÎµ ÎœÎ± ÎµÎŸÎ¬Î³ÎµÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ HTML5, Î¿Î¹ Î¿ÏÎ¿Î¯ÎµÏ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ ÏÏÏÎµ ÎœÎ± Î±ÎœÎ±Î³ÎœÏÏÎ¹ÏÎžÎµÎ¯ Î· ÏÎ±ÏÏÏÏÎ·ÏÎ± ÏÎ¿Ï Î·Î»ÎµÎºÏÏÎ¿ÎœÎ¹ÎºÎ¿Ï ÏÎ±Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®.\n\nÎÎ± ÎµÏÎ¹ÏÏÎ±ÏÎµÎ¯ ÏÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± Î· ÎµÎŸÎ±Î³ÏÎ³Î® ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎœ HTML5; +canvas.notNow=ÎÏÎ¹ ÏÏÏÎ± +canvas.notNowAccessKey=Î +canvas.allow=ÎÎ± ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ ÏÏÎ¿ ÎŒÎÎ»Î»Î¿Îœ canvas.allowAccessKey=Î -canvas.never=Î Î¿ÏÎ Î³Î¹Î± Î±ÏÏÏ ÏÎ¿Îœ Î¹ÏÏÏÏÎ¿ÏÎ¿ +canvas.never=Î Î¿ÏÎ Î³Î¹Î± Î±ÏÏÏÎœ ÏÎ¿Îœ Î¹ÏÏÏÏÎ¿ÏÎ¿ (ÏÏÎœÎ¹ÏÏÎ¬ÏÎ±Î¹) canvas.neverAccessKey=Îµ + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=Î ÏÏÎ²Î»Î·ÎŒÎ± Î ÏÎ¿ÏÎ¯Î» %S +profileReadOnly=ÎÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÎµÎºÏÎµÎ»ÎÏÎµÏÎµ ÏÎ¿ %S Î±ÏÏ ÎÎœÎ± ÏÏÏÏÎ·ÎŒÎ± Î±ÏÏÎµÎ¯ÏÎœ ÎŒÏÎœÎ¿ Î³Î¹Î± Î±ÎœÎ¬Î³ÎœÏÏÎ·. Î Î±ÏÎ±ÎºÎ±Î»Ï Î±ÎœÏÎ¹Î³ÏÎ¬ÏÏÎµ ÏÎ¿ %S ÏÎµ ÎºÎ¬ÏÎ¿Î¹Î± Î¬Î»Î»Î· ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î± ÏÏÎ¹Îœ ÏÏÎ¿ÏÏÎ±ÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÎ¿ ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ. +profileReadOnlyMac=ÎÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÎµÎºÏÎµÎ»ÎÏÎµÏÎµ ÏÎ¿ %S Î±ÏÏ ÎÎœÎ± ÏÏÏÏÎ·ÎŒÎ± Î±ÏÏÎµÎ¯ÏÎœ ÎŒÏÎœÎ¿ ÎŒÎµ Î±ÎœÎ¬Î³ÎœÏÏÎ·. Î Î±ÏÎ±ÎºÎ±Î»Ï Î±ÎœÏÎ¹Î³ÏÎ¬ÏÏÎµ ÏÎ¿ %S ÏÏÎ·Îœ ÎµÏÎ¹ÏÎ¬ÎœÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï ÏÎ±Ï Î® ÏÏÎ¹Ï ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÏÏÎ¹Îœ ÏÏÎ¿ÏÏÎ±ÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÎ¿ ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ. +profileAccessDenied=Î€Î¿ %S ÎŽÎµÎœ ÎÏÎµÎ¹ Î¬ÎŽÎµÎ¹Î± ÎœÎ± ÏÏÎ¿ÏÏÎµÎ»Î¬ÏÎµÎ¹ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î». Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÏÎžÎŒÎ¯ÏÏÎµ ÏÎ¹Ï Î¬ÎŽÎµÎ¹ÎµÏ ÏÎ¿Ï ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï Î±ÏÏÎµÎ¯ÏÎœ ÏÎ±Ï ÎºÎ±Î¹ ÏÏÎ¿ÏÏÎ±ÎžÎ®ÏÏÎµ ÎŸÎ±ÎœÎ¬. +profileMigrationFailed=Î ÎŒÎµÏÎ±ÏÎ¿ÏÎ¬ ÏÎ¿Ï ÏÏÎ¬ÏÏÎ¿ÎœÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î» %S Î±ÏÎÏÏÏÎµ.\nÎÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ ÎœÎÎµÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=ÎÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·ÎŒÎÎœÎ· ÏÏÎœÎŽÎµÏÎ· (Î¥ÏÎ·ÏÎµÏÎ¯Î± Onion, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=ÎÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·ÎŒÎÎœÎ· ÏÏÎœÎŽÎµÏÎ· (ÏÏÎ·ÏÎµÏÎ¯Î± Onion) diff --git a/src/chrome/locale/es-AR/aboutDialog.dtd b/src/chrome/locale/es-AR/aboutDialog.dtd new file mode 100644 index 00000000..a20f6218 --- /dev/null +++ b/src/chrome/locale/es-AR/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; es desarrollado por "> + +<!ENTITY project.tpoLink "el &vendorShortName;"> +<!ENTITY project.end ", un organizaciÃ³n sin fines de lucro trabajando para defender tu privacidad y libertad en lÃnea."> + +<!ENTITY help.start "Â¿QuerÃ©s ayudar?"> + +<!ENTITY help.donateLink "DonÃ¡"> +<!ENTITY help.or "o"> + +<!ENTITY help.getInvolvedLink "involucrate"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Â¿Preguntas?"> + +<!ENTITY bottomLinks.grow "Â¡AyudÃ¡ a que la red de Tor crezca! "> + +<!ENTITY bottomLinks.license "InformaciÃ³n de la licencia"> +<!ENTITY tor.TrademarkStatement "'Tor' y el 'Onion Logo' son marcas registradas del Tor Project, Inc."> diff --git a/src/chrome/locale/es-AR/aboutTBUpdate.dtd b/src/chrome/locale/es-AR/aboutTBUpdate.dtd new file mode 100644 index 00000000..9a1c4ec4 --- /dev/null +++ b/src/chrome/locale/es-AR/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "ActualizaciÃ³n del Navegador Tor"> +<!ENTITY aboutTBUpdate.updated "El Navegador Tor ha sido actualizado."> +<!ENTITY aboutTBUpdate.linkPrefix "Para la informaciÃ³n mÃ¡s actualizada sobre Ã©sta versiÃ³n,"> +<!ENTITY aboutTBUpdate.linkLabel "visitÃ¡ nuestro sitio web"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "BitÃ¡cora de cambios:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nueva visualizaciÃ³n de Circuito, rediseÃ±ada"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Â¡La visualizaciÃ³n del Circuito Tor ha sido reubicada y mejorada! Cliquear el botÃ³n Identidad de Sitio (localizado en el lado izquierdo de la barra URL) para ver la nueva visualizaciÃ³n de circuito."> +<!ENTITY aboutTBUpdate.learnMore "AprendÃ© mÃ¡s"> diff --git a/src/chrome/locale/es-AR/aboutTor.dtd b/src/chrome/locale/es-AR/aboutTor.dtd new file mode 100644 index 00000000..fcb78004 --- /dev/null +++ b/src/chrome/locale/es-AR/aboutTor.dtd @@ -0,0 +1,42 @@ + + +<!ENTITY aboutTor.title "Acerca de Tor"> + +<!ENTITY aboutTor.ready.label "ExplorÃ¡. Privadamente."> +<!ENTITY aboutTor.ready2.label "EstÃ¡s listo para la experiencia de navegaciÃ³n mÃ¡s privada del mundo."> +<!ENTITY aboutTor.failure.label "Â¡Algo saliÃ³ mal!"> +<!ENTITY aboutTor.failure2.label "Tor no funciona en este navegador."> + +<!ENTITY aboutTor.search.label "BuscÃ¡ con DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Â¿Preguntas?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "RevisÃ¡ nuestro manual del navegador Tor Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Manual del navegador Tor"> + +<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organizaciÃ³n sin fines de lucro bajo las provisiones de la ley EUA 501(c)(3), cuya misiÃ³n es avanzar los derechos y libertades humanas creando y desplegando tecnologÃas de anonimato y privacidad de fuente abierta, soportando su disponibilidad y uso irrestricto, y ampliando su entendimiento cientÃfico y popular."> +<!ENTITY aboutTor.getInvolved.label "Involucrate Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "RecibÃ las Ãºltimas noticias de Tor derecho en tu bandeja de entrada."> +<!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Fortaleza en Canidad"> + +<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compaÃ±Ãa."> +<!ENTITY aboutTor.donationBanner.line2b "Avanzar los derechos humanos universales."> +<!ENTITY aboutTor.donationBanner.line2c "Plantarse por la libertad."> +<!ENTITY aboutTor.donationBanner.line2d "Proteger la privacidad de millones."> +<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Â¡Necesitamos tu apoyo!"> + +<!ENTITY aboutTor.donationBanner.line3 "DÃ¡ hoy, y Mozilla emparejarÃ¡ tu donaciÃ³n."> + +<!ENTITY aboutTor.donationBanner.buttonA "DonÃ¡ ahora"> +<!ENTITY aboutTor.donationBanner.buttonB "ContÃ¡ conmigo"> diff --git a/src/chrome/locale/es-AR/brand.dtd b/src/chrome/locale/es-AR/brand.dtd new file mode 100644 index 00000000..3b423ff3 --- /dev/null +++ b/src/chrome/locale/es-AR/brand.dtd @@ -0,0 +1,15 @@ + + +<!ENTITY brandShorterName "Navegador Tor"> +<!ENTITY brandShortName "Navegador Tor"> +<!ENTITY brandFullName "Navegador Tor"> +<!ENTITY vendorShortName "Proyecto Tor"> +<!ENTITY trademarkInfo.part1 "Firefox y los logotipos de Firefox son marcas registradas de la FundaciÃ³n Mozilla."> + + +<!ENTITY plugins.installed.find "Clic para cargar complementos del sistema instalados"> +<!ENTITY plugins.installed.enable "Habilitar complementos"> +<!ENTITY plugins.installed.disable "Deshabilitar complementos"> +<!ENTITY plugins.installed.disable.tip "Clic para evitar cargar complementos del sistema"> diff --git a/src/chrome/locale/es-AR/brand.properties b/src/chrome/locale/es-AR/brand.properties new file mode 100644 index 00000000..9da5b4ce --- /dev/null +++ b/src/chrome/locale/es-AR/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=Navegador Tor +brandShortName=Navegador Tor +brandFullName=Navegador Tor +vendorShortName=Proyecto Tor + +homePageSingleStartMain=Firefox Start, una pÃ¡gina de inicio rÃ¡pida con bÃºsqueda integrada +homePageImport=Importar tu pÃ¡gina de inicio desde %S + +homePageMigrationPageTitle=SelecciÃ³n de la pÃ¡gina de inicio +homePageMigrationDescription=Por favor, seleccionÃ¡ la pÃ¡gina de inicio que deseÃ¡s usar: + +syncBrandShortName=Sincronizar diff --git a/src/chrome/locale/es-AR/browserOnboarding.properties b/src/chrome/locale/es-AR/browserOnboarding.properties new file mode 100644 index 00000000..2422233e --- /dev/null +++ b/src/chrome/locale/es-AR/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=Bienvenido +onboarding.tour-tor-welcome.title=EstÃ¡s listo +onboarding.tour-tor-welcome.description=El navegador Tor ofrece el estÃ¡ndar mÃ¡s alto de privacidad y seguridad mientras estÃ¡s navegando la web. Ahora estÃ¡s protegido contra el rastreo, vigilancia y censura. Este entrenamiento rÃ¡pido te mostrarÃ¡ cÃ³mo. +onboarding.tour-tor-welcome.button=EmpezÃ¡ ahora + +onboarding.tour-tor-privacy=Privacidad +onboarding.tour-tor-privacy.title=IgnorÃ¡ a rastreadores y mirones. +onboarding.tour-tor-privacy.description=El navegador Tor aÃsla los cookies y borra tu historial de navegaciÃ³n despuÃ©s de tu sesiÃ³n. Estas modificaciones aseguran que tu privacidad y seguridad estÃ¡n protegidas en el navegador. CliqueÃ¡ 'Red de Tor' para aprender cÃ³mo te protegemos al nivel de red. +onboarding.tour-tor-privacy.button=Ir a la red de Tor + +onboarding.tour-tor-network=Red de Tor +onboarding.tour-tor-network.title=ViajÃ¡ por una red descentralizada. +onboarding.tour-tor-network.description=El navegador Tor te conecta a la red de Tor, formada por miles de voluntarios alrededor del mundo. A diferencia de una RPV, no hay un Ãºnico punto de falla o entidad central en la cual necesitÃ©s confiar de manera de disfrutar de internet privadamente. +onboarding.tour-tor-network.button=Ir a visualizaciÃ³n de Circuito + +onboarding.tour-tor-circuit-display=VisualizaciÃ³n de Circuito +onboarding.tour-tor-circuit-display.title=MirÃ¡ tu ruta +onboarding.tour-tor-circuit-display.description=Por cada dominio que visitÃ©s, tu trÃ¡fico es relevado y encriptado en un circuito a travÃ©s de tres relevos Tor alrededor del mundo. NingÃºn sitio web conoce desde donde te estÃ¡s conectando. PodÃ©s solicitar un nuevo circuito cliqueando 'Nuevo Circuito para este Sitio' en nuestra VisualizaciÃ³n de Circuito. +onboarding.tour-tor-circuit-display.button=Mirar mi ruta + +onboarding.tour-tor-security=Seguridad +onboarding.tour-tor-security.title=ElegÃ tu experiencia +onboarding.tour-tor-security.description=TambiÃ©n te proveemos con ajustes adicionales para incrementar rÃ¡pidamente la seguridad de tu navegador. Nuestros Ajustes de Seguridad te permiten bloquear elementos que podrÃan ser usados para atacar tu computadora. CliqueÃ¡ abajo para ver quÃ© es lo que hacen las diferentes opciones. +onboarding.tour-tor-security.button=Revisar ajustes + +onboarding.tour-tor-expect-differences=Consejos de Experiencia +onboarding.tour-tor-expect-differences.title=EsperÃ¡ algunas diferencias +onboarding.tour-tor-expect-differences.description=Con todas las caracterÃsticas de seguridad y privacidad provistas por Tor, tu experiencia mientras estÃ©s navegando Internet puede ser un poco diferente. Puede ser un poco mÃ¡s lenta, y dependiendo de tu nivel de seguridad, algunos elementos pueden no trabajar o cargarse. TambiÃ©n puede que te sea preguntado si sos humano, y no un robot. +onboarding.tour-tor-expect-differences.button=Mirar las Preguntas MÃ¡s Frecuentes + +onboarding.tour-tor-onion-services=Servicios Onion +onboarding.tour-tor-onion-services.title=UsÃ¡ protecciÃ³n extra. +onboarding.tour-tor-onion-services.description=Servicios Cebolla son sitios que terminan en .onion y proveen protecciÃ³n extra a editores y visitantes, incluyendo defensas adicionales contra la censura. Los servicios Cebolla le permiten a cualquiera proveer contenido y servicios anÃ³nimamente. CliqueÃ¡ abajo para visitar el sitio Cebolla de DuckDuckGo. +onboarding.tour-tor-onion-services.button=VisitÃ¡ un Cebolla + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=Siguiente +onboarding.tor-circuit-display.done=Hecho +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 + +onboarding.tor-circuit-display.intro.title=Â¿CÃ³mo funcionan los circuitos? +onboarding.tor-circuit-display.intro.msg=Los circuitos estÃ¡n constituidos por relevos asignados aleatoriamente, los cuales son computadoras en algÃºn lugar del mundo configuradas para redirigir trÃ¡fico Tor. Los circuitos te permiten navegar privadamente y conectarte a servicios Onion. + +onboarding.tor-circuit-display.diagram.title=VisualizaciÃ³n de Circuito +onboarding.tor-circuit-display.diagram.msg=Este diagrama muestra los relevos que constituyen el circuito para Ã©ste sitio web. Para prevenir vinculaciÃ³n de actividad a travÃ©s de diferentes sitios, cada sitio web obtiene un circuito diferente. + +onboarding.tor-circuit-display.new-circuit.title=Â¿NecesitÃ¡s un circuito nuevo? +onboarding.tor-circuit-display.new-circuit.msg=Si no sos capaz de conectarte al sitio web que estÃ¡s tratando de visitar o no se estÃ¡ cargando apropiadamente, podÃ©s usar Ã©ste botÃ³n para recargar el sitio con un nuevo circuito. diff --git a/src/chrome/locale/es-AR/torbutton.dtd b/src/chrome/locale/es-AR/torbutton.dtd new file mode 100644 index 00000000..24af2fb8 --- /dev/null +++ b/src/chrome/locale/es-AR/torbutton.dtd @@ -0,0 +1,51 @@ +<!ENTITY torbutton.context_menu.new_identity "Nueva Identidad"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "Nuevo Circuito Tor para este Sitio"> +<!ENTITY torbutton.context_menu.new_circuit_key "C"> +<!ENTITY torbutton.context_menu.preferences "ConfiguraciÃ³n de Seguridad..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Configuraciones de la Red de Tor"> +<!ENTITY torbutton.context_menu.networksettings.key "R"> +<!ENTITY torbutton.context_menu.downloadUpdate "Comprobar si hay ActualizaciÃ³n para el Navegador Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> +<!ENTITY torbutton.context_menu.cookieProtections "Protecciones de CooKies"> +<!ENTITY torbutton.context_menu.cookieProtections.key "K"> +<!ENTITY torbutton.button.tooltip "CliqueÃ¡ para inicializar Torbutton"> +<!ENTITY torbutton.prefs.security_settings "ConfiguraciÃ³n de Seguridad del Navegador Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores por defecto"> +<!ENTITY torbutton.prefs.custom_warning "Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto."> +<!ENTITY torbutton.cookiedialog.title "Manejar la ProtecciÃ³n de cookies"> +<!ENTITY torbutton.cookiedialog.lockCol "Protegido"> +<!ENTITY torbutton.cookiedialog.domainCol "Host"> +<!ENTITY torbutton.cookiedialog.nameCol "Nombre"> +<!ENTITY torbutton.cookiedialog.pathCol "Ruta"> +<!ENTITY torbutton.cookiedialog.protectCookie "Proteger Cookie"> +<!ENTITY torbutton.cookiedialog.removeCookie "Eliminar Cookie"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger Cookie"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas "> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de rastreo"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "MantenÃ© esta casilla chequeada para prevenir varias caracterÃsticas del navegador de ser abusadas para rastrearte a medida que navegÃ¡s la web. CaracterÃsticas modificadas incluyen URLs tipo blob, canales de difusiÃ³n, el cachÃ© del navegador, cookies, iconos favoritos, encabezados HTTP Auth, vÃnculos de preconexiÃ³n, URLs localStorage o mediaSource, llamadas OCSP, SharedWorkers, y tiquets de sesiÃ³n TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "Variar los detalles que te distinguen de otros usuarios del Navegador Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "MantenÃ© Ã©sta casilla chequeada para ocultar de los sitios web cosas que pudieran ser Ãºnicas acerca tuyo, incluyendo el rendimiento de tu computadora, distribuciÃ³n de teclado, configuraciÃ³n regional, localizaciÃ³n de complementos instalados, lista de complementos instalados, estado de red, orientaciÃ³n de la pantalla, tamaÃ±o de la misma, niveles de zoom especÃficos por sitio, tipos de archivo soportados, colores del sistema y capacidades WebGL."> +<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "La regla deslizante de Seguridad te deja deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a intentos de apropiaciÃ³n."> +<!ENTITY torbutton.prefs.sec_standard_label "EstÃ¡ndar"> +<!ENTITY torbutton.prefs.sec_standard_description "Todas las caracterÃsticas del navegador Tor y el sitio web estÃ¡n habilitadas."> +<!ENTITY torbutton.prefs.sec_safer_label "MÃ¡s seguro"> +<!ENTITY torbutton.prefs.sec_safer_description "Deshabilita caracterÃsticas del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad."> +<!ENTITY torbutton.prefs.sec_safer_list_label "En el ajuste "MÃ¡s seguro":"> +<!ENTITY torbutton.prefs.sec_safest_label "En extremo seguro"> +<!ENTITY torbutton.prefs.sec_safest_description "SÃ³lo permite caracterÃsticas del sitio web requeridas por sitios estÃ¡ticos y servicios bÃ¡sicos. Estos cambios afectan imÃ¡genes, medios y cÃ³digo ejecutable."> +<!ENTITY torbutton.prefs.sec_safest_list_label "En el ajuste "En extremo seguro":"> +<!ENTITY torbutton.prefs.sec_learn_more_label "MÃ¡s informacion"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript estÃ¡ deshabilitado en sitios no-HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios."> +<!ENTITY torbutton.prefs.sec_limit_typography "Algunos tipos de letra y sÃmbolos matemÃ¡ticos estÃ¡n deshabilitados."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunos tipos de letra, iconos, sÃmbolos matemÃ¡ticos e imÃ¡genes estÃ¡n deshabilitados."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y video (medios HTML5) son cliquear-para-reproducir."> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuevo circuito para este sitio"> diff --git a/src/chrome/locale/es-AR/torbutton.properties b/src/chrome/locale/es-AR/torbutton.properties new file mode 100644 index 00000000..181160ff --- /dev/null +++ b/src/chrome/locale/es-AR/torbutton.properties @@ -0,0 +1,55 @@ +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP desconocido +torbutton.circuit_display.onion_site = Sitio Onion +torbutton.circuit_display.this_browser = Este navegador +torbutton.circuit_display.relay = Relevo +torbutton.circuit_display.tor_bridge = Puente +torbutton.circuit_display.unknown_country = PaÃs desconocido +torbutton.circuit_display.guard = Guarda +torbutton.circuit_display.guard_note = Tu nodo [Guarda] puede no cambiar. +torbutton.circuit_display.learn_more = MÃ¡s informacion +torbutton.content_sizer.margin_tooltip = El navegador Tor aÃ±ade Ã©ste margen para hacer el ancho y alto de tu ventana menos distintivo, y de Ã©sta manera reduce la habilidad de cualquiera para rastrearte en lÃnea. +torbutton.panel.tooltip.disabled = Cliquear para habilitar Tor +torbutton.panel.tooltip.enabled = Cliquear para deshabilitar Tor +torbutton.panel.label.disabled = Tor deshabilitado +torbutton.panel.label.enabled = Tor habilitado +extensions.torbutton(a)torproject.org.description = Torbutton provee un botÃ³n para configurar ajustes de Tor, y rÃ¡pida y fÃ¡cilmente eliminar los datos de navegaciÃ³n privados. +torbutton.popup.external.title = Â¿Descargar un tipo de archivo externo? +torbutton.popup.external.app = Tor Browser no puede mostrar este archivo. Vas a tener que abrirlo con otra aplicaciÃ³n.\n\n +torbutton.popup.external.note = Algunos tipos de archivos pueden hacer que las aplicaciones se conecten a Internet sin usar Tor.\n\n +torbutton.popup.external.suggest = Para estar seguro, deberÃas abrir los archivos descargados mientras estÃ¡s fuera de lÃnea, o usar un Live CD de Tor, como Tails.\n +torbutton.popup.launch = Descargar archivo +torbutton.popup.cancel = Cancelar +torbutton.popup.dontask = Descargar automÃ¡ticamente los archivos a partir de ahora +torbutton.popup.no_newnym = El botÃ³n Tor no puede darte una nueva identidad en forma segura. No tiene acceso al puerto de control Tor.\n\nÂ¿EstÃ¡s corriendo el conjunto de programas del navegador Tor? +torbutton.security_settings.menu.title = ConfiguraciÃ³n de seguridad +torbutton.title.prompt_torbrowser = InformaciÃ³n importante del botÃ³n Tor +torbutton.popup.prompt_torbrowser = El botÃ³n Tor trabaja ahora en forma diferente: no podÃ©s desactivarlo mÃ¡s.\n\nHicimos Ã©ste cambio porque no es seguro usar el botÃ³n Tor en un navegador que tambiÃ©n es usado para navegaciÃ³n no-Tor. HabÃa demasiados errores, que no pudimos arreglar de ninguna otra manera.\n\nSi querÃ©s seguir usando Firefox normalmente, deberÃas desinstalar el botÃ³n Tor y descargar el conjunto de programas del navegador Tor. Las propiedades de privacidad del navegador Tor tambiÃ©n son superiores a aquellas del Firefox normal, aÃºn cuando Firefox es usado con el botÃ³n Tor.\n\nPara remover el botÃ³n Tor, andÃ¡ a Herramientas->Adiciones->Extensiones y luego cliqueÃ¡ el botÃ³n Remover al lado del botÃ³n Tor. +torbutton.popup.short_torbrowser = Â¡InformaciÃ³n importante del botÃ³n Tor!\n\nEl botÃ³n Tor ahora estÃ¡ siempre habilitado.\n\nCliqueÃ¡ en el botÃ³n Tor para mÃ¡s informaciÃ³n. + +torbutton.popup.confirm_plugins = Complementos tales como Flash pueden daÃ±ar tu privacidad y anonimato.\n\nTambiÃ©n pueden evitar Tor para revelar tu localizaciÃ³n corriente y direcciÃ³n IP.\n\nÂ¿EstÃ¡s seguro que querÃ©s habilitar complementos?\n\n +torbutton.popup.never_ask_again = No preguntarme de nuevo +torbutton.popup.confirm_newnym = El navegador Tor cerrarÃ¡ todas las ventanas y pestaÃ±as. Todas las sesiones en algÃºn sitio web se perderÃ¡n.\n\nÂ¿Reiniciar el navegador Tor ahora para renovar tu identidad?\n\n + +torbutton.maximize_warning = Maximizando el navegador Tor puede permitir que un sitio web determine el tamaÃ±o de tu monitor, lo cual puede ser usado para rastrearte. Te recomendamos que dejes las ventanas del navegador Tor en su tamaÃ±o original por defecto. + +# Canvas permission prompt. Strings are kept here for ease of translation. +canvas.siteprompt=Este sitio web (%S) intentÃ³ extraer datos de una regiÃ³n de imagen HTML5, los cuÃ¡les pueden ser usados para identificar Ãºnicamente tu computadora.\n\nÂ¿Debiera el navegador Tor permitir a Ã©ste sitio web extraer datos de regiÃ³n de imagen HTML5? +canvas.notNow=Ahora no +canvas.notNowAccessKey=N +canvas.allow=Permitir en el futuro +canvas.allowAccessKey=P +canvas.never=Nunca para este sitio (recomendado) +canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=Problema de perfil %S +profileReadOnly=No podÃ©s correr %S desde un sistema de archivos de sÃ³lo lectura. Por favor copiÃ¡ %S a otra ubicaciÃ³n antes de tratar de usarlo. +profileReadOnlyMac=No podÃ©s correr %S desde un sistema de archivos de sÃ³lo lectura. Por favor copiÃ¡ %S a tu Escritorio o carpeta Aplicaciones antes de tratar de usarlo. +profileAccessDenied=%S no tiene permiso para acceder al perfil. Por favor ajustÃ¡ los permisos de tu sistema de archivos y tratÃ¡ de nuevo. +profileMigrationFailed=La migraciÃ³n de tu perfil existente de %S fallÃ³.\nSerÃ¡n usados nuevos ajustes. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n encriptada (Servicio Onion, %1$S, claves de %2$S bits, %3$S) +pageInfo_OnionEncryption=ConexiÃ³n encriptada (Servicio Onion) diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties index ad6ca038..8fe3650a 100644 --- a/src/chrome/locale/fr/browserOnboarding.properties +++ b/src/chrome/locale/fr/browserOnboarding.properties @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Les circuits sont composÃ©s de relais a onboarding.tor-circuit-display.diagram.title=Affichage des circuits onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui composent le circuit de ce site Web. Pour empÃªcher de relier lâactivitÃ© dâun site Ã lâautre, chaque site Web obtient un circuit diffÃ©rent. -onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin d'un nouveau circuitâ? +onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin dâun nouveau circuitâ? onboarding.tor-circuit-display.new-circuit.msg=Si vous nâarrivez pas Ã vous connecter au site Web que vous essayez de visiter ou sâil ne se charge pas correctement, vous pouvez alors utiliser ce bouton pour recharger le site avec un nouveau circuit. diff --git a/src/chrome/locale/hu/aboutDialog.dtd b/src/chrome/locale/hu/aboutDialog.dtd new file mode 100644 index 00000000..b42d3365 --- /dev/null +++ b/src/chrome/locale/hu/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; fejlesztve Ã¡ltala: "> + +<!ENTITY project.tpoLink "a &vendorShortName;"> +<!ENTITY project.end ", egy nonprofit szervezet az online magÃ¡nÃ©let Ã©s szabadsÃ¡g vÃ©delmÃ©re."> + +<!ENTITY help.start "Akarsz segÃteni?"> + +<!ENTITY help.donateLink "TÃ¡mogatÃ¡s"> +<!ENTITY help.or "vagy"> + +<!ENTITY help.getInvolvedLink "rÃ©szvÃ©tel"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "KÃ©rdÃ©sek?"> + +<!ENTITY bottomLinks.grow "SegÃts a Tor hÃ¡lÃ³zat nÃ¶vekedÃ©sÃ©ben!"> + +<!ENTITY bottomLinks.license "Licensz informÃ¡ciÃ³k"> +<!ENTITY tor.TrademarkStatement "A 'Tor' Ã©s az 'Onion Logo' a Tor Project, Inc. bejegyzett vÃ©djegyei."> diff --git a/src/chrome/locale/hu/aboutTBUpdate.dtd b/src/chrome/locale/hu/aboutTBUpdate.dtd new file mode 100644 index 00000000..f8378a24 --- /dev/null +++ b/src/chrome/locale/hu/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "Tor BÃ¶ngÃ©szÅ FrissÃtÃ©s"> +<!ENTITY aboutTBUpdate.updated "Tor BÃ¶ngÃ©szÅ frissÃtve."> +<!ENTITY aboutTBUpdate.linkPrefix "Az errÅl a kiadÃ¡srÃ³l szÃ³lÃ³ legfrissebb informÃ¡ciÃ³kÃ©rt"> +<!ENTITY aboutTBUpdate.linkLabel "lÃ¡togassa meg weboldalunkat"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "VÃ¡ltozÃ¡sok listÃ¡ja:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ãj, Ã¡ttervezett Ã¡ramkÃ¶r megjelenÃtÃ©s"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "A Tor Ã¡ramkÃ¶r megjelenÃtÃ©s Ã¡thelyezÃ©sre Ã©s fejlesztÃ©sre kerÃŒlt. Kattintson az Oldal IdentitÃ¡s gombra (az URL sÃ¡v bal oldalÃ¡nÃ¡l) az Ãºj Ã¡ramkÃ¶r megjelenÃtÃ©s megtekintÃ©sÃ©hez."> +<!ENTITY aboutTBUpdate.learnMore "Tudjon meg tÃ¶bbet"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 9f14022b..6ac1ae1d 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "A Tor-rÃ³l"> + +<!ENTITY aboutTor.ready.label "Fedezzen fel. PrivÃ¡tan."> +<!ENTITY aboutTor.ready2.label "KÃ©szen Ã¡ll a vilÃ¡g legprivÃ¡tabb bÃ¶ngÃ©szÃ©si Ã©lmÃ©nyÃ©re."> +<!ENTITY aboutTor.failure.label "Valami nem jÃ³l mÅ±kÃ¶dik!"> +<!ENTITY aboutTor.failure2.label "A tor nem mÅ±kÃ¶dik ebben a bÃ¶ngÃ©szÅben."> + +<!ENTITY aboutTor.search.label "Keressen a DuckDuckGo-val"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "KÃ©rdÃ©sek?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tekintse meg a Tor BÃ¶ngÃ©szÅ ÃtmutatÃ³nkat"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor BÃ¶ngÃ©szÅ ÃtmutatÃ³"> + +<!ENTITY aboutTor.tor_mission.label "A Tor Project egy a US 501(c)(3) szerinti non-profit szervezet, amely az emberi jogokÃ©rt Ã©s szabadsÃ¡gÃ©rt harcol, nyÃlt forrÃ¡skÃ³dÃº anonimitÃ¡s Ã©s adatvÃ©delmi technolÃ³giÃ¡k fejlesztÃ©sÃ©vel Ã©s terjesztÃ©sÃ©vel, tÃ¡mogatva azok korlÃ¡tlan elÃ©rhetÅsÃ©gÃ©t Ã©s hasznÃ¡latÃ¡t, tÃ¡mogassÃ¡k a tudomÃ¡nyos Ã¡s Ã¡ltalÃ¡nos megÃ©rtÃ©sÃŒket."> +<!ENTITY aboutTor.getInvolved.label "Vegyen rÃ©szt"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor hÃreket kÃ¶zvetlenÃŒl email fiÃ³kjÃ¡ba."> +<!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hÃrekhez."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: ErÅssÃ©g a szÃ¡mokban"> + +<!ENTITY aboutTor.donationBanner.line2a "Az anonimitÃ¡s szereti a cÃ©geket."> +<!ENTITY aboutTor.donationBanner.line2b "ÃltalÃ¡nosan nÃ¶veli az emberi jogokat."> +<!ENTITY aboutTor.donationBanner.line2c "KiÃ¡ll a szabadsÃ¡gÃ©rt."> +<!ENTITY aboutTor.donationBanner.line2d "VÃ©di milliÃ³k magÃ¡nÃ©letÃ©t."> +<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erÅsnek."> +<!ENTITY aboutTor.donationBanner.line2f "SzÃŒksÃ©gÃŒnk van a tÃ¡mogatÃ¡sÃ¡ra!"> + +<!ENTITY aboutTor.donationBanner.line3 "Adjon ma Ã©s a Mozilla is annyival tÃ¡mogat."> + +<!ENTITY aboutTor.donationBanner.buttonA "TÃ¡mogasson most"> +<!ENTITY aboutTor.donationBanner.buttonB "SzÃ¡mÃtsatok bele"> diff --git a/src/chrome/locale/hu/brand.dtd b/src/chrome/locale/hu/brand.dtd index 59f665e8..229ff97e 100644 --- a/src/chrome/locale/hu/brand.dtd +++ b/src/chrome/locale/hu/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "A Firefox Ã©s a Firefox logÃ³ a Mozilla Foundation vÃ©djegyei."> + + +<!ENTITY plugins.installed.find "Kattintson telepÃtett bÃ¶ngÃ©szÅ pluginek betltÃ©sÃ©hez"> +<!ENTITY plugins.installed.enable "BeÃ©pÃŒlÅ modulok engedÃ©lyezÃ©se"> +<!ENTITY plugins.installed.disable "BeÃ©pÃŒlÅ modulok tiltÃ¡sa "> +<!ENTITY plugins.installed.disable.tip "Kattintson a rendszer beÃ©pÃŒlÅ modulok betÃ¶ltÃ©sÃ©nek megakadÃ¡lyozÃ¡sÃ¡hoz."> diff --git a/src/chrome/locale/hu/brand.properties b/src/chrome/locale/hu/brand.properties index f63def38..93001e71 100644 --- a/src/chrome/locale/hu/brand.properties +++ b/src/chrome/locale/hu/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, egy gyors weboldal beÃ©pÃtett keresÅvel +homePageImport=KezdÅlap importÃ¡lÃ¡sa a %S termÃ©kbÅl -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=KezdÅlap vÃ¡lasztÃ¡s +homePageMigrationDescription=KÃ©rjÃŒk vÃ¡lassza ki a hasznÃ¡landÃ³ kezdÅlapot: -syncBrandShortName=Sync +syncBrandShortName=SzinkronizÃ¡lÃ¡s diff --git a/src/chrome/locale/hu/browserOnboarding.properties b/src/chrome/locale/hu/browserOnboarding.properties new file mode 100644 index 00000000..ee790662 --- /dev/null +++ b/src/chrome/locale/hu/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=KÃ¶szÃ¶ntjÃŒk +onboarding.tour-tor-welcome.title=KÃ©szen van. +onboarding.tour-tor-welcome.description=A Tor BÃ¶ngÃ©szÅ a legmagasabb adatvÃ©delmet Ã©s biztonÃ¡got adja, mikÃ¶zben bÃ¶ngÃ©szik. Most vÃ©dett a kÃ¶vetÃ©stÅl, megfigyelÃ©stÅl Ã©s cenzorÃ¡lÃ¡stÃ³l. Ez a rÃ¶vid Ã¡ttekintÃ©s megmutatja, hogyan. +onboarding.tour-tor-welcome.button=IndÃtÃ¡s most + +onboarding.tour-tor-privacy=AdatvÃ©delem +onboarding.tour-tor-privacy.title=snub kÃ¶vetÅk Ã©s figyelÅk. +onboarding.tour-tor-privacy.description=A Tor BÃ¶ngÃ©szÅ elszigeteli a sÃŒtiket Ã©s tÃ¶rli az elÅzmÃ©nyeket az alkalom vÃ©gÃ©n. Ezek a mÃ³dosÃtÃ¡sok biztosÃtjÃ¡k adatvÃ©delmÃ©t Ã©s biztonsÃ¡gÃ¡t a bÃ¶ngÃ©szÅben. Kattintson a 'Tor hÃ¡lÃ³zat' pontra, hogy megismerhesse a vÃ©delmet hÃ¡lÃ³zati szinten. +onboarding.tour-tor-privacy.button=IrÃ¡ny a Tor HÃ¡lÃ³zat + +onboarding.tour-tor-network=Tor HÃ¡lÃ³zat +onboarding.tour-tor-network.title=Utazzon egy decentralizÃ¡lt hÃ¡lÃ³zaton. +onboarding.tour-tor-network.description=A Tor BÃ¶ngÃ©szÅ Ã¶sszekÃ¶ti Ãnt Ã©s a Tor hÃ¡lÃ³zatÃ¡t Ã¶nkÃ©ntesek ezreivel a vilÃ¡gon. A VPN-nel ellentÃ©tben nincs egypontos hibalehetÅsÃ©g vagy kÃ¶zpontosÃtott entitÃ¡s amiben bÃznia kell, ahhoz, hogy az internetet privÃ¡t hasznÃ¡lja. +onboarding.tour-tor-network.button=UgrÃ¡s az ÃramkÃ¶r megjelenÃtÃ©shez + +onboarding.tour-tor-circuit-display=ÃramkÃ¶r megjelenÃtÅ +onboarding.tour-tor-circuit-display.title=Tekintse meg ÃºtvonalÃ¡t. +onboarding.tour-tor-circuit-display.description=Minden meglÃ¡togatott domainhez, a forgalma titkosÃtva tovÃ¡bbÃtÃ¡sra hÃ¡rom a vilÃ¡gban talÃ¡lhatÃ³ Tor relÃ©n. Semmilyen weboldal nem fogja tudni honnan kapcsolÃ³dott. KÃ©rhet Ãºj Ã¡ramkÃ¶rt az 'Ãj Ã¡ramkÃ¶r ehhez a site-hoz"-ra kattintva az ÃramkÃ¶r megjelenÃtÅn. +onboarding.tour-tor-circuit-display.button=Megtekintem az Ãºtvonalam + +onboarding.tour-tor-security=BiztonsÃ¡g +onboarding.tour-tor-security.title=VÃ¡lassza ki Ã©lmÃ©nyÃ©t +onboarding.tour-tor-security.description=TovÃ¡bbi beÃ¡llÃtÃ¡si lehetÅsÃ©geket biztosÃtunk a bÃ¶ngÃ©szÅ biztonsÃ¡g nÃ¶velÃ©se Ã©rdekÃ©ben. A BiztonsÃ¡gi beÃ¡llÃtÃ¡saink lehetÅvÃ© teszik, hogy blokkoljon olyan elemeket, amelyekkel tÃ¡madhatÃ³ a szÃ¡mÃtÃ³gÃ©pe. Kattintson alÃ¡bb, hogy lÃ¡ssa, mely lehetÅsÃ©gek mit csinÃ¡lnak. +onboarding.tour-tor-security.button=BeÃ¡llÃtÃ¡sok Ã¡ttekintÃ©se + +onboarding.tour-tor-expect-differences=Tapasztalati tippek +onboarding.tour-tor-expect-differences.title=SzÃ¡mÃtson kÃŒlÃ¶nbsÃ©gekre. +onboarding.tour-tor-expect-differences.description=Minden biztonsÃ¡gi Ã©s adatvÃ©delmi lehetÅsÃ©ggel amit a Tor biztosÃt, a tapasztalatai az internet bÃ¶ngÃ©szÃ©srÅl eltÃ©rÅek lehetnek. A dolgok egy kicsit lassabbak, a beÃ¡llÃtott biztonsÃ¡gi szintjÃ©tÅl, nÃ©hÃ¡ny elem nem mÅ±kÃ¶dik vagy tÃ¶lt be. ElkÃ©pzelhetÅ, hogy rÃ¡kÃ©rdeznek arra, hogy ember vagy robot kÃ©rdÃ©st kap. +onboarding.tour-tor-expect-differences.button=LÃ¡sd GYIK + +onboarding.tour-tor-onion-services=Onion szolgÃ¡ltatÃ¡sok +onboarding.tour-tor-onion-services.title=Legyen extra vÃ©dett. +onboarding.tour-tor-onion-services.description=Az Onion szolgÃ¡ltatÃ¡sok olyan oldalak, amelyek .onion-ra vÃ©gzÅdnek, Ã©s extra vÃ©delmet adnak a fenntartÃ³juknak Ã©s lÃ¡togatÃ³iknak, beleÃ©rtve a a cenzÃºra ellenes funkciÃ³kat is. Az Onion szolgÃ¡ltatÃ¡sok lehetÅvÃ© teszik bÃ¡rkinek, hogy tartalmat Ã©s szolgÃ¡ltatÃ¡sokat nyÃºjtson nÃ©vtelenÃŒl. \nKattintson alÃ¡bb a DuckDuckGo onion oldal meglÃ¡togatÃ¡sÃ¡hoz. +onboarding.tour-tor-onion-services.button=LÃ¡togasson meg egy Onion-t + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=KÃ¶vetkezÅ +onboarding.tor-circuit-display.done=KÃ©sz +onboarding.tor-circuit-display.one-of-three=1 a 3-bÃ³l +onboarding.tor-circuit-display.two-of-three=2 a 3-bÃ³l +onboarding.tor-circuit-display.three-of-three=3 a 3-bÃ³l + +onboarding.tor-circuit-display.intro.title=Hogyan mÅ±kÃ¶dnek az Ã¡ramkÃ¶rÃ¶k? +onboarding.tor-circuit-display.intro.msg=Az Ã¡ramkÃ¶rÃ¶k vÃ©letlenÃŒl hozzÃ¡rendelt relÃ©kbÅl Ã¡llnak, amik olyan szÃ¡mÃtÃ³gÃ©pek, amik tovÃ¡bbÃtjÃ¡k a Tor forgalmat. Az Ã¡ramkÃ¶rÃ¶k teszik lehetÅÃ©v hogy privÃ¡t bÃ¶ngÃ©sszen Ã©s onion szolgÃ¡ltatÃ¡shoz csatlakozzon. + +onboarding.tor-circuit-display.diagram.title=ÃramkÃ¶r megjelenÃtÅ +onboarding.tor-circuit-display.diagram.msg=A diagram azt mutatja milyen relÃ©k alkotjÃ¡k az oldal Ã¡ramkÃ¶rÃ©t. AzÃ©rt, hogy megakadÃ¡lyozza a keresztoldalas hivatkozÃ¡st, minden oldal kÃŒlÃ¶n Ã¡ramkÃ¶rt kap. + +onboarding.tor-circuit-display.new-circuit.title=SzÃŒksÃ©ge van egy Ã¡ramkÃ¶rre? +onboarding.tor-circuit-display.new-circuit.msg=Ha nem sikerÃŒl meglÃ¡togatni egy oldalt vagy nem tÃ¶lt be megfelelÅen, akkor hasznÃ¡lhatja ezt a gombot egy mÃ¡sik Ã¡ramkÃ¶rÃ¶n keresztÃŒli ÃºjratÃ¶ltÃ©shez. diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index f0fa66e2..ecab5ecf 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -1,12 +1,19 @@ <!ENTITY torbutton.context_menu.new_identity "Ãj szemÃ©lyazonossÃ¡g"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.networksettings "HÃ¡lÃ³zati beÃ¡llÃtÃ¡sok megnyitÃ¡sa"> -<!ENTITY torbutton.context_menu.downloadUpdate "Tor BÃ¶ngÃ©szÅ csomag frissÃtÃ©sÃ©nek letÃ¶ltÃ©se"> +<!ENTITY torbutton.context_menu.new_circuit "Ãj Tor Ã¡ramkÃ¶r ehhez az oldalhoz"> +<!ENTITY torbutton.context_menu.new_circuit_key "S"> +<!ENTITY torbutton.context_menu.preferences "BiztonsÃ¡gi beÃ¡llÃtÃ¡sok..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok"> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser frissÃtÃ©sek keresÃ©se"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "SÃŒti vÃ©delem"> +<!ENTITY torbutton.context_menu.cookieProtections "SÃŒti vÃ©delmek..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializÃ¡lÃ¡sÃ¡hoz"> -<!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtÃ©kek visszaÃ¡llÃtÃ¡sa"> +<!ENTITY torbutton.prefs.security_settings "Tor Browser biztonsÃ¡gi beÃ¡llÃtÃ¡sok"> +<!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtelmezÃ©sek visszaÃ¡llÃtÃ¡sa"> +<!ENTITY torbutton.prefs.custom_warning "Az Ã¡ltalad eszkÃ¶zÃ¶lt egyÃ©ni bÃ¶ngÃ©szÅi beÃ¡llÃtÃ¡sok eredmÃ©nyekÃ©pp biztonsÃ¡gi kockÃ¡zatok merÃŒlhetnek fel. BiztonsÃ¡gi Ã©s adatvÃ©delmi szempontokbÃ³l kÃ©rjÃŒk vÃ¡lassz az alapÃ©rtelmezett biztonsÃ¡gi szintek kÃ¶zÃŒl."> <!ENTITY torbutton.cookiedialog.title "SÃŒti vÃ©delem kezelÃ©se"> <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett"> <!ENTITY torbutton.cookiedialog.domainCol "ÃllomÃ¡s"> @@ -19,4 +26,26 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "VÃ©dje az Ãºj sÃŒtiket"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne vÃ©dje az Ãºj sÃŒtiket"> <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik fÃ©ltÅl szÃ¡rmazÃ³ sÃŒtik Ã©s nyomkÃ¶vetÃ©si adatok korlÃ¡tozÃ¡sa"> -<!ENTITY torbutton.prefs.resist_fingerprinting "VÃ¡ltoztassa meg a rÃ©szleteket, amik megkÃŒlÃ¶nbÃ¶ztetik a tÃ¶bbi Tor bÃ¶ngÃ©szÅ felhasznÃ¡lÃ³tÃ³l"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hagyja ezt a gombot bejelÃ¶lve, hogy megakadÃ¡lyozza, hogy kÃŒlÃ¶nbÃ¶zÅ bÃ¶ngÃ©szÅ lehetÅsÃ©gek eltÃ©rÃtÃ©sre kerÃŒlhessenek a webes nyomon kÃ¶vethetÅsÃ©ge Ã©rdekÃ©ben. A mÃ³dosÃtott szolgÃ¡ltatÃ¡sok tÃ¶bbek kÃ¶zÃ¶tt, blob URL, broadcast csatornÃ¡k, bÃ¶ngÃ©szÅ cache, sÃŒtik, favikonok, HTTP Auth fejlÃ©cek, link elÅcsatlakozÃ¡sok, localStorage, mediaSource URL-ek, OCSP kÃ©rÃ©sek, SharedWorkers-ek, Ã©s TLS session ticketek."> +<!ENTITY torbutton.prefs.resist_fingerprinting "VÃ¡ltoztassa meg a rÃ©szleteket, amik megkÃŒlÃ¶nbÃ¶ztetik a tÃ¶bbi Tor Browser felhasznÃ¡lÃ³tÃ³l"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hagyja ezt a gombot bejelÃ¶lve, hogy elrejtsen dolgokat weboldalak elÅl, amik egyedivÃ© tehetik, mint elem Ã¡llapot, szÃ¡mÃtÃ³gÃ©p teljesÃtmÃ©ny, billentyÅ±zet kiosztÃ¡s, hely, a telepÃtett pluginek helye, a telepÃtett pluginek listÃ¡ja, hÃ¡lÃ³zati Ã¡llapota, kÃ©pernyÅ irÃ¡nyÃtottsÃ¡ga, oldal specifikus nagyÃtÃ¡s szintek, tÃ¡mogatott fÃ¡jltÃpusok, rendszerszÃnek, Ã©s WebGL kÃ©pessÃ©gek,"> +<!ENTITY torbutton.prefs.sec_caption "BiztonsÃ¡gi szint"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "A BiztonsÃ¡gi CsÃºszÃ³ka lehetÅvÃ© tesz, hogy kikapcsoljon olyan bÃ¶ngÃ©szÅ funkcionalitÃ¡sokat, amik sebezhetÅvÃ© teszik a tÃ¶rÃ©si kÃsÃ©rletekben."> +<!ENTITY torbutton.prefs.sec_standard_label "NormÃ¡l"> +<!ENTITY torbutton.prefs.sec_standard_description "Minden Tor BÃ¶ngÃ©szÅ Ã©s weboldal szolgÃ¡ltatÃ¡s engedÃ©lyezve."> +<!ENTITY torbutton.prefs.sec_safer_label "BiztonsÃ¡gosabb"> +<!ENTITY torbutton.prefs.sec_safer_description "Azon weboldal szolgÃ¡ltatÃ¡sok tiltÃ¡sa, amelyek tÃ¶bbnyire veszÃ©lyesek, ami nÃ©hÃ¡ny oldal mÅ±kÃ¶dÃ©sÃ©nek problÃ©mÃ¡it okozhatja."> +<!ENTITY torbutton.prefs.sec_safer_list_label "A biztonsÃ¡gosabb beÃ¡llÃtÃ¡s utÃ¡n_"> +<!ENTITY torbutton.prefs.sec_safest_label "LegbiztonsÃ¡gosabb"> +<!ENTITY torbutton.prefs.sec_safest_description "Csak azon weboldal szolgÃ¡ltatÃ¡sok engedÃ©lyezÃ©se, amelyek a statikus, vagy alap szolgÃ¡ltatÃ¡sokhoz szÃŒksÃ©gesek. Ezek a beÃ¡llÃtÃ¡sok Ã©rintik a kÃ©peket, mÃ©diÃ¡kat Ã©s scripteket."> +<!ENTITY torbutton.prefs.sec_safest_list_label "A biztonsÃ¡gosabb beÃ¡llÃtÃ¡s utÃ¡n:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "TovÃ¡bbi informÃ¡ciÃ³"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "A JavaScript tiltott a nem-HTTPS oldalkon."> +<!ENTITY torbutton.prefs.sec_js_disabled "A JavaScript alapÃ©rtelmezetten tiltott minden oldalon."> +<!ENTITY torbutton.prefs.sec_limit_typography "NÃ©hÃ¡ny betÅ±tÃpus Ã©s matematikai szimbÃ³lum tiltÃ¡sra kerÃŒlt."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "NÃ©hÃ¡ny betÅ±tÃpus, ikon Ã©s matematikai szimbÃ³lum Ã©s a kÃ©pek tiltÃ¡sra kerÃŒltek."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "AudiÃ³ Ã©s videÃ³ (HTML5 mÃ©dia) kattintÃ¡sra indul."> +<!ENTITY torbutton.circuit_display.title "Tor Ã¡ramkÃ¶r"> +<!ENTITY torbutton.circuit_display.new_circuit "Ãj Tor Ã¡ramkÃ¶r ehhez az oldalhoz"> diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties index 722f45ee..9f851da7 100644 --- a/src/chrome/locale/hu/torbutton.properties +++ b/src/chrome/locale/hu/torbutton.properties @@ -1,27 +1,55 @@ +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP cÃm ismeretlen +torbutton.circuit_display.onion_site = Onion oldal +torbutton.circuit_display.this_browser = Ez a bÃ¶ngÃ©szÅ +torbutton.circuit_display.relay = ElosztÃ³ +torbutton.circuit_display.tor_bridge = HÃd +torbutton.circuit_display.unknown_country = Ismeretlen orszÃ¡g +torbutton.circuit_display.guard = År +torbutton.circuit_display.guard_note = Az [Guard] csomÃ³pont nem vÃ¡ltozik. +torbutton.circuit_display.learn_more = TovÃ¡bbi informÃ¡ciÃ³ +torbutton.content_sizer.margin_tooltip = A Tor Browser ezt a margÃ³t adja hozzÃ¡, hogy a magassÃ¡ga Ã©s a szÃ©lessÃ©ge az ablaknak kevÃ©sbÃ© eltÃ©rÅ legyen, Ãgy csÃ¶kkenti az online tevÃ©kenysÃ©gÃ©nek nyomon kÃ¶vethetÅsÃ©gÃ©t. torbutton.panel.tooltip.disabled = Kattintson rÃ¡ a Tor bekapcsolÃ¡sÃ¡hoz torbutton.panel.tooltip.enabled = Kattintson rÃ¡ a Tor kikapcsolÃ¡sÃ¡hoz torbutton.panel.label.disabled = Tor kikapcsolva torbutton.panel.label.enabled = Tor bekapcsolva extensions.torbutton(a)torproject.org.description = A Torbutton egy gombot biztosÃt a Tor beÃ¡llÃtÃ¡sok mÃ³dosÃtÃ¡sÃ¡hoz Ã©s a gyors Ã©s kÃ¶nnyÅ± takarÃtÃ¡sÃ¡hoz a privÃ¡t bÃ¶ngÃ©szÃ©si adatoknak. -torbutton.popup.external.title = KÃŒlsÅ tartalom betÃ¶ltÃ©se? -torbutton.popup.external.app = Egy kÃŒlsÅ alkalmazÃ¡s szÃŒksÃ©ges a kezelÃ©shez:\n -torbutton.popup.external.note = \nMEGJEGYZÃS: A kÃŒlsÅ alkalmazÃ¡sok alaphelyzetben NEM biztonsÃ¡gosak Ã©s felfedhetik kilÃ©tÃ©t.\n -torbutton.popup.external.suggest = \nHa ez a fÃ¡jl nem megbÃzhatÃ³, akkor jobb, ha lementi Ã©s megtekinti hÃ¡lÃ³zati kapcsolat nÃ©lkÃŒl vagy egy virtuÃ¡lis gÃ©pben, vagy Ãºgy is dÃ¶nthet, hogy egy Ã¡tlÃ¡tszÃ³ Tor proxy-t hasznÃ¡l, mint pÃ©ldÃ¡ul a Tails LiveCD vagy a torsocks.\n -torbutton.popup.launch = AlkalmazÃ¡s indÃtÃ¡sa +torbutton.popup.external.title = TÃ¶ltse le a kÃŒlsÅ fÃ¡jl tÃpust? +torbutton.popup.external.app = A Tor Browser nem tudja megjelenÃteni ezt a fÃ¡jlt. Egy mÃ¡sik alkalmazÃ¡ssal kell megnyitnod.\n\n +torbutton.popup.external.note = NÃ©hÃ¡ny fÃ¡jl kÃ©pes alkalmazÃ¡sokat az internethez kapcsÃ³dtatni Tor hasznlÃ¡lata nÃ©lkÃŒl.\n\n +torbutton.popup.external.suggest = Hogy biztonsÃ¡gban legyen, a letÃ¶ltÃ¶tt fÃ¡jlokat Csak offlinekÃ©nt vagy Tor Live CD-ami olyan mint a Tail- hasznÃ¡latÃ¡val nyissa meg.\n +torbutton.popup.launch = FÃ¡jl letÃ¶ltÃ©se torbutton.popup.cancel = MÃ©gse -torbutton.popup.dontask = Mindig indÃtsa az alkalmazÃ¡sokat mostantÃ³l -torbutton.popup.prompted_language = A mÃ©g tÃ¶bb adatvÃ©delem Ã©rdekÃ©ben a Torbutton kÃ©rheti a weboldaltÃ³l, hogy angol nyelvÅ± oldalt szolgÃ¡ljon ki. Ez azt jelenti, hogy a sajÃ¡t nyelve helyet az oldal angolul jelenhet meg.\n\nSzeretnÃ© kÃ©rni a magasabb biztonsÃ¡g Ã©rdekÃ©ben az angol nyelvÅ± oldalak lekÃ©rÃ©sÃ©t? -torbutton.popup.no_newnym = A Torbutton nem tud biztonsÃ¡gosan Ãj szemÃ©lyazonossÃ¡got adni. Nincs hozzÃ¡fÃ©rÃ©se a Tor vezÃ©rlÅ porthoz.\n\nNem a Tor bÃ¶ngÃ©szÅ csomagot hasznÃ¡lja? +torbutton.popup.dontask = Automatikusan letÃ¶lti a fÃ¡jlt most innen +torbutton.popup.no_newnym = A Torbutton nem tud biztonsÃ¡gosan Ãj szemÃ©lyazonossÃ¡got adni. Nincs hozzÃ¡fÃ©rÃ©se a Tor vezÃ©rlÅ porthoz.\n\nNem a Tor Browser csomagot hasznÃ¡lja? +torbutton.security_settings.menu.title = BiztonsÃ¡gi beÃ¡llÃtÃ¡sok torbutton.title.prompt_torbrowser = Fontos Torbutton informÃ¡ciÃ³ -torbutton.popup.prompt_torbrowser = A Torbutton most mÃ¡r mÃ¡skÃ©pp mÅ±kÃ¶dik: nem kapcsolhatÃ³ ki tÃ¶bbÃ©.\n\nAzÃ©rt hoztok ezt a dÃ¶ntÃ©st, mert nem biztonsÃ¡gos egy olyan bÃ¶ngÃ©szÅbÅl Torbuttont hasznÃ¡lni, amely Tor hasznÃ¡latÃ¡n kÃvÃŒli is bÃ¶ngÃ©szÃ©sre hasznÃ¡lt. TÃºl soh hiba tÃ¶rtÃ©nhet, amit mÃ¡skÃ©pp nem tudunk javÃtani.\n\nHa szeretnÃ© a Firefox-ot normÃ¡lisan hasznÃ¡lni, akkor a Torbutton-t el kell tÃ¡volÃtania, Ã©s helyette letÃ¶lteni a Tor BÃ¶ngÃ©szÅ Csomagot. Az adatvÃ©delmi beÃ¡llÃtÃ¡sai a Tor BÃ¶ngÃ©szÅnek tovÃ¡bbÃ¡ magasabbak, mint a normÃ¡lis Firefox-nak, mÃ©g akkor is, ha a Firefox Torbutton-nal kerÃŒlt egyÃŒtt felhasznÃ¡lÃ¡sra.\n\nA Torbutton eltÃ¡volÃtÃ¡sÃ¡hoz navigÃ¡ljon az EszkÃ¶zÃ¶k>KiegÃ©szÃtÅk>KiterjesztÃ©sek menÃŒpontba., majd nyomja meg az EltÃ¡volÃtÃ¡s gombot a Torbutton mellett. +torbutton.popup.prompt_torbrowser = A Torbutton most mÃ¡r mÃ¡skÃ©pp mÅ±kÃ¶dik: nem kapcsolhatÃ³ ki tÃ¶bbÃ©.\n\nAzÃ©rt hoztok ezt a dÃ¶ntÃ©st, mert nem biztonsÃ¡gos egy olyan bÃ¶ngÃ©szÅbÅl Torbuttont hasznÃ¡lni, amely Tor hasznÃ¡latÃ¡n kÃvÃŒli is bÃ¶ngÃ©szÃ©sre hasznÃ¡lt. TÃºl soh hiba tÃ¶rtÃ©nhet, amit mÃ¡skÃ©pp nem tudunk javÃtani.\n\nHa szeretnÃ© a Firefox-ot normÃ¡lisan hasznÃ¡lni, akkor a Torbutton-t el kell tÃ¡volÃtania, Ã©s helyette letÃ¶lteni a Tor Browser Csomagot. Az adatvÃ©delmi beÃ¡llÃtÃ¡sai a Tor Browser-nek tovÃ¡bbÃ¡ magasabbak, mint a normÃ¡lis Firefox-nak, mÃ©g akkor is, ha a Firefox Torbutton-nal kerÃŒlt egyÃŒtt felhasznÃ¡lÃ¡sra.\n\nA Torbutton eltÃ¡volÃtÃ¡sÃ¡hoz navigÃ¡ljon az EszkÃ¶zÃ¶k>KiegÃ©szÃtÅk>KiterjesztÃ©sek menÃŒpontba., majd nyomja meg az EltÃ¡volÃtÃ¡s gombot a Torbutton mellett. torbutton.popup.short_torbrowser = Fontos Torbutton informÃ¡ciÃ³!\n\na Torbutton most mÃ¡r mindig engedÃ©lyezett.\n\nKattintson a Torbutton-ra tovÃ¡bbi informÃ¡ciÃ³kÃ©rt. torbutton.popup.confirm_plugins = A kiegÃ©szÃtÅk, , mint a Flash sÃ©rthetik az anonimitÃ¡st Ã©s az adatbiztonsÃ¡got.\n\nEzek ezenkÃvÃŒl megkerÃŒlhetik a Tor-t, hogy felfedjÃ©k az aktuÃ¡lis helyÃ©t Ã©s IP cÃmÃ©t.\n\nBiztos, hogy szeretnÃ© engedÃ©lyezni ezeket a kiegÃ©szÃtÅket?\n torbutton.popup.never_ask_again = Ne kÃ©rdezze tÃ¶bbÃ© +torbutton.popup.confirm_newnym = A Tor Browser becsukja az Ã¶sszes ablakot Ã©s fÃŒlet. Minden weboldalkapcsolat megszakad.\n\nÃjraindÃtsuk a Tor Browser-t, hogy alaphelyzetbe Ã¡llÃtsuk szemÃ©lyazonossÃ¡gÃ¡t?\n\n + +torbutton.maximize_warning = A Tor Browser teljes mÃ©retÅ±vÃ© Ã¡llÃtÃ¡sa engedÃ©lyt adhat a weboldalaknak arra, hogy megÃ¡llapÃtsÃ¡k a monitor mÃ©retÃ©t, amit felhasznÃ¡lhatnak az Ãn kÃ¶vetÃ©sÃ©hez. Azt javasoljuk, hogy tartsa meg a Tor Browser alapÃ©rtelmezett ablakmÃ©retÃ©t. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ez a weboldal (%S) megprÃ³bÃ¡l egy kÃ©p adatot elÃ©rni egy rÃ©tegen. Mivel a rÃ©teg kÃ©p hasznÃ¡lhatÃ³ a szÃ¡mÃtÃ³gÃ©p felderÃtÃ©sÃ©re, ÃŒres kÃ©p adat lett visszakÃŒldve ez alkalommal. -canvas.allow=A jÃ¶vÅben engedÃ©lyez +canvas.siteprompt=Ez az oldal (%S) megprÃ³bÃ¡l HTML5 kÃ©pvÃ¡szon adatokat kicsomagolni, ami a szÃ¡mÃtÃ³gÃ©pe egyedi azonosÃtÃ¡sÃ¡ra lehet alkalmas.\n\nMegengedje a Tor Browser a HTML5 vÃ¡szon kÃ©p informÃ¡ciÃ³k kiemelÃ©sÃ©t? +canvas.notNow=Most nem +canvas.notNowAccessKey=N +canvas.allow=Megengedi a jÃ¶vÅbe canvas.allowAccessKey=J -canvas.never=Soha ennÃ©l az oldalnÃ¡l +canvas.never=Soha ehhez az oldalhoz (ajÃ¡nlott) canvas.neverAccessKey=S + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S Profile problÃ©ma +profileReadOnly=Nem tudja futtatni a %S -t csak olvashatÃ³ fÃ¡jlrendszerrÅl. KÃ©rem mÃ¡solja %S-t egy mÃ¡sik helyre, mielÅtt hasznÃ¡lja. +profileReadOnlyMac=Nem tudja futtatni a %S -t csak olvashatÃ³ fÃ¡jlrendszerrÅl. KÃ©rem mÃ¡solja %S-t az Asztalra, vagy az AlkalmazÃ¡sok mappÃ¡ba, mielÅtt hasznÃ¡lja. +profileAccessDenied=%S nem rendelkezik jogosultsÃ¡ggal a profil elÃ©rÃ©sÃ©hez. KÃ©rem Ã¡llÃtsa be a fÃ¡jl rendsze jogosultsÃ¡gokat, majd prÃ³bÃ¡lja Ãºjra. +profileMigrationFailed=%S lÃ©tezÅ profil migrÃ¡ciÃ³ja nem sikerÃŒlt.\nÃj beÃ¡llÃtÃ¡sokat fogunk hasznÃ¡lni. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=TitkosÃtott kapcsolat (Onion szolgÃ¡ltatÃ¡s, %1$S, %2$S bites kulcsok, %3$S) +pageInfo_OnionEncryption=TitkosÃtott kapcsolat (Onion szolgÃ¡ltatÃ¡s) diff --git a/src/chrome/locale/ka/aboutDialog.dtd b/src/chrome/locale/ka/aboutDialog.dtd new file mode 100644 index 00000000..a4879555 --- /dev/null +++ b/src/chrome/locale/ka/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName;-áá¡ ášááá¥áááááá"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", á§áááááááá á ááááááá¡ áááŠáááá¡ ááá áášá, ááá¢áá ááá¢ášá áá¥áááá ááá ááá£ááááá¡á áá ááááá¡á£á€ááááá¡ á£áá á£ááááá¡áá§áá€áá."> + +<!ENTITY help.start "ááá®ááá ááá ááá¡áááá ááááá?"> + +<!ENTITY help.donateLink "ááááŠáá ášáááá¬áá á£áááá"> +<!ENTITY help.or "áá"> + +<!ENTITY help.getInvolvedLink "ášáááááááá áááá"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "áááá®áááá ááá¥áá?"> + +<!ENTITY bottomLinks.grow "áááá®ááá áá Tor á¥á¡ááá¡ ááá€áá áááááášá!"> + +<!ENTITY bottomLinks.license "á¡ááááªááááá áááááªááááá"> +<!ENTITY tor.TrademarkStatement "âTorâ áá âOnion Logoâ á¬áá áááááááá¡ Tor Project Inc-áá¡ áá£ááááá á¡ááááá á ááášáááá¡."> diff --git a/src/chrome/locale/ka/aboutTBUpdate.dtd b/src/chrome/locale/ka/aboutTBUpdate.dtd new file mode 100644 index 00000000..f8852666 --- /dev/null +++ b/src/chrome/locale/ka/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "Tor-áá áá£ááá áá¡ ááááá®áááá"> +<!ENTITY aboutTBUpdate.updated "Tor-áá áá£ááá á ááááá®áááá£ááá."> +<!ENTITY aboutTBUpdate.linkPrefix "áá ááááášááááá¡ ášáá¡áá®áá á£áá®ááá¡á ááá€áá áááªááá¡ ááá¡ááŠáááá,"> +<!ENTITY aboutTBUpdate.linkLabel "áá¬áááá á©áááá¡ áááá¡ááá¢á¡"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "áªááááááááá:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "áááášáá áá¡ á¬á áááá¡ áá á ááááá®áááá£áá ááá á¡áá®áá"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor-áá¡ áááášáá áá¡ á¬á áááá¡ áá áá áááááá ášáááªáááá áá ááá¢áá ááá£áá¯áááá¡áá! ááá¬ááááá á¡ááá¢áá¡ ááááááááááá¡ á¡áááá®áá (ááá¡áááá ááááá¡ ááááá¡ ááá áªá®ááá ááááááá¡ááá£á) áŠáááááá, ááááá®áááá£áá á¬á áááá¡ áá áá¡ ááááá¡áá©áááá."> +<!ENTITY aboutTBUpdate.learnMore "áá®áááá áá áªááá"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index 9f14022b..f232c0ba 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "Tor-áá¡ ášáá¡áá®áá"> + +<!ENTITY aboutTor.ready.label "áááááá®á£ááá. á£á¡áá€á áá®áá."> +<!ENTITY aboutTor.ready2.label "áá¥ááá áááá á®áá á áá¡áá€áááášá á§áááá ááá¢áá á£á¡áá€á áá®á áá ááá ááá áá áá£ááá áá¡ ááááá§áááááá¡áááá¡."> +<!ENTITY aboutTor.failure.label "á ááŠááª á áááá ááá áá!"> +<!ENTITY aboutTor.failure2.label "Tor áá áá£ášáááá¡ áá áá áá£ááá ášá."> + +<!ENTITY aboutTor.search.label " á«áááá DuckDuckGo-áá"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "áááá®áááá ááá¥áá?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "ááááªáááá Tor-áá áá£ááá áá¡ á¡áá®áááá«áŠááááááá¡ Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "á®"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-áá áá£ááá áá¡ á¡áá®áááá«áŠáááááá"> + +<!ENTITY aboutTor.tor_mission.label "Tor-áá ááá¥á¢á á¬áá áááááááá¡ 501(c)(3) áá áááááááááá áá áááááááªááá¡, á ááááááª á®ááá¡ á£á¬á§ááá¡ ááááááááá¡ á£á€ááááááá¡ áááªááá¡á áá ááááá¡á£á€ááááá¡ á®áá áá¡á®áá¡ ááá£áá¯áááá¡áááá¡, á£á€áá¡á áá áŠáá á¬á§áá áá¡ áá¥ááá, áááááááá¡á áá ááá ááá áááááªáááááá¡ áááááŠááááááá¡ááá áááªá£áá á¢áá¥áááááááááá¡ ášáá¥ááááá áá ášááá£ášáááááá, áááááá ášáá£ááŠá£áááá á¬áááááá¡á áá ááááá§áááááá¡ á£áá á£ááááá§áá€áá, ášááááááá áááááááááá áá áá£ášááááá , á¡ááááááááááá¡ áªáááááá áááá¡ ááááá¡ áá¡ááááŠáááááá."> +<!ENTITY aboutTor.getInvolved.label "ášáááááááá áááá Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "ááááŠáá á¡ááá®ááááá Tor-áá¡ááá, ááá ááááá áá¥áááá¡ á¡áá€áá¡á¢á á§á£áášá."> +<!ENTITY aboutTor.newsletter.link_text "áááááá¬áá áá Tor-áá¡ á¡ááá®ááááá."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: á¡áá«áááá á áªáá€á ááášá"> + +<!ENTITY aboutTor.donationBanner.line2a "áááááááá¡ áááááŠááááááá¡ááá áááªáá á¡áááá áááá¡ á®ááá®áá¡ á¡ááá ááááá¡."> +<!ENTITY aboutTor.donationBanner.line2b "áááá£áá¯áááá¡áá ááááááááá¡ á£á€ááááááá¡ áááªáá."> +<!ENTITY aboutTor.donationBanner.line2c "áá®áá á ááá£ááá áá ááááá¡á£á€ááááá¡."> +<!ENTITY aboutTor.donationBanner.line2d "ááááªáááá áááááááááá ááááááááá¡ ááá ááá áááááªááááá."> +<!ENTITY aboutTor.donationBanner.line2e "ášááááá á©á£ááá Tor á«áááá á."> +<!ENTITY aboutTor.donationBanner.line2f "á©ááá áááá¡áááá áááá áá¥áááá áááá áášá ááááá!"> + +<!ENTITY aboutTor.donationBanner.line3 "ááááªáá ááŠáá¡áá áá Mozilla ááááá áááááá¡ áá¥áááá¡ ášáááá¬áá á£ááááá¡."> + +<!ENTITY aboutTor.donationBanner.buttonA "áááá®áá¡ áááŠááá áá®áááá"> +<!ENTITY aboutTor.donationBanner.buttonB "á©ááá á¬áááááá¡ ááŠááášááá"> diff --git a/src/chrome/locale/ka/brand.dtd b/src/chrome/locale/ka/brand.dtd index 59f665e8..28e23451 100644 --- a/src/chrome/locale/ka/brand.dtd +++ b/src/chrome/locale/ka/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY brandShorterName "Tor-áá áá£ááá á"> +<!ENTITY brandShortName "Tor-áá áá£ááá á"> +<!ENTITY brandFullName "Tor-áá áá£ááá á"> +<!ENTITY vendorShortName "Tor-áá ááá¥á¢á"> +<!ENTITY trademarkInfo.part1 "Firefox áá ááá¡á ááááááá á¬áá áááááááá¡ Mozilla-á¡ á€ááááá¡ á¡ááááá á ááášáááá¡."> + + +<!ENTITY plugins.installed.find "áááá¬ááááá ááá§ááááá£áá á¡áá¡á¢ááá£á á áááá£ááááá¡ á©áá¡áá¢ááá ááá"> +<!ENTITY plugins.installed.enable "áááá£ááááá¡ á©áá ááá"> +<!ENTITY plugins.installed.disable "áááá£ááááá¡ ááááá ááá"> +<!ENTITY plugins.installed.disable.tip "áááá¬ááááá á¡áá¡á¢ááá£á á áááá£ááááá¡ á©áá¢ááá áááá¡ áá¡áá ááááááá"> diff --git a/src/chrome/locale/ka/brand.properties b/src/chrome/locale/ka/brand.properties index f63def38..b825e912 100644 --- a/src/chrome/locale/ka/brand.properties +++ b/src/chrome/locale/ka/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandShorterName=Tor-áá áá£ááá á +brandShortName=Tor-áá áá£ááá á +brandFullName=Tor-áá áá£ááá á +vendorShortName=Tor-áá ááá¥á¢á -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, á¡á¬á áá€á á¡áá¬á§áá¡á áááá áá á©áášááááá£áá á«ááááá¡ ááááá +homePageImport=ááááááá¢áááá áá¥áááá á¡áá¬á§áá¡á áááá áá %S-áááá -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=á¡áá¬á§áá¡á áááá ááá¡ áá á©ááá +homePageMigrationDescription=ááá®ááá ááá á©ááá á¡áá¡á£á áááá á¡áá¬á§áá¡á áááá áá: syncBrandShortName=Sync diff --git a/src/chrome/locale/ka/browserOnboarding.properties b/src/chrome/locale/ka/browserOnboarding.properties new file mode 100644 index 00000000..2490b234 --- /dev/null +++ b/src/chrome/locale/ka/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=ááááá¡ááááááá +onboarding.tour-tor-welcome.title=áá¥ááá á£ááá áááá á®áá á. +onboarding.tour-tor-welcome.description=Tor-áá áá£ááá á ááááááááá á£áááŠááá¡á á®áá áá¡á®áá¡ áááá¡áá®á£á áááá¡, ááá ááá áááááªáááááá¡ áááªááá¡á áá á£á¡áá€á áá®ááááá¡ á£áá á£ááááá¡áá§áá€áá, áááá ááááá¡ ááááá®á£ááááá¡áá¡. áá®áá á£ááá áááªá£áá á®áá á áááááááááá¡ááá, ááááááá§á£á ááááá¡á áá áªáááá£á áá¡ááá. áááªááá£áá ááááá£á á á§ááááá€áá á¡ áááááááá á¢ááá. +onboarding.tour-tor-welcome.button=áá®áááá ááá¬á§ááá + +onboarding.tour-tor-privacy=ááá ááá£áááá +onboarding.tour-tor-privacy.title=ááááªáááá ááááááá§á£á áááá áá áªááááá¡ááá§ááá áááá +onboarding.tour-tor-privacy.description=Tor-áá áá£ááá á ááªáááááááá¡ á¡ááá¢áá¡ á€á£ááá£ášááá¡ áá ášááá¡ ááááá®á£áááá£áá áááá ááááá¡ áá¡á¢áá ááá¡ ááá®á£á ááá¡áááááá. áá¡áááá¡á ááááá¢ááá£áá áªááááááááá á£áá á£ááááá§áá€á¡ ááá ááá áááááªáááááá¡ áááªááá¡á áá á£á¡áá€á áá®ááááá¡ áááŠáá á®áá áá¡á®á¡ áá áá£ááá ášá. ááá¬ááááá âTor-á¥á¡áááâ áá áá®áááá, áá£ á áááá á®áááá áááªáá á¥á¡áááá¡ áááááá. +onboarding.tour-tor-privacy.button=Tor-á¥á¡ááášá ášáá¡ááá + +onboarding.tour-tor-network=Tor-á¥á¡ááá +onboarding.tour-tor-network.title=áá¡áá áááááá ááááá£áááááááá, áá áááá áááá£áá áááá áááááááá¡ááá áááªá£áá á¥á¡áááá. +onboarding.tour-tor-network.description=Tor-áá áá£ááá áá á£áááášáá ááááá Tor-á¥á¡ááá¡, á ááááá¡ áá£ášááááá¡ááª á£áá á£ááááá§áá€á¡ áááá¡áááá ááá®áááá¡á, ááááá áá¡áá€áááá¡ ááá¡ášá¢áááá. áááá¡á®ááááááá VPN-áá¡ááá, áá ášáááá®ááááášá áá ááá¬ááá áªááááá£áá ááá áá¡ áá áá ááá£ááá¡ ááááá áá áá áááá¡áá á®áá á áááááááááá£áá, áááá ááááá¡ áááááááá¡ ááá£áááŠáááááááá ááááá®á£ááááá¡áá¡. +onboarding.tour-tor-network.button=á¬á áááá¡ á¡áá©ááááááá áá ááá ááááá¡ááá + +onboarding.tour-tor-circuit-display=á¬á áááá¡ á¡áá©áááááááá áá á +onboarding.tour-tor-circuit-display.title=áá®áááá áá¥áááá áá á®á. +onboarding.tour-tor-circuit-display.description=áááááá£á ááá¡áááá ááá ááááá¡áááá¡áá¡, áááááªááááá áááááªááááá á¡á á£ááá ááá áááá¥ááááá áá áášáá€á ááá, áá¡áá€áááá¡ ááááá¡áááá á¬áá á¢áááááá ášáááá®ááááá ášáá á©áá£áá á¡ááá Tor-ááááááªáááá ášáá¥áááá á¬á ááášá. áááá¡ááá¢ááá¡ áá ášáá£á«áááá ááááááááá, á¡ááááá á£áááášáá ááááá. áá®ááá á¬á áááá¡ áááá®ááááá¡áááá¡, á¬á áááá¡ áá áášá ááá¬ááááá âáá®ááá á¬á ááá áá á¡ááá¢áá¡áááá¡â. +onboarding.tour-tor-circuit-display.button=áá á®áá¡ ááá®áá + +onboarding.tour-tor-security=á£á¡áá€á áá®áááá +onboarding.tour-tor-security.title=áááá ááá á¡ááá£ááá áááá®áááááááááá¡ +onboarding.tour-tor-security.description=á©ááá áá¡ááá ááááááááá ááááá¢áááá ááá áááá¢á ááá¡, áá áá£ááá áá¡ á£á¡áá€á áá®ááááá¡ ááááá á£á€á á ááá¢áá áá¡ááááŠáááááá. á©áááá á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá, á¡áášá£áááááá¡ ááá«áááá ášáááŠá£ááá áááá ááá¡ áá¡ ááá¬ááááá, á áááááááª áá¥áááá¡ áááááá£á¢áá áá ášáá¢áááá¡áááá¡ ášááá«áááá áááááá§áááá. ááá¬ááááá á¥ááááá áá áá®áááá áá ááá áááá¢á áááá¡ ášáá¡áá®áá áá áªááá. +onboarding.tour-tor-security.button=ááá áááá¢á áááá¡ ááááá®áááá + +onboarding.tour-tor-expect-differences=ááááá§áááááá¡ááá áááááášáá ááá£áá á¡ááááá®ááá +onboarding.tour-tor-expect-differences.title=ááá¡áááááááá áªááááááááá. +onboarding.tour-tor-expect-differences.description=Tor-áá¡ áááá ášááááááááááá£áá á£á¡áá€á áá®ááááá¡á áá ááá ááá áááááªáááááá¡ áááªááá¡ á¡áášá£áááááááá, ášáá¡áá«ááá ááªáá á áªááááááááá áááááá¬áááá¡ áááá ááááá¡ ááááá®á£ááááá¡áá¡. áááááá áá á áá áªáá¢á ášáááááááá áá áá¥ááá áááá ášáá á©áá£áá á£á¡áá€á áá®ááááá¡ ááááááá áááááááááá á, áááá ááááá¡ áªááááá£áá ááá¬ááááá áá ááá£ášááááá¡ áá áá á©ááá¢ááá áááá. áááá¡ááá, á¡ááá¢áááá¡ ááá¬áááá, ášáá¡áá«ááá á®ášáá áá ááááá¬ááá áááá¡ áá ááá¡á¢á£á ááá á áá áááááááá á®áá á áá áá á á áááá¢á. +onboarding.tour-tor-expect-differences.button=áá®áááá á®.á.á. + +onboarding.tour-tor-onion-services=Onion-áááá¡áá®á£á ááááá +onboarding.tour-tor-onion-services.title=áá§áááá ááá¢áá-áááªá£áá. +onboarding.tour-tor-onion-services.description=Onion-áááá¡áá®á£á ááááá á¬áá áááááááá¡ á¡ááá¢ááá¡ .onion áááááááááá, á ááááááª áááá¡ááá£áá ááá£ááá áááŠáá á£á¡áá€á áá®ááááá¡ ááááá¡ á¡áááááááá¡ ááá¡áááááá¡ áááááááá¡áááááá¡ááª áá áááá®áááááá¡ááª, ááá ášáá áá¡ áªáááá£á áá¡ááá ááááá¡ áá áááááá¡ ááááá¢áááá ášáá¡áá«ááááááááá¡. Onion-áááá¡áá®á£á ááááá á¡áášá£áááááá¡ áá«áááá¡ ááááá¡áááá á¡, ášáááááá¡á áá áááá¡áá®á£á ááááá áááá®ááá áááááá¡ áááá¬áááá¡ áááááááá¡ ááá£áá®áááá. ááá¬ááááá á¥á áááá, DuckDuckGo-á¡ onion-áááá ááá¡ ááá¡áááá®á£áááááá. +onboarding.tour-tor-onion-services.button=áá¬áááá Onion-á¡ + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=ášáááááá +onboarding.tor-circuit-display.done=áááááá +onboarding.tor-circuit-display.one-of-three=1 â 3 +onboarding.tor-circuit-display.two-of-three=2 â 3 +onboarding.tor-circuit-display.three-of-three=3 â 3 + +onboarding.tor-circuit-display.intro.title=á áááá áá£ášáááá¡ á¬á ááááá? +onboarding.tor-circuit-display.intro.msg=á¬á ááááá áá¥ááááá ášáááá®ááááá ášáá á©áá£áá ááááááªáááááá, á áááááá¡ááª á¬áá áááááááá¡ áááá áá¡áá€áááášá áááááá£áá áááááá£á¢áá ááá, ááááá áá£ááá á¡ááááááááá Tor-á¥á¡áááá¡ áááááªáááááá¡ ááá¡áá¢áá ááááá. á¬á ááááá á¡áášá£áááááá¡ ááá«áááá, áááááá®á£ááá áááá áááá ááá ááá áááááªáááááá¡ áááªááá áá á¬ááááá ááááŠáá Onion-áááá¡áá®á£á ááááááá. + +onboarding.tor-circuit-display.diagram.title=á¬á áááá¡ áá á +onboarding.tor-circuit-display.diagram.msg=á¡á¥ááááá áááªááá£ááá ááááááªááááá, á áááááááª á¥áááá¡ á¬á ááá¡ áá á¡ááá¢áá¡ ááá¡áááá®á£áááááá. á¡á®ááááá¡á®áá á¡ááá¢áááá ááá¥áááááááá¡ ášáá áá¡ á£á áááá ááááášáá áá¡ áááááááá¡ áá¡áá ááááááá, áááááá£á á¡ááá¢áá á¬áááááá¡áááá¡ áááá¡á®áááááá£áá á¬á ááá áááááá§ááááá. + +onboarding.tor-circuit-display.new-circuit.title=áá®ááá á¬á ááá ááá¡áááá ááááá? +onboarding.tor-circuit-display.new-circuit.msg=áá£ ááá áá®áá á®ááá áááááášáá áááá¡ á¡ááá¢ááá, á ááááá¡ ááá®áááª áá¡á£á á áá ááááá áá áá¡áááááááá á©ááá¢ááá áá, ááášáá ášáááá«áááá áá áŠáááááá¡ ááááá§áááááá á®áááá®áá á©áá¢ááá ááá á¡ááá¢á áá®ááá á¬á áááá. diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index d8d88e49..1c5635af 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -1,22 +1,51 @@ -<!ENTITY torbutton.context_menu.new_identity "New Identity"> -<!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "Name"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.context_menu.new_identity "áá®ááá ááááááá"> +<!ENTITY torbutton.context_menu.new_identity_key "á"> +<!ENTITY torbutton.context_menu.new_circuit "áá®ááá Tor-á¬á ááá áá á¡ááá¢áá¡áááá¡"> +<!ENTITY torbutton.context_menu.new_circuit_key "á¬"> +<!ENTITY torbutton.context_menu.preferences "á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá"> +<!ENTITY torbutton.context_menu.preferences.key "á£"> +<!ENTITY torbutton.context_menu.networksettings "Tor-á¥á¡áááá¡ ááá áááá¢á ááá..."> +<!ENTITY torbutton.context_menu.networksettings.key "á¥"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor-áá áá£ááá áá¡ ááááá®ááááááá ášáááá¬áááá..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "á"> +<!ENTITY torbutton.context_menu.cookieProtections "á€á£ááá£ášáááá¡ áááªáá..."> +<!ENTITY torbutton.context_menu.cookieProtections.key "á€"> +<!ENTITY torbutton.button.tooltip "áááá¬ááááá Torbutton-áá¡ ááá¡áášááááá"> +<!ENTITY torbutton.prefs.security_settings "Tor-áá áá£ááá áá¡ á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá"> +<!ENTITY torbutton.prefs.restore_defaults "áááá£ááá¡á®ááááá¡ ááŠááááá"> +<!ENTITY torbutton.prefs.custom_warning "áá¥ááá áááá áááááááá£áá ááá áááá¢á ááá áá áá£ááá ášá, áá áá ááá¡ááŠááá á£á¡áá€á áá®ááááá¡áááá¡. ááá ááá áááááªáááááá¡ á¡áááááááá áááªááá¡ á£áá á£ááááá¡áá§áá€áá, ááá á©ááá ášááá á©ááá á£á¡áá€á áá®ááááá¡ áááá£ááá¡á®áááá áááááááááá á ááááááá."> +<!ENTITY torbutton.cookiedialog.title "á€á£ááá£ášáááá¡ á£á¡áá€á áá®ááááá¡ ááá ááá"> +<!ENTITY torbutton.cookiedialog.lockCol "áááªá£ááá"> +<!ENTITY torbutton.cookiedialog.domainCol "ááá¡áááá áá"> +<!ENTITY torbutton.cookiedialog.nameCol "á¡áá®ááá"> +<!ENTITY torbutton.cookiedialog.pathCol "áááááá áááá"> +<!ENTITY torbutton.cookiedialog.protectCookie "á€á£ááá£ášáá¡ áááªáá"> +<!ENTITY torbutton.cookiedialog.removeCookie "á€á£ááá£ášáá¡ áááªááááá"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "á€á£ááá£ášáá¡ áááªááá¡ ááá®á¡áá"> +<!ENTITY torbutton.cookiedialog.removeAllBut "á§ááááá¡ áááªááááá áááªá£ááááá¡ ááá áá"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "áá®ááá á€á£ááá£ášáááá¡ áááªáá"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "áá®ááá á€á£ááá£ášáááá¡ áááªááá¡ ášáá©áá ááá"> +<!ENTITY torbutton.prefs.restrict_thirdparty "ááá¡ááá áá®áá áá¡ á€á£ááá£ášáááá¡á áá á¡á®áá ááááááá§á£á ááááá¡ ášáááŠá£ááá"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "á"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ááá¢áááá áá¡ á£á¯á á ááááášáá£áá, áá áá£ááá áá¡ áªááááá£áá ášáá¡áá«áááááááááá¡ áááá , áá¥ááááá á£ááááá ááá áááááááááá¡ áá¡áá ááááááá, ááááááá ááááá¡ ááááá®á£ááááá¡áá¡. ášááªááááá ášáá¡áá«ááááááááá ááááªááá¡ Blob-ááá£áááá¡, áááááªáááá¡ áá á®ááá¡, áá áá£ááá áá¡ ááášá¡, á€á£ááá£ášááá¡, á¡ááá¢áá¡ á®áá¢á£áááá¡, HTTP-áááá¡áá áááá¡, ááá£ááá¡ á¬áááá¡á¬áá ášááá áááááá¡, áááááááá áá á¡ááªááá¡, á€ááááá¡ á¬á§áá áá¡ URL-ááá¡, OCSP-áááá®áááááá¡, SharedWorker-ááá¡á á á TLS-á¡áááá¡áá¡ áááááªá®ááááá¡."> +<!ENTITY torbutton.prefs.resist_fingerprinting "áªááááá£áá á¬áá ááááááááá¡ ášááªááá, á áááááááª áááááá¡á®áááááá Tor-áá áá£ááá áá¡ á¡á®áá áááá®ááá ááááááá¡ááá"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "áª"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ááá¢áááá áá¡ á£á¯á á ááááášáá£áá, áá¡ááá áááááªáááááá¡ ááá¡áá€áá áá, á ááááá¡ á¡áášá£ááááááááª, á¡ááá¢ááá¡ ášááá«ááááá áá¥áááá á¡á®ááááá¡ááá ááááá á©ááá, ááá ášáá áá¡áá áááááá£á¢áá áá¡ á¬áá áááááá, ááááááá¢á£á áá¡ ááááááááá, áááá¡ ááá áááá¢á ááá, ááá§ááááá£áá áááá£ááááá¡ á©áááááááááá áá áááá ááááááááááá áááá, á¥á¡áááá¡ ááááááá áááá, ááá áááá¡ ááááááá áááá áá áááááá, á¡ááá¢áá¡ ášáááááá¡áá¡ áááááá, á€ááááá¡ áá®áá áá ááá ááá á¡áá®áááá, á¡áá¡á¢áááá¡ á€áá ááá, WebGL-ášáá¡áá«ááááááááá."> +<!ENTITY torbutton.prefs.sec_caption "á£á¡áá€á áá®ááááá¡ áááá"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "á£á¡áá€á áá®ááááá¡ áá¡áá á©ááá á ááá, á¡áášá£áááááá¡ ááá«áááá ááááášáá áá áá£ááá áá¡ ášáá¡áá«áááááááááá¡ ááá¬ááá, á£ááááá ááá ášááŠá¬áááá¡ ááªááááááááá¡ááá á£ááá áááááá¡ááªáááá."> +<!ENTITY torbutton.prefs.sec_standard_label "á©ááá£áááá ááá"> +<!ENTITY torbutton.prefs.sec_standard_description "Tor-áá áá£ááá áá¡á áá áááá¡ááá¢áá¡ á§áááá ášáá¡áá«ááááááá á©áá áá£ááá."> +<!ENTITY torbutton.prefs.sec_safer_label "ááá¢áá áááªá£áá"> +<!ENTITY torbutton.prefs.sec_safer_description "áááááášááá áááá¡ááá¢áá¡ á¡áá€á áá®áá¡ášáááªáááá ášáá¡áá«ááááááááá, á¡áááá áá£ááá á¡ááá¢áááá¡ ááá¬ááá ááá ááá£ášááááá¡ ááááá áá£ááá."> +<!ENTITY torbutton.prefs.sec_safer_list_label "ááá¢áá áááªá£áá ááá áááá¢á áááá¡áá¡:"> +<!ENTITY torbutton.prefs.sec_safest_label "á¡á á£áááá áááªá£áá"> +<!ENTITY torbutton.prefs.sec_safest_description "ááášáááá£ááá áá®áááá áá¡ ášáá¡áá«ááááááááá, á áááááá¡ááª á¡áááá áááá¡ á£áªááááá ášáááááá¡áá¡ áá¥ááá á¡ááá¢ááá áá á«áá ááááá áááá¡áá®á£á ááááá. áªááááááááá ášááá®ááá á¡á£á ááááá¡, á€áááááá¡á áá á¡áá ááá¢ááá¡."> +<!ENTITY torbutton.prefs.sec_safest_list_label "á¡á á£áááá áááªá£áá ááá áááá¢á áááá¡áá¡:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "áá®áááá áá áªááá"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript ááááášá£ááá HTTPS-á¡ áá áá¥ááá á§áááá á¡ááá¢áá."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript ááááášá£ááá á§áááá á¡ááá¢áá áááá£ááá¡á®ááááá."> +<!ENTITY torbutton.prefs.sec_limit_typography "ášá áá€á¢áááá¡á áá ááááááá¢ááá£á á á¡áááááááááá¡ ááá¬ááá ááááášá£ááá."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ášá áá€á¢áááá¡, á®áá¢á£ááááá¡, ááááááá¢ááá£á á á¡áááááááááá¡á áá á¡á£á áááááá¡ ááá¬ááá ááááášá£ááá."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "á®áááááá áá áááááá€áááááá (HTML5) áášáááá áá®áááá ááá¬ááááááá."> +<!ENTITY torbutton.circuit_display.title "Tor-á¬á ááá"> +<!ENTITY torbutton.circuit_display.new_circuit "áá®ááá á¬á ááá áá á¡ááá¢áá¡áááá¡"> diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index ee5b1f95..21d96e32 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -1,27 +1,55 @@ -torbutton.panel.tooltip.disabled = Click to enable Tor -torbutton.panel.tooltip.enabled = Click to disable Tor -torbutton.panel.label.disabled = Tor Disabled -torbutton.panel.label.enabled = Tor Enabled -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = Load external content? -torbutton.popup.external.app = An external application is needed to handle:\n\n -torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n -torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n -torbutton.popup.launch = Launch application -torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.title.prompt_torbrowser = Important Torbutton Information +torbutton.circuit_display.internet = ááá¢áá ááá¢á +torbutton.circuit_display.ip_unknown = á£áªáááá IP-ááá¡áááá áá +torbutton.circuit_display.onion_site = Onion-á¡ááá¢á +torbutton.circuit_display.this_browser = áá¡ áá áá£ááá á +torbutton.circuit_display.relay = ááááááªááá +torbutton.circuit_display.tor_bridge = á®ááá +torbutton.circuit_display.unknown_country = á£áªáááá á¥ááá§ááá +torbutton.circuit_display.guard = ááªáááá +torbutton.circuit_display.guard_note = áá¥áááá [Guard] ááááá«á ášáá¡áá«ááá áá ášáááªááááá¡. +torbutton.circuit_display.learn_more = áá®áááá áá áªááá +torbutton.content_sizer.margin_tooltip = Tor-áá áá£ááá á áááá¢ááá¡ áááááá ááá¡ áááááááá, á áá áá¥áááá á€ááá¯á áá¡ á¡ááááá áá á¡ááááŠáá áááááááá ááááá á©áá£áá áá ášáá¡ááá©áááá áá§áá¡, á ááª ášáá£ááªáá ááá¡ á¡á®áááá¡, ááá¢áá ááá¢ášá áá¥áááá áááááá¡ ášáá¡áá«ááááááááá¡. +torbutton.panel.tooltip.disabled = áááááááá Tor-áá¡ á©áá¡áá ááááá +torbutton.panel.tooltip.enabled = áááááááá Tor-áá¡ ááááá¡áá ááááá +torbutton.panel.label.disabled = Tor ááááá áá£ááá +torbutton.panel.label.enabled = Tor á©áá áá£ááá +extensions.torbutton(a)torproject.org.description = Torbutton á¡áášá£áááááá¡ ááá«áááá áá áá áŠáááááá ááááá ááá Tor-áá¡ ááá áááá¢á ááá áá á¡á¬á áá€áá áááá¡á£á€ááááá ááááá®á£áááá£áá áááá ááááá¡ áááááªááááá. +torbutton.popup.external.title = á©ááááá¢ááá ááá¡ áªááááá£áá á¡áá®áá¡ á€áááá? +torbutton.popup.external.app = Tor-áá áá£ááá áá ááá á®áá á®áááá áá á€ááááá¡ ááá®á¡áá. á¡á®áá áá ááá áááá á¡áááá á ááá¡ ááá¡áá®á¡ááááá.\n\n +torbutton.popup.external.note = áááááá áá á¡áá®áá¡ á€ááááá, ášáá¡áá«ááá Tor-áá¡ áááá ááá¡ ááááá ááááááášáá áá¡ á¡á®áá áá ááá ááá ááá¢áá ááá¢ááá.\n +torbutton.popup.external.suggest = á£á¡áá€á áá®ááááá¡áááá¡, á¡áá¡á£á ááááá á©áááá¢ááá áá£áá á€ááááá¡ ááá®á¡áá, áááášáá ááá áášáá á§áá€ááá¡áá¡ áá Tor-áá¡ ááá ááááá ááá¡áášáááá ááá á¡ááá¡ ááááá§ááááá, á áááá ááªáá Tails.\n +torbutton.popup.launch = á©áááá¢ááá ááá +torbutton.popup.cancel = ááá£á¥áááá +torbutton.popup.dontask = ááá¢áááá¢á£á áá á©ááááá¢ááá ááá¡ á€áááááá ááááá áááá +torbutton.popup.no_newnym = Torbutton ááá áá®áá á®ááá¡ áá®ááá áááááááá¡ á£á¡áá€á áá®áá ááááááááá¡. á¬ááááá áá áá¥áá¡ á¬ááááá Tor-áá¡ ááá áááá¡ ááá á¢ááá.\n\nAre you running Tor Browser Bundle? +torbutton.security_settings.menu.title = á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá +torbutton.title.prompt_torbrowser = áááášááááááááá ááá€áá áááªáá Torbutton-áá¡ ášáá¡áá®áá torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.confirm_plugins = áááá£áááá¡, á áááá ááªáá Flash ášáá£á«ááá á¡áá€á áá®áá¡ á¥áááš áááá§áááá¡ áá¥áááá ááá ááá áááááªááááá áá áááááááá¡ ááá£áá®ááááá.\n\náááá á¡áášá£áááááá, ášáá¡áá«ááááááá Tor-áá¡ áááá ááá¡ ááááá ááááááááá¡ áá¥áááá áááááá áááá áá IP-ááá¡áááá áá.\n\nááááááááá áá¡á£á á áááá£ááááá¡ á©áá ááá?\n\n +torbutton.popup.never_ask_again = áááááááášá ášááááá®ááá¡ ááá áášá +torbutton.popup.confirm_newnym = Tor-áá áá£ááá á ááá®á£á ááá¡ á§áááá á€ááá¯áá áá¡á áá á©áááá áá¡. á§áááá áááá¡ááá¢áá¡ á¡áááá¡á ášáá¬á§áááá.\n\náááášááá¡ á®áááá®áá Tor-áá áá£ááá á áá®ááá áááááááá¡ ááá¡ááŠáááá?\n\n + +torbutton.maximize_warning = Tor-áá áá£ááá áá¡ á¡á á£á ááá áááá ááášáá, á¡ááá¢ááá¡ á¡áášá£áááááá¡ ááá¡áªááá¡ ááááááááá áá¥áááá ááá áááá¡ áááááá, á ááª ášááá«áááá áááááá§áááá áá¥áááá¡ áááá¡ááªááááá. á©ááá ááá á©ááá ááá¢áááá Tor-áá áá£ááá áá¡ á€ááá¯áá á, áá á¡ááá£á áááááášá. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future -canvas.allowAccessKey=A -canvas.never=Never for This Site -canvas.neverAccessKey=e +canvas.siteprompt=áááá¡ááá¢á (%S) áªáááááá¡ HTML5-áá¡ áá áá€ááá£áá ááááá¡áá®á£ááááá¡ áááááªáááááá¡ áááŠáááá¡, á ááª ášáá¡áá«ááá ááááá§ááááá£áá áá§áá¡ áá¥áááá áááááá£á¢áá áá¡ áááá¡ááªááááá.\n\nááá¡áªáá¡ Tor-áá áá£ááá áá á£á€áááá áá áááá¡ááá¢á¡, ááááŠáá¡ HTML5-áá¡ áá áá€ááá£áá ááááá¡áá®á£ááááá¡ áááááªááááá? +canvas.notNow=áá®áá áá á +canvas.notNowAccessKey=á +canvas.allow=ááášáááá áááááááášá +canvas.allowAccessKey=á +canvas.never=áá áá¡áá áá¡ áá á¡ááá¢áá (á¡áá¡á£á ááááá) +canvas.neverAccessKey=á + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S áá áá€áááá¡ á®áá áááá +profileReadOnly=áá¥ááá ááá ášáá«áááá ááá£ášááá %S áá®áááá á¬ááááá®ááá¡ ášáá¡áá«áááááááá¡ áá¥ááá á¡áá€áááá á¡áá¡á¢áááááá. ááá®ááá, áááááááááá áá %S á¡á®áá ááááááá, ááááá§áááááááá. +profileReadOnlyMac=áá¥ááá ááá ášáá«áááá ááá£ášááá %S áá®áááá á¬ááááá®ááá¡ ášáá¡áá«áááááááá¡ áá¥ááá á¡áá€áááá á¡áá¡á¢áááááá. ááá®ááá, áááááááááá áá %S áá¥áááá¡ áááááá ááá áááá¡ áá áá ááá áááááá¡ á¡áá¥ááŠááááášá, ááá¡ ááááá§áááááááá. +profileAccessDenied=%S-á¡ áá áááá©ááá áá áá€ááááá á¬áááááá¡ ááááá ááá. ááá®ááá, á¡áááááááá ááááá ááá áá¥áááá á¡áá€áááá á¡áá¡á¢áááá¡ ááááá ááááá áá á¡áªáááá á®áááá®áá. +profileMigrationFailed=áá¥áááá áá á¡ááá£áá %S áá áá€áááá¡ ááááá¢ááá ááá ááá®áá á®áá.\nááááá§ááááá£áá áá¥áááá áá®ááá ááá áááá¢á ááá. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=áááášáá á ááášáá€á á£ááá (Onion-áááá¡áá®á£á ááá, %1$S, %2$S ááá¢áááá ááá¡ááŠááááá, %3$S) +pageInfo_OnionEncryption=áááášáá á ááášáá€á á£ááá (Onion-áááá¡áá®á£á ááá)

1 0

[torbutton/master] Revert "Revert "Bug 28082: Add locales cs, el, hu, ka""
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit b9d1a5a7f2808f533d32ffab11ad7ddb566888ec Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 25 11:19:21 2018 +0000 Revert "Revert "Bug 28082: Add locales cs, el, hu, ka"" This reverts commit 8f1ff9017e9f793156d1edce38dde8cfcf590b2b. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index d13f8259..8f562208 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Update translations
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit a62f5e98572d2dd6bcc5d7310dfbb431bcd6fec7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 09:44:57 2018 +0000 Update translations --- src/chrome/locale/fr/aboutTor.dtd | 20 +++++++++---------- src/chrome/locale/he/browserOnboarding.properties | 2 +- src/chrome/locale/ru/aboutTor.dtd | 2 +- src/chrome/locale/ru/browserOnboarding.properties | 2 +- src/chrome/locale/vi/aboutTor.dtd | 24 +++++++++++------------ src/chrome/locale/zh-TW/aboutTor.dtd | 16 +++++++-------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 52c4d062..f373d753 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force"> -<!ENTITY aboutTor.donationBanner.line2a "L’anonymat adore la compagnie"> -<!ENTITY aboutTor.donationBanner.line2b "Améliorer les droits de la personne."> -<!ENTITY aboutTor.donationBanner.line2c "Se lever pour la liberté."> -<!ENTITY aboutTor.donationBanner.line2d "Protéger la confidentialité de millions de personnes."> -<!ENTITY aboutTor.donationBanner.line2e "Garder Tor robuste."> -<!ENTITY aboutTor.donationBanner.line2f "On a besoin de votre soutien !"> +<!ENTITY aboutTor.donationBanner.line2a "L’anonymat est contagieux."> +<!ENTITY aboutTor.donationBanner.line2b "Promouvoir les droits universels de la personne."> +<!ENTITY aboutTor.donationBanner.line2c "Défendre la liberté."> +<!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes."> +<!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !"> -<!ENTITY aboutTor.donationBanner.line3 "Donnez aujourd'hui, et Mozilla recevra votre donation."> +<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> -<!ENTITY aboutTor.donationBanner.buttonA "Donnez dès maintenant"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi"> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index 8865f0c8..13cb89ab 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=ראה שאלות נפוצות onboarding.tour-tor-onion-services=שירותי בצל onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן. -onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספק הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. +onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספקים הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. onboarding.tour-tor-onion-services.button=בקר בבצל # Circuit Display onboarding. diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 30da9663..879d708e 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -39,4 +39,4 @@ <!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "Посчитайте"> diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties index 1833487f..4e8e4a4a 100644 --- a/src/chrome/locale/ru/browserOnboarding.properties +++ b/src/chrome/locale/ru/browserOnboarding.properties @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=Для каждого посещ onboarding.tour-tor-circuit-display.button=Ваш цикл onboarding.tour-tor-security=Безопасность -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Выберете свой опыт. onboarding.tour-tor-security.description=Мы также предоставляем вам дополнительные настройки для повышения безопасности вашего браузера. Наши Параметры Безопасности позволяют блокировать элементы, которые могут быть использованы для атаки вашего компьютера. Нажмите ниже, чтобы посмотреть, что делают разные функции. onboarding.tour-tor-security.button=Настройки Просмотра diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index b087f9ea..820d92c9 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> -<!ENTITY aboutTor.ready.label "Khám phá. Riêng tư."> +<!ENTITY aboutTor.ready.label "Truy cập Internet. Một cách riêng tư."> <!ENTITY aboutTor.ready2.label "Bạn đã sẵn sàng cho trải nghiệm duyệt web riêng tư nhất trên thế giới."> <!ENTITY aboutTor.failure.label "Có Lỗi Xảy Ra!"> <!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> @@ -15,28 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Những câu hỏi?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn Trình duyệt Tor »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn sử dụng trình duyệt Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn Trình duyệt Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn sử dụng trình duyệt Tor"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận US 501(c)(3) của Hoa Kỳ thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ bảo mật và ẩn danh miễn phí và mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng và nâng cao hiểu biết khoa học và phổ biến của họ."> +<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận 501(c)(3) của Hoa Kỳ nhằm thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ đảm bảo quyền riêng tư và ẩn danh miễn phí và dựa trên mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng, và giúp phổ biến hơn nữa sự hiểu biết về tính khoa học của những công nghệ này đối với cộng đồng."> <!ENTITY aboutTor.getInvolved.label "Tham gia »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mói nhất từ Tor vào hộp thư của bạn."> +<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Sức mạnh nằm ở Số lượng người tham gia mạng lưới"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Nâng cao nhân quyền phổ thông."> +<!ENTITY aboutTor.donationBanner.line2a "Việc ẩn danh cần sự đồng hành của cộng đồng"> +<!ENTITY aboutTor.donationBanner.line2b "Nâng cao phổ biến nhân quyền."> <!ENTITY aboutTor.donationBanner.line2c "Đứng lên vì tự do."> <!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người."> <!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> -<!ENTITY aboutTor.donationBanner.line2f "Chúng toi cần sự hỗ trợ của bạn!"> +<!ENTITY aboutTor.donationBanner.line2f "Chúng tôi cần sự hỗ trợ của bạn!"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Ngay bây giờ"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> +<!ENTITY aboutTor.donationBanner.buttonB "Hãy cho tôi tham gia"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index b08ffa26..a679ed55 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -4,14 +4,14 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "關於洋蔥路由"> +<!ENTITY aboutTor.title "關於 Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "探索。隱密。"> <!ENTITY aboutTor.ready2.label "您已準備好使用全世界最私密的瀏覽體驗。"> <!ENTITY aboutTor.failure.label "發生錯誤！"> -<!ENTITY aboutTor.failure2.label "洋蔥路由無法在此瀏覽器中運作。"> +<!ENTITY aboutTor.failure2.label "Tor 無法在此瀏覽器中運作。"> -<!ENTITY aboutTor.search.label "用 DuckDuckGo 搜尋"> +<!ENTITY aboutTor.search.label "使用 DuckDuckGo 搜尋"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "有什麼問題？"> @@ -25,7 +25,7 @@ <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> <!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> @@ -34,9 +34,9 @@ <!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支持"> +<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支援！"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "今日您捐款，Mozilla 也會捐出相同數額。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "我也要加入！">

1 0

[tor-browser-build/master] Bug 26697: Add Android toolchain
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit 10c58d9a2f9fc37f7ba3e1b7028d2b5a730b1e6f Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Sep 27 20:44:56 2018 -0700 Bug 26697: Add Android toolchain --- projects/android-toolchain/build | 43 +++++++++++++++++++++++++++++++++++++++ projects/android-toolchain/config | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build new file mode 100644 index 0000000..325a543 --- /dev/null +++ b/projects/android-toolchain/build @@ -0,0 +1,43 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +export PROJECT_PATH=/var/tmp/dist/[% project %] +export SDK_HOME=$PROJECT_PATH/android-sdk-linux +export NDK_HOME=$PROJECT_PATH/android-ndk +export GRADLE_HOME=$PROJECT_PATH/gradle + +#Make directories +mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME + +# Compiler Archives +unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME +unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME + +# NDK Archive +cd $NDK_HOME +mv android-ndk-r15c/* . +rm -fR android-ndk-r15c +./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm + +# Tool Archives +cd $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME +mkdir -p build-tools/26.0.2 +mv android-8.1.0/* build-tools/26.0.2 + +unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME +mkdir -p platforms/android-26 +mv android-8.0.0/* platforms/android-26 + +unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME + +# Cleanup +rm -fR android-8.1.0 +rm -fR android-8.0.0 + +# Archive dist directory +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config new file mode 100644 index 0000000..122ae5f --- /dev/null +++ b/projects/android-toolchain/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: 26.0.2 +var: + container: + use_container: 1 + deps: + - unzip + - python + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] + export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + google_repo: https://dl.google.com/android/repository +input_files: + - project: container-image + - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip' + name: build_tools_26 + sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce + - URL: '[% c("var/google_repo") %]/platform-26_r02.zip' + name: platform_26 + sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a + - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip' + name: platform_tools_26 + sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519 + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + name: android_sdk_tools + sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 + - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip' + name: android_ndk_compiler + sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c + - URL: http://services.gradle.org/distributions/gradle-4.1-bin.zip + name: gradle_bin + sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43

1 0

[tor-launcher/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 670882ad2936a906f3e2d84230714446e98a214c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:50:09 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit 3aa20983122b4aaed6ae77cfc5bdb48107aa33a4. --- src/chrome/content/network-settings.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 1599c28..aaa91ac 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,21 +306,17 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", - "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", - "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", - "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", - "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 8f1ff9017e9f793156d1edce38dde8cfcf590b2b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:49:40 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit c94a5589ffeabf71ea95c3c5c1a3396bdbe14da5. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 8f562208..d13f8259 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[tor-browser-build/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 6803d9a8a4e7c851629cab47342a6579a60f64cd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:48:35 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit fbb72c65a24ac70619062ebcd16c67a9afb4feae. --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 5e981ac..23f3598 100644 --- a/rbm.conf +++ b/rbm.conf @@ -53,21 +53,17 @@ var: locales: - ar - ca - - cs - da - de - - el - es-ES - fa - fr - ga-IE - he - - hu - id - is - it - '[% c("var/locale_ja") %]' - - ka - ko - nb-NO - nl

1 0

[tor-browser-build/master] Bug 26696: Add definition for new platform in rbm.conf
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 51aae94ab13e575ddbcba0cff4dbb9c69c4a612e Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Sep 24 20:37:18 2018 -0700 Bug 26696: Add definition for new platform in rbm.conf --- rbm.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/rbm.conf b/rbm.conf index 7f5dfa4..5e981ac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -141,6 +141,27 @@ targets: # Don't create mar files to save time build_mar: 0 + torbrowser-android-armv7: + - android-armv7 + android-armv7: + arch: armv7 + var: + android: 1 + osname: android-armv7 + compiler: android-toolchain + snowflake: 0 + fteproxy: 0 + container: + suite: stretch + arch: amd64 + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Bug 27441: Add support for stretch in debootstrap-image
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 5cd65aaa478a41bd8c98a5405a5bf5b82256ca67 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Sep 25 10:32:39 2018 -0700 Bug 27441: Add support for stretch in debootstrap-image --- projects/debootstrap-image/config | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 10e2afe..5ee8c9a 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 16.04.3 + ubuntu_version: 18.04.1 container: use_container: 1 @@ -44,9 +44,13 @@ targets: container: suite: buster arch: amd64 + stretch-amd64: + var: + container: + suite: stretch + arch: amd64 input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2 - + sha256sum: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12

1 0

[tor-browser-build/master] Backout patch for #27827 for Linux build bustage
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 2b270ede9341f8ce496e811f7af9077e3eed9049 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 10:58:24 2018 +0000 Backout patch for #27827 for Linux build bustage --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3b699d5..38b0b9a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,7 +21,6 @@ Tor Browser 8.5a4 -- October 23 2018 * Bug 28002: Fix the precomplete file in the en-US installer * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 27827: Fix snowflake reproducibility issues * Bug 26475: Fix Stylo related reproducibilitiy issue * Linux * Bug 26475: Fix Stylo related reproducibilitiy issue diff --git a/rbm.conf b/rbm.conf index b68c80a..7f5dfa4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a3 project_name: tor-browser

1 0

[tor-browser-build/master] Revert "Merge remote-tracking branch 'dcf/bug_27827'"
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 4ae6ba4f9d62113a818e706f63a8c3fb9c011e06 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 10:55:55 2018 +0000 Revert "Merge remote-tracking branch 'dcf/bug_27827'" This reverts commit 889be4318d80f11f2b5b2b845ab11868149c48f1, reversing changes made to d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a. The patch for bug 27827 leads to a busted Linux build. --- projects/go/config | 4 ++-- projects/snowflake/build | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1841705..2a3b1ad 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.1 +version: 1.8.3 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 + sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/snowflake/build b/projects/snowflake/build index a66a1e9..f3616f4 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -30,13 +30,32 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - # The -tmpdir flag overrides what would otherwise be a randomly generated - # path, /tmp/go-link-RANDOMNUM/go.o. - mkdir -p /var/tmp/go-link.tmpdir - [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' + [% c("var/faketime") %] go build -ldflags '-s' [% ELSE -%] go build -ldflags '-s' [% END -%] +[% IF c("var/osx") -%] + # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 + # on Darwin embeds such paths and the issue is unsolved in upstream Go as of + # 2016-06-28: + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + # The two kinds of paths are ("000000000" stands for 9 random digits): + # /tmp/go-build000000000 + # /tmp/go-link-000000000 + # Such paths are the output of ioutil.TempDir("", "go-build") and + # ioutil.TempDir("", "go-link-"). + cp -a client client.stomped + sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped + # Sanity check: make sure the file actually changed. If it did not, it could + # mean that a change in go or clang has made this step unnecessary. + if cmp client client.stomped + then + echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." + echo "Check projects/snowflake/build" + exit 1 + fi + mv -f client.stomped client +[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Clarify Changelog entry
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 24e8b221333bbbbf6667a5132b195a05ff66935a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:57:44 2018 +0000 Clarify Changelog entry --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 991d020..3b699d5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -30,7 +30,7 @@ Tor Browser 8.5a4 -- October 23 2018 * Backport of fixes for bug 1448014, 1458905, 1441345, and 1448305 * Build System * All Platforms - * Bug 27218: Generate multiple bundles in parallel + * Bug 27218: Generate multiple Tor Browser bundles in parallel * Windows * Bug 27320: Build certutil for Windows * OS X

1 0

[tor-browser-build/master] Release preparations for 8.5a4
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit cdf8ea8c1dffc3d0fd00361bc357ce33bc7b55cb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:51:37 2018 +0000 Release preparations for 8.5a4 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 38 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 +-- 8 files changed, 47 insertions(+), 9 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index d79eec3..dfdf2c4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.1 + firefox_platform_version: 60.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 03edcee..e189eb9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.8.22 +version: 2018.9.19 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 54ebd96..991d020 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,41 @@ +Tor Browser 8.5a4 -- October 23 2018 + * All Platforms + * Update Firefox to 60.3.0esr + * Update Tor to 0.3.5.3-alpha + * Update Torbutton to 2.1.1 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 28082: Add locales cs, el, hu, ka + * Translations update + * Update Tor Launcher to 0.2.17 + * Bug 27994+25151: Use the new Tor Browser logo + * Bug 28082: Add locales cs, el, hu, ka + * Translations update + * Update HTTPS Everywhere to 2018.9.19 + * Update NoScript to 10.1.9.9 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 27905: Fix many occurrences of "Firefox" in about:preferences + * Bug 28082: Add locales cs, el, hu, ka + * Windows + * Bug 21704: Abort install if CPU is missing SSE2 support + * Bug 28002: Fix the precomplete file in the en-US installer + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 27827: Fix snowflake reproducibility issues + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Linux + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 28022: Use `/usr/bin/env bash` for bash invocation + * Android + * Backport of fixes for bug 1448014, 1458905, 1441345, and 1448305 + * Build System + * All Platforms + * Bug 27218: Generate multiple bundles in parallel + * Windows + * Bug 27320: Build certutil for Windows + * OS X + * Bug 27320: Build certutil for macOS + Tor Browser 8.5a3 -- October 4 2018 * All platforms * Update Firefox to 60.2.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7b44d8f..bb1c259 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 + sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 9e00653..ff5b387 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.5 +version: 0.2.17 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index cc7811b..bb743ca 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.2-alpha +version: 0.3.5.3-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index a698691..b4d50be 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1 +version: 2.1.1 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 13aec99..b68c80a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a3' + torbrowser_version: '8.5a4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a2 + - 8.5a3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Version bump (0.2.17)
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit a34b539f6d9cd3b8d043b6f65c37175deaca312f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:41:23 2018 +0000 Version bump (0.2.17) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a5d027e..1ee7a87 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.16.5</em:version> + <em:version>0.2.17</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 2ce44eb159ae8f288f897f80d4263baa687a98d8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:40:26 2018 +0000 Translations update --- src/chrome/locale/bn/network-settings.dtd | 88 +++++++++---------- src/chrome/locale/bn/torlauncher.properties | 116 ++++++++++++------------- src/chrome/locale/cs/network-settings.dtd | 52 +++++------ src/chrome/locale/cs/torlauncher.properties | 90 +++++++++---------- src/chrome/locale/da/network-settings.dtd | 4 +- src/chrome/locale/de/network-settings.dtd | 8 +- src/chrome/locale/de/torlauncher.properties | 8 +- src/chrome/locale/el/network-settings.dtd | 14 +-- src/chrome/locale/el/torlauncher.properties | 30 +++---- src/chrome/locale/es-AR/torlauncher.properties | 52 +++++------ src/chrome/locale/fa/network-settings.dtd | 30 +++---- src/chrome/locale/he/network-settings.dtd | 6 +- src/chrome/locale/he/torlauncher.properties | 4 +- src/chrome/locale/is/network-settings.dtd | 10 +-- src/chrome/locale/is/torlauncher.properties | 18 ++-- src/chrome/locale/ka/network-settings.dtd | 30 +++---- src/chrome/locale/ka/torlauncher.properties | 94 ++++++++++---------- src/chrome/locale/nl/torlauncher.properties | 12 +-- src/chrome/locale/zh-TW/network-settings.dtd | 6 +- 19 files changed, 336 insertions(+), 336 deletions(-) diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 8ba1fd3..99ab804 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "টর নেটওয়ার্ক সেটিংস"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.default "টর সাথে সংযোগ স্থাপন করুন"> +<!ENTITY torsettings.wizard.title.configure "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.connecting "একটি সংযোগ স্থাপন">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "টর ব্রাউজার ভাষা"> +<!ENTITY torlauncher.localePicker.prompt "দয়া করে একটি ভাষা নির্বাচন করুন">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "সংযোগ করুন"> +<!ENTITY torSettings.connectPrompt "টর সাথে সংযোগ করতে "সংযোগ করুন" ক্লিক করুন"> +<!ENTITY torSettings.configurePrompt "আপনি এমন একটি দেশে থাকলে নেটওয়ার্ক সেটিংস সংশোধন করতে "কনফিগার করুন" ক্লিক করুন যা টরকে সেন্সর করে (যেমনঃ মিশর, চীন, তুরস্ক) অথবা যদি আপনি একটি প্রাইভেট নেটওয়ার্ক থেকে সংযোগ করেন যা প্রক্সি প্রয়োজন।"> +<!ENTITY torSettings.configure "কনফিগার করুন"> +<!ENTITY torSettings.connect "সংযোগ করা">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "টর শুরু করার জন্য অপেক্ষা করছে ..."> +<!ENTITY torsettings.restartTor "টর্চ পুনরায় চালু করুন"> +<!ENTITY torsettings.reconfigTor "পুনরায় কনফিগার করুন"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "আপনি টর ব্রিজগুলি কনফিগার করেছেন বা আপনি স্থানীয় প্রক্সি সেটিংস এ প্রবেশ করেছেন।  টর নেটওয়ার্কের সাথে সরাসরি সংযোগ স্থাপনের জন্য, এই সেটিংস মুছে ফেলা আবশ্যক।"> +<!ENTITY torsettings.discardSettings.proceed "সেটিংস সরান এবং সংযুক্ত করুন"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "ঐচ্ছিক"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "পোর্ট:"> +<!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি"> +<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:"> +<!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন"> +<!ENTITY torsettings.useProxy.address "ঠিকানা:"> +<!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম"> +<!ENTITY torsettings.useProxy.port "পোর্টঃ"> <!ENTITY torsettings.useProxy.username "ব্যবহারকারী নাম:"> <!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "দাখিল করা"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.firewall.checkbox "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়"> +<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:"> +<!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> +<!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> +<!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org থেকে একটি সেতুর জন্য অনুরোধ করুন"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "ইমেজ থেকে অক্ষর লিখুন"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "একটি নতুন চ্যালেঞ্জ পান"> +<!ENTITY torsettings.useBridges.captchaSubmit "জমা করুন"> +<!ENTITY torsettings.useBridges.custom "একটি ব্রিজ প্রদান আমি জানি"> +<!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।"> +<!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)"> + +<!ENTITY torsettings.copyLog "ক্লিপবোর্ডে কপি টর লগ করুন"> + +<!ENTITY torsettings.proxyHelpTitle "প্রক্সি সাহায্য"> +<!ENTITY torsettings.proxyHelp1 "একটি প্রতিষ্ঠান, স্কুল বা বিশ্ববিদ্যালয়ের নেটওয়ার্কের মাধ্যমে সংযোগ করার সময় স্থানীয় প্রক্সির প্রয়োজন হতে পারে । #160; যদি আপনি নিশ্চিত না হন যে কোন প্রক্সি প্রয়োজন কিনা, অন্য ব্রাউজারে ইন্টারনেট সেটিংসের দিকে তাকান অথবা আপনার সিস্টেম এর নেটওয়ার্ক সেটিংস চেক করুন."> + +<!ENTITY torsettings.bridgeHelpTitle "ব্রিজ রিলে সহায়তা"> +<!ENTITY torsettings.bridgeHelp1 "ব্রিজগুলি তালিকাভুক্ত নয় এমন রিলে যা টর নেটওয়ার্ক সংযোগ বন্ধ করে আরও কঠিন করে তোলে।   সেন্সরশিপ এড়ানোর জন্য প্রতিটি ধরনের সেতু একটি ভিন্ন পদ্ধতি ব্যবহার করে।   Obfs আপনার ট্র্যাফিক র্যান্ডম শব্দ মত চেহারা, এবং নিছক টাওয়ার ট্র্যাফিক চেহারা মত এটি টর পরিবর্তে যে পরিষেবা সংযোগ করা হয়।"> +<!ENTITY torsettings.bridgeHelp2 "কিছু দেশ টোরকে বাধা দেওয়ার চেষ্টা করে কেন, কিছু কিছু ব্রিজ নির্দিষ্ট দেশে কাজ করে কিন্তু অন্যদের নয়।   আপনার দেশে কোন ব্রিজগুলি কাজ করে তা যদি আপনি অনিশ্চিত থাকেন, তাহলে torproject.org/about/contact.html#support দেখুন">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।   এই কয়েক মিনিট সময় নিতে পারে."> diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index cc1fdd5..ad26572 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -1,78 +1,78 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=টর লঞ্চার -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=টর্চ প্রারম্ভকালে exited। এটি আপনার torrc ফাইলের ত্রুটির কারণে, টর বা আপনার সিস্টেমে অন্য প্রোগ্রামের একটি বাগ বা ত্রুটির হার্ডওয়্যারগুলির কারণে হতে পারে। যতক্ষন না আপনি অন্তর্নিহিত সমস্যাটি সমাধান করেন এবং টর পুনরায় চালু করুন, টর ব্রাউজারটি শুরু হবে না। torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=টর রিস্টার্ট করলে আপনার ব্রাউজার ট্যাব বন্ধ হবে না। torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=টর শুরু হতে ব্যর্থ হয়েছে -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=টর নেটওয়ার্ক সংযোগ সৃষ্টি করতে হতে ব্যর্থ হয়েছে। -torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ হয়েছে (%2$S). +torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_control_failed=টর্চ নিয়ন্ত্রণ নিতে ব্যর্থ হয়েছে +torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ (%2$S)। -torlauncher.unable_to_start_tor=টর শুরু করা সম্ভব নয়।\n\n%S -torlauncher.tor_missing= Tor executable নথিটি পাওয়া যাচ্ছে না। -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=টর শুরু করতে অক্ষম %S +torlauncher.tor_missing=টর্ক এক্সিকিউটেবল মিস করা হয়। +torlauncher.torrc_missing=Torrc ফাইলটি অনুপস্থিত এবং তৈরি করা যায়নি। +torlauncher.datadir_missing=টর ডেটা ডিরেক্টরিটি বিদ্যমান নয় এবং তৈরি করা যাবে না। +torlauncher.password_hash_missing=হ্যাশড পাসওয়ার্ড পেতে ব্যর্থ। -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=টর সেটিংস পুনরুদ্ধার করতে অক্ষম। %S +torlauncher.failed_to_save_settings=টর সেটিংস সংরক্ষণ করতে অক্ষম %S +torlauncher.ensure_tor_is_running=টর চলছে তা নিশ্চিত করুন। -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=আপনি ইন্টারনেট অ্যাক্সেস করার জন্য প্রক্সি ব্যবহার করার জন্য টরকে কনফিগার করার জন্য অবশ্যই একটি IP ঠিকানা বা হোস্টনাম এবং একটি পোর্ট নম্বর উল্লেখ করতে হবে। +torlauncher.error_proxy_type_missing=আপনাকে প্রক্সি টাইপ নির্বাচন করতে হবে। +torlauncher.error_bridges_missing=আপনাকে অবশ্যই এক বা একাধিক ব্রিজগুলি নির্দিষ্ট করতে হবে। +torlauncher.error_default_bridges_type_missing=সরবরাহকৃত ব্রিজের জন্য আপনাকে অবশ্যই একটি পরিবহন প্রকার নির্বাচন করতে হবে। +torlauncher.error_bridgedb_bridges_missing=একটি ব্রিজ অনুরোধ করুন +torlauncher.error_bridge_bad_default_type=কোনও ব্রিজ নেই যেটি ট্রান্সপোর্ট টাইপ% S আছে। আপনার সেটিংস সামঞ্জস্য করুন দয়া করে। -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(চীন মধ্যে কাজ করে) +torlauncher.bridge_suffix.meek-azure=(চীন মধ্যে কাজ করে) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=ব্রিজ অনুরোধ করুন........ +torlauncher.request_a_new_bridge=একটি নতুন ব্রিজ অনুরোধ করুন +torlauncher.contacting_bridgedb=ব্রিজডিবি এ যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন. +torlauncher.captcha_prompt=একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।... +torlauncher.bad_captcha_solution=সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন. +torlauncher.unable_to_get_bridge=BridgeDB থেকে একটি ব্রিজ প্রাপ্ত করতে অক্ষম। +torlauncher.no_meek=এই ব্রাউজারটি meek এর জন্য কনফিগার করা হয় নি, যা ব্রিজ প্রাপ্ত করার প্রয়োজন হয়। +torlauncher.no_bridges_available=এই সময়ে কোন ব্রিজ নেই। দুঃখিত। -torlauncher.connect=সংযোগ করুন -torlauncher.restart_tor=Restart Tor -torlauncher.quit=বেরিয়ে যান +torlauncher.connect=সংযোগ করা +torlauncher.restart_tor=টর্চ পুনরায় চালু করুন +torlauncher.quit=অব্যাহতিপ্রাপ্ত torlauncher.quit_win=বেরিয়ে যান torlauncher.done=সমাপ্ত -torlauncher.forAssistance=সাহায্যের জন্য , যোগাযোগ করুনঃ %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=সহায়তার জন্য, যোগাযোগ করুন %S +torlauncher.forAssistance2=সহায়তার জন্য, %S এ যান -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত। -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.conn_dir=একটি রিলে ডিরেক্টরি সাথে সংযোগ স্থাপন torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে! +torlauncher.bootstrapStatus.requesting_status=নেটওয়ার্ক স্থিতি পুনরুদ্ধার +torlauncher.bootstrapStatus.loading_status=নেটওয়ার্ক স্থিতি লোড হচ্ছে +torlauncher.bootstrapStatus.loading_keys=কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে +torlauncher.bootstrapStatus.requesting_descriptors=রিলে তথ্য অনুরোধ +torlauncher.bootstrapStatus.loading_descriptors=রিলে তথ্য লোড হচ্ছে +torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কে সংযুক্ত হচ্ছে +torlauncher.bootstrapStatus.handshake_or=একটি টর্ক সার্কিট স্থাপন +torlauncher.bootstrapStatus.done=টর নেটওয়ার্ক সংযুক্ত! -torlauncher.bootstrapWarning.done=সম্পূর্ণ -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=সম্পন্ন +torlauncher.bootstrapWarning.connectrefused=সংযোগ প্রত্যাখ্যাত +torlauncher.bootstrapWarning.misc=বিবিধ +torlauncher.bootstrapWarning.resourcelimit=অপর্যাপ্ত সম্পদ +torlauncher.bootstrapWarning.identity=পরিচয় মেলেনি +torlauncher.bootstrapWarning.timeout=আউট সংযোগ সময় +torlauncher.bootstrapWarning.noroute=কোন রুট হোস্ট করার জন্য +torlauncher.bootstrapWarning.ioerror=পড়া / লিখুন ত্রুটি +torlauncher.bootstrapWarning.pt_missing=অনুপস্থিত প্ল্যাগেবল পরিবহন -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=সার্ভারের সংযোগ হারিয়ে গেছে। +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=সার্ভারের সাথে যুক্ত হতে পারছে না. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=প্রক্সি সাথে সংযোগ করা যায়নি diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 20d4e19..53fc3a1 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -1,38 +1,38 @@ -<!ENTITY torsettings.dialog.title "Síťové nastavení TORu"> -<!ENTITY torsettings.wizard.title.default "Připojit k Toru"> +<!ENTITY torsettings.dialog.title "Síťové nastavení Toru"> +<!ENTITY torsettings.wizard.title.default "Připojení k síti Tor"> <!ENTITY torsettings.wizard.title.configure "Nastavení sítě Tor"> -<!ENTITY torsettings.wizard.title.connecting "Sestavuji spojení"> +<!ENTITY torsettings.wizard.title.connecting "Navazování spojení">  -<!ENTITY torlauncher.localePicker.title "Jazyk Tor Prohlížeče"> -<!ENTITY torlauncher.localePicker.prompt "Prosím zvolte jazyk."> +<!ENTITY torlauncher.localePicker.title "Jazyk prohlížeče Tor"> +<!ENTITY torlauncher.localePicker.prompt "Zvolte prosím jazyk.">  -<!ENTITY torSettings.connectPrompt "Klikněte na „Připojit“ pro připojení k Toru."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfigurovat"> +<!ENTITY torSettings.connectPrompt "Pro připojení k síti Tor klepněte na tlačítko „Připojit“."> +<!ENTITY torSettings.configurePrompt "Pokud jste v zemi, která síť Tor omezuje (např. Egypt, Čína, Turecko), nebo pokud se připojujete ze sítě, která vyžaduje použití proxy, klepněte na tlačítko „Nastavení“ pro úpravu nastavení sítě."> +<!ENTITY torSettings.configure "Nastavení"> <!ENTITY torSettings.connect "Připojit">  -<!ENTITY torsettings.startingTor "Čekání na start TORu"> +<!ENTITY torsettings.startingTor "Čekání na start Toru"> <!ENTITY torsettings.restartTor "Restartovat Tor"> <!ENTITY torsettings.reconfigTor "Přenastavit"> -<!ENTITY torsettings.discardSettings.prompt "Nastavil jste síťový most nebo zadal lokální proxy.  Aby jste se mohl připojit k síti Tor přímo, musíte tato nastavení odstranit."> +<!ENTITY torsettings.discardSettings.prompt "Nastavili jste síťový most nebo lokální proxy.  Pro připojení k síti Tor přímo tato nastavení odstraňte."> <!ENTITY torsettings.discardSettings.proceed "Odstranit nastavení a připojit se"> -<!ENTITY torsettings.optional "Volitelný"> +<!ENTITY torsettings.optional "Volitelné"> <!ENTITY torsettings.useProxy.checkbox "Používám proxy pro připojení k Internetu"> -<!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo název serveru"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Uživatel:"> -<!ENTITY torsettings.useProxy.password "Heslo."> +<!ENTITY torsettings.useProxy.password "Heslo:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> @@ -41,22 +41,22 @@ <!ENTITY torsettings.useBridges.checkbox "Tor je v mé zemi cenzurován"> <!ENTITY torsettings.useBridges.default "Vyberte vestavěný most"> <!ENTITY torsettings.useBridges.default.placeholder "vyberte most"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Předložit"> -<!ENTITY torsettings.useBridges.custom "Znám poskytovatele mostu"> +<!ENTITY torsettings.useBridges.bridgeDB "Vyžádat most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Zadejte písmena z obrázku"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Nový obrázek"> +<!ENTITY torsettings.useBridges.captchaSubmit "Odeslat"> +<!ENTITY torsettings.useBridges.custom "Zadat známý most"> <!ENTITY torsettings.useBridges.label "Zadejte informace o mostu z důvěryhodného zdroje."> -<!ENTITY torsettings.useBridges.placeholder "napište adresa:post (jedna položka na řádek)"> +<!ENTITY torsettings.useBridges.placeholder "zadávejte ve tvaru adresa:post (jedna položka na řádek)"> -<!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> +<!ENTITY torsettings.copyLog "Zkopírovat protokol Toru do schránky"> <!ENTITY torsettings.proxyHelpTitle "Nápověda k proxy"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být potřeba lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě."> -<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> -<!ENTITY torsettings.bridgeHelp1 "Mosty jsou nezveřejněné prvky, které dělají blokování připojení k síti Tor obtížnější.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru."> -<!ENTITY torsettings.bridgeHelp2 "Protože se každá země snaží zablokovat Tor jinak, některé typy mostů fungují pouze v některých zemích.  Pokud si nejste jisti typy mostů, které fungují ve vaší zemi, navštivte torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních uzlech"> +<!ENTITY torsettings.bridgeHelp1 "Mosty jsou neveřejné uzly, které znesnadňují blokování sítě Tor.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru."> +<!ENTITY torsettings.bridgeHelp2 "Protože se některé země snaží zablokovat Tor, některé typy mostů fungují pouze v některých zemích.  Pokud si nejste jisti typy mostů, které fungují ve vaší zemi, navštivte torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Počkejte prosím, než vytvoříme spojení do sítě Tor.  Může to trvat několik minut."> +<!ENTITY torprogress.pleaseWait "Počkejte prosím na vytvoření spojení do sítě Tor.  Může to trvat několik minut."> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index c7caeb5..2a21d5f 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -1,78 +1,78 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor spouštěč +torlauncher.error_title=Spouštěč Toru -torlauncher.tor_exited_during_startup=Tor byl ukončen při spuštění. To by mohlo být způsobeno chybou ve vašem torrc souboru, chybou v Toru nebo jiném programu na vašem systému, nebo vadným hardware. Dokud neopravíte základní problém a nerestartujete Tor, Tor Browser se nespustí. -torlauncher.tor_exited=Tor byl neočekávaně ukončen. To by mohlo být způsobeno chybou v Toru, jiném programu na vašem systému, nebo vadným hardware. Dokud nerestartujete Tor, nebude Tor Browser schopen dosáhnout jakékoli webové stránky. Pokud problém přetrvává, prosím pošlete týmu podpory kopii souboru Tor Logu. +torlauncher.tor_exited_during_startup=Tor byl ukončen během spouštění. Příčinou může být chyba ve vašem souboru torrc, v Toru, v jiném programu na vašem systému, nebo vadný hardware. Dokud nebude příčina opravena a Tor restartován, prohlížeč Tor se nespustí. +torlauncher.tor_exited=Tor byl neočekávaně ukončen. Příčinou může být chyba v Toru, v jiném programu na vašem systému, nebo vadný hardware. Dokud nebude Tor restartován, prohlížeč Tor nebude moci načíst žádnou webovou stránku. Pokud problém přetrvává, prosím pošlete týmu podpory kopii protokolu Toru. torlauncher.tor_exited2=Restartování Tor nebude zavírat záložky prohlížeče. torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor. torlauncher.tor_failed_to_start=Tor nenastartoval. -torlauncher.tor_control_failed=Nezdařilo se převzít kontrolu nad Tor. -torlauncher.tor_bootstrap_failed=Tor selhal při sestavení připojení do sítě Tor. +torlauncher.tor_control_failed=Nepodařilo se převzít kontrolu nad Torem. +torlauncher.tor_bootstrap_failed=Nepodařilo se připojit do sítě Tor. torlauncher.tor_bootstrap_failed_details=%1$S selhal (%2$S). -torlauncher.unable_to_start_tor=Tor není schopen startovat\n\n%S -torlauncher.tor_missing=Spustitelný soubor Tor chybí. +torlauncher.unable_to_start_tor=Tor není možné zapnout\n\n%S +torlauncher.tor_missing=Spustitelný soubor Toru chybí. torlauncher.torrc_missing=Chybí soubor torrc a nemohl být vytvořen. -torlauncher.datadir_missing=Složka Tor data neexistuje a nemohla být vytvořena. +torlauncher.datadir_missing=Složka s daty Toru neexistuje a nemohla být vytvořena. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. -torlauncher.failed_to_get_settings=Nelze načíst Tor nastavení.\n\n%S -torlauncher.failed_to_save_settings=Nelze uložit Tor nastavení.\n\n%S -torlauncher.ensure_tor_is_running=Prosím zkontrolujte zda Tor je spuštěn. +torlauncher.failed_to_get_settings=Nelze načíst nastavení Toru.\n\n%S +torlauncher.failed_to_save_settings=Nelze uložit nastavení Toru.\n\n%S +torlauncher.ensure_tor_is_running=Zkontrolujte prosím, že je Tor spuštěn. -torlauncher.error_proxy_addr_missing=Pro nastavení Toru pro použití proxy serveru musíte specifikovat jak IP adresu (nebo jméno hostitele) tak číslo portu -torlauncher.error_proxy_type_missing=Musíte vybrat typ proxy -torlauncher.error_bridges_missing=Musíte specifikovat jeden nebo více mostů. -torlauncher.error_default_bridges_type_missing=Pro zadané bridge musíte zadat typ transportu. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=Nejsou zadané žádné bridge, které by měly ty transportu %S. Změňte prosím nastavení. +torlauncher.error_proxy_addr_missing=Pro nastavení proxy serveru musíte zadat jak IP adresu (nebo název hostitele) tak číslo portu. +torlauncher.error_proxy_type_missing=Vyberte typ proxy. +torlauncher.error_bridges_missing=Vyberte jeden nebo více mostů. +torlauncher.error_default_bridges_type_missing=Pro vybrané mosty musíte zadat typ transportu. +torlauncher.error_bridgedb_bridges_missing=Požádejte prosím o most. +torlauncher.error_bridge_bad_default_type=Nejsou nastaveny žádné mosty s typem transportu %S. Změňte prosím nastavení. torlauncher.bridge_suffix.meek-amazon=(funguje v Číně) torlauncher.bridge_suffix.meek-azure=(funguje v Číně) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Požádat o most… +torlauncher.request_a_new_bridge=Požádat o nový most… +torlauncher.contacting_bridgedb=Kontaktování BridgeDB. Čekejte prosím. +torlauncher.captcha_prompt=Pro vyžádání mostu prosím opište kód CAPTCHA. +torlauncher.bad_captcha_solution=Neopsali jste kód správně. Zkuste to prosím znovu. +torlauncher.unable_to_get_bridge=Nepodařilo se získat most z BridgeDB.\n\n%S +torlauncher.no_meek=Tento prohlížeč nemá nastaven meek, který je potřebný pro získávání mostů. +torlauncher.no_bridges_available=Je nám líto, ale v tuto chvíli nejsou dostupné žádné mosty. torlauncher.connect=Připojit torlauncher.restart_tor=Restartovat Tor -torlauncher.quit=Ukoncit -torlauncher.quit_win=Konec +torlauncher.quit=Ukončit +torlauncher.quit_win=Ukončit torlauncher.done=Hotovo torlauncher.forAssistance=Pro asistenci kontaktujte %S torlauncher.forAssistance2=Pro asistenci navštivte %S -torlauncher.copiedNLogMessages=Kopírování kompletní. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailové zprávy. +torlauncher.copiedNLogMessages=Kopírování dokončeno. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailu. -torlauncher.bootstrapStatus.conn_dir=Připojování do adresáře uzlu -torlauncher.bootstrapStatus.handshake_dir=Navazuji spojení s šifrovaným adresářem -torlauncher.bootstrapStatus.requesting_status=Zjišťuji stav sítě -torlauncher.bootstrapStatus.loading_status=Načítam stav sítě -torlauncher.bootstrapStatus.loading_keys=Nahrávám certifikáty autority -torlauncher.bootstrapStatus.requesting_descriptors=Zjišťuji informace o uzlu -torlauncher.bootstrapStatus.loading_descriptors=Nahrávám informace o uzlu -torlauncher.bootstrapStatus.conn_or=Připojuji se k síti Tor -torlauncher.bootstrapStatus.handshake_or=Navazuji na okruh Tor -torlauncher.bootstrapStatus.done=Připojen k síti Tor! +torlauncher.bootstrapStatus.conn_dir=Připojování do adresáře uzlů +torlauncher.bootstrapStatus.handshake_dir=Spojování s šifrovaným adresářem +torlauncher.bootstrapStatus.requesting_status=Kontrola stavu sítě +torlauncher.bootstrapStatus.loading_status=Načítání stavu sítě +torlauncher.bootstrapStatus.loading_keys=Nahrávání certifikátů autorit +torlauncher.bootstrapStatus.requesting_descriptors=Zjišťování informací o uzlu +torlauncher.bootstrapStatus.loading_descriptors=Nahrávání informací o uzlu +torlauncher.bootstrapStatus.conn_or=Připojování k síti Tor +torlauncher.bootstrapStatus.handshake_or=Navazování okruhu Tor +torlauncher.bootstrapStatus.done=Připojení k síti Tor dokončeno! torlauncher.bootstrapWarning.done=hotovo torlauncher.bootstrapWarning.connectrefused=připojení odmítnuto torlauncher.bootstrapWarning.misc=různý torlauncher.bootstrapWarning.resourcelimit=nedostatečné zdroje torlauncher.bootstrapWarning.identity=nesouhlasí identita -torlauncher.bootstrapWarning.timeout=vypršel čas na připojení -torlauncher.bootstrapWarning.noroute=bez spojení s hostitelem -torlauncher.bootstrapWarning.ioerror=chyba během čtení/zápisu -torlauncher.bootstrapWarning.pt_missing=Chybějící zásuvný transport +torlauncher.bootstrapWarning.timeout=čas spojení vypršel +torlauncher.bootstrapWarning.noroute=žádné spojení s hostitelem +torlauncher.bootstrapWarning.ioerror=chyba během čtení nebo zápisu +torlauncher.bootstrapWarning.pt_missing=chybějící zásuvný transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Spojení se serverem bylo ztraceno. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nelze se připojit k serveru. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nelze se připojit k proxy. diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 07cdd4d..cdc10bd 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til specifikke porte"> +<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Kopiér Tor-loggen til udklipsholderen"> <!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> -<!ENTITY torsettings.proxyHelp1 "Der kan være brug for en lokal proxy når der oprettes forbindelse gennem et netværk i virksomhed, skole eller universitet. Hvis du ikke er sikker på om der er brug for en proxy, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger."> +<!ENTITY torsettings.proxyHelp1 "Der kan være brug for en lokal proxy når der oprettes forbindelse gennem et netværk i virksomhed, skole eller universitet. Hvis du er i tvivl om der er brug for en proxy, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger."> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> <!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 33caee2..ae68303 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicken Sie auf "Verbinden", um eine Verbindung zu Tor herzustellen."> -<!ENTITY torSettings.configurePrompt "Klicken Sie auf "Konfigurieren", um die Netzwerkeinstellungen anzupassen, wenn Sie sich in einem Land befinden, das Tor blockiert (z.B. Ägypten, China, Türkei) oder wenn Sie sich von einem privaten Netzwerk aus verbinden, das einen Proxy benötigt."> +<!ENTITY torSettings.configurePrompt "Klicken Sie auf "Konfigurieren", um die Netzwerkeinstellungen anzupassen, wenn Sie sich in einem Land befinden, das Tor blockiert (z.B. Ägypten, China, Türkei), oder wenn Sie sich von einem privaten Netzwerk aus verbinden, das einen Proxy benötigt."> <!ENTITY torSettings.configure "Konfigurieren"> <!ENTITY torSettings.connect "Verbinden"> @@ -41,7 +41,7 @@ <!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert."> <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> -<!ENTITY torsettings.useBridges.bridgeDB "Brücke von torproject.org anfragen"> +<!ENTITY torsettings.useBridges.bridgeDB "Brücke von torproject.org anfordern"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Geben Sie die Zeichen in dem Bild ein"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Neue Herausforderung bekommen"> <!ENTITY torsettings.useBridges.captchaSubmit "Übermitteln"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Unter Umständen ist ein lokaler Proxy nötig, um sich von einem eingeschränkten Netzwerk eines Unternehmens, einer Schule oder Universität zu verbinden. Im Zweifelsfall kann die Einstellung in einem anderen Browser oder die System-Netzwerkeinstellung .verglichen werden."> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> -<!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor."> -<!ENTITY torsettings.bridgeHelp2 "Aufgrund der Tatsache, dass bestimmte Länder versuchen, Tor zu blockieren, funktionieren bestimmte Brücken in bestimmten Ländern, aber nicht in anderen.  Wenn Sie sich nicht sicher sind, welche Brücken in Ihrem Land funktionieren, besuchen Sie torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen, und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor."> +<!ENTITY torsettings.bridgeHelp2 "Aufgrund der Art, wie bestimmte Länder versuchen, Tor zu blockieren, funktionieren bestimmte Brücken in gewissen Ländern, nicht aber in anderen.  Wenn Sie sich nicht sicher sind, welche Brücken in Ihrem Land funktionieren, besuchen Sie torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 49aabaa..18afad1 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor-Starter -torlauncher.tor_exited_during_startup=Tor wurde unerwartet beendet. Dies kann die Folge eines Fehlers in ihrer "torrc"-Datei sein, ein Fehler in Tor, einem anderen Programm in ihrem System oder fehlerhafte Hardware sein. Bis die Ursache beseitigt wurde und Tor neugestartet wurde, wird der Tor Browser nicht starten. +torlauncher.tor_exited_during_startup=Tor wurde unerwartet beendet. Dies kann die Folge eines Fehlers in ihrer "torrc"-Datei sein, ein Fehler in Tor, einem anderen Programm in ihrem System oder fehlerhafte Hardware. Bis die Ursache beseitigt wurde und Tor neu gestartet wurde, wird der Tor Browser nicht starten. torlauncher.tor_exited=Tor wurde unerwartet beendet. Das kann an einem Fehler von Tor selbst, an einem anderen Programm auf ihrem System oder fehlerhaften Geräten liegen. Bis Sie Tor neu starten, kann der Tor-Browser keine Internetseiten mehr erreichen. Wenn das Problem bestehen bleibt, bitte eine Kopie des Tor-Protokolls an die Unterstützungsmannschaft senden. torlauncher.tor_exited2=Das Neustarten von Tor wird die Reiter Ihres Browsers nicht schließen. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden. @@ -23,7 +23,7 @@ torlauncher.failed_to_save_settings=Die Tor-Einstellungen können nicht gespeich torlauncher.ensure_tor_is_running=Bitte stellen Sie sicher, dass Tor läuft. torlauncher.error_proxy_addr_missing=Damit Tor einen Vermittlungsserver benutzt, um auf das Internet zuzugreifen, muss eine IP-Adresse oder ein Rechnername und eine Anschlussnummer angegeben werden. -torlauncher.error_proxy_type_missing=Sie müssen eine Vermittlungstyp auswählen. +torlauncher.error_proxy_type_missing=Sie müssen einen Vermittlungs-Typ auswählen. torlauncher.error_bridges_missing=Sie müssen eine oder mehrere Brücken eingeben. torlauncher.error_default_bridges_type_missing=Sie müssen eine Transporttyp für die bereitgestellten Brücken auswählen. torlauncher.error_bridgedb_bridges_missing=Bitte eine Brücke anfordern. @@ -32,10 +32,10 @@ torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten Brücke torlauncher.bridge_suffix.meek-amazon=(funktioniert in China) torlauncher.bridge_suffix.meek-azure=(funktioniert in China) -torlauncher.request_a_bridge=Brücke anfordern +torlauncher.request_a_bridge=Brücke anfordern... torlauncher.request_a_new_bridge=Neue Brücke anfordern... torlauncher.contacting_bridgedb=Kontaktiere BridgeDB. Bitte warten. -torlauncher.captcha_prompt=Löse das CAPTCHA um eine Brücke anzufordern. +torlauncher.captcha_prompt=Löse das CAPTCHA, um eine Brücke anzufordern. torlauncher.bad_captcha_solution=Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut. torlauncher.unable_to_get_bridge=Nicht imstande eine Brücke von der BridgeDB zu erhalten.\n\n%S torlauncher.no_meek=Der Browser ist nicht für meek eingestellt, was gebraucht wird um Brücken zu bekommen. diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 116550e..eacb515 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,16 +1,16 @@ -<!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου "> +<!ENTITY torsettings.dialog.title "Ρυθμίσεις Δικτύου Tor "> <!ENTITY torsettings.wizard.title.default "Σύνδεση στο Tor"> -<!ENTITY torsettings.wizard.title.configure "Ρυθμίσεις δικτύου Tor"> +<!ENTITY torsettings.wizard.title.configure "Ρυθμίσεις Δικτύου Tor"> <!ENTITY torsettings.wizard.title.connecting "Δημιουργείται σύνδεση">  <!ENTITY torlauncher.localePicker.title "Γλώσσα του Tor Browser"> -<!ENTITY torlauncher.localePicker.prompt "Παρακαλώ επέλεξε μια γλώσσα."> +<!ENTITY torlauncher.localePicker.prompt "Παρακαλώ επιλέξτε μια γλώσσα.">  <!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor"> -<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει τον Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης."> +<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connect "Σύνδεση"> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> -<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στην χώρα μου"> +<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου"> <!ENTITY torsettings.useBridges.default "Επιλέξτε μία ενταγμένη γέφυρα"> <!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μία γέφυρα"> <!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε μίας γέφυρας από το torproject.org"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. "> <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> -<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω εκείνης της υπηρεσίας αντί του Tor."> +<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor."> <!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ άλλες όχι.  Αν δεν είστε σίγουρος για το ποιες γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> +<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index ddf3011..3457ae9 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -3,12 +3,12 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Το Tor έκλεισε κατά την εκκίνηση. Αυτό μπορεί να οφείλεται σε σφάλμα στο αρχείο torrc, σε σφάλμα στο Tor ή σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Ο Tor Browser δεν θα ξεκινήσει μέχρι να διορθώσετε το σφάλμα και να επανεκκινησετε το Tor. -torlauncher.tor_exited=Ο Tor έκλεισε απροσδόκητα. Αυτό μπορεί να οφείλεται σε κάποιο bug του ίδιου του Tor, σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Εως ότου επανεκκινήσετε το Tor, ο περιηγητής Tor δεν θα είναι σε θέση να εμφανίσει οποιονδήποτε ιστότοπο. Αν το πρόβλημα εξακολουθεί, παρακαλώ στείλτε ένα αντίγραφο του αρχείου καταγραφής του Tor στην ομάδα υποστήριξης. -torlauncher.tor_exited2=Επανεκκίνηση του Tor δεν θα κλείσει τις καρτέλες browser σας. +torlauncher.tor_exited_during_startup=Το Tor έκλεισε κατά την εκκίνηση. Αυτό μπορεί να οφείλεται σε σφάλμα στο αρχείο torrc, σε σφάλμα στο Tor ή σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Ο Tor Browser δεν θα ξεκινήσει μέχρι να διορθώσετε το σφάλμα και να επανεκκινήσετε το Tor. +torlauncher.tor_exited=Ο Tor έκλεισε απροσδόκητα. Αυτό μπορεί να οφείλεται σε κάποιο σφάλμα του ίδιου του Tor, σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Εως ότου επανεκκινήσετε το Tor, ο περιηγητής Tor δεν θα είναι σε θέση να εμφανίσει οποιονδήποτε ιστότοπο. Αν το πρόβλημα παραμείνει, παρακαλώ στείλτε ένα αντίγραφο του αρχείου καταγραφής του Tor στην ομάδα υποστήριξης. +torlauncher.tor_exited2=Η επανεκκίνηση του Tor δεν θα κλείσει τις καρτέλες browser σας. torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor. torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor. -torlauncher.tor_control_failed=Απέτυχε να πάρει τον έλεγχο του Tor. +torlauncher.tor_control_failed=Απέτυχε να ελέγξει το Tor. torlauncher.tor_bootstrap_failed=Το Tor απέτυχε να δημιουργήσει μια σύνδεση δικτύου Tor. torlauncher.tor_bootstrap_failed_details=%1$S απέτυχε (%2$S). @@ -34,10 +34,10 @@ torlauncher.bridge_suffix.meek-azure=(λειτουργεί στην Κίνα) torlauncher.request_a_bridge=Ζητήστε μία γέφυρα... torlauncher.request_a_new_bridge=Ζητήστε μία καινούρια γέφυρα... -torlauncher.contacting_bridgedb=Επικοινωνούμε με την γέφυραDB. Παρακαλώ, περιμένετε. +torlauncher.contacting_bridgedb=Επικοινωνούμε με την BridgeDB. Παρακαλώ, περιμένετε. torlauncher.captcha_prompt=Λύστε το CAPTCHA για να ζητήσετε γέφυρα. torlauncher.bad_captcha_solution=Η λύση δεν είναι σωστή. Παρακαλώ, προσπαθήστε ξανά. -torlauncher.unable_to_get_bridge=Είναι αδύνατο να βρεθεί γέφυρα από το BridgeDB.\n\n%S +torlauncher.unable_to_get_bridge=Είναι αδύνατο να βρεθεί γέφυρα από την BridgeDB.\n\n%S torlauncher.no_meek=Αυτός ο περιηγητής δεν είναι φτιαγμένος για meek, το οποίο χρειάζεται για να υπάρξει πρόσβαση σε γέφυρες. torlauncher.no_bridges_available=Δεν υπάρχουν διαθέσιμες γέφυρες αυτή τη στιγμή. Συγγνώμη. @@ -52,18 +52,18 @@ torlauncher.forAssistance2=Για βοήθεια, επισκεφτείτε %S torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου. -torlauncher.bootstrapStatus.conn_dir=Σύνδεση σε ενδιάμεσο (relay) κατάλογο +torlauncher.bootstrapStatus.conn_dir=Σύνδεση στη διεύθυνση αναμεταδοτών torlauncher.bootstrapStatus.handshake_dir=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο torlauncher.bootstrapStatus.requesting_status=Ανάκτηση της κατάστασης του δικτύου torlauncher.bootstrapStatus.loading_status=Φόρτωση της κατάστασης του δικτύου torlauncher.bootstrapStatus.loading_keys=Φόρτωση των πιστοποιητικών του φορέα -torlauncher.bootstrapStatus.requesting_descriptors=Γίνεται αίτηση για πληροφορίες των Ενδιάμεσων -torlauncher.bootstrapStatus.loading_descriptors=Φόρτωση πληροφοριών Ενδιάμεσου +torlauncher.bootstrapStatus.requesting_descriptors=Γίνεται αίτηση για πληροφορίες των αναμεταδοτών +torlauncher.bootstrapStatus.loading_descriptors=Φόρτωση πληροφοριών αναμεταδότη torlauncher.bootstrapStatus.conn_or=Δημιουργια σύνδεσης στο δίκτυο Tor torlauncher.bootstrapStatus.handshake_or=Σύνδεση σε ένα κύκλωμα Tor -torlauncher.bootstrapStatus.done=Συνδέθηκε στο δίκτυο Tor! +torlauncher.bootstrapStatus.done=Συνδεθήκατε στο δίκτυο Tor! -torlauncher.bootstrapWarning.done=εντάξει +torlauncher.bootstrapWarning.done=έγινε torlauncher.bootstrapWarning.connectrefused=απόρριψη σύνδεσης torlauncher.bootstrapWarning.misc=διάφορα torlauncher.bootstrapWarning.resourcelimit=ανεπαρκείς πόροι @@ -71,8 +71,8 @@ torlauncher.bootstrapWarning.identity=η ταυτότητα δεν ταιριά torlauncher.bootstrapWarning.timeout=λήξη χρονικού ορίου σύνδεσης torlauncher.bootstrapWarning.noroute=δεν βρέθηκε διαδρομή προς σύνδεση torlauncher.bootstrapWarning.ioerror=σφάλμα ανάγνωσης/εγγραφής -torlauncher.bootstrapWarning.pt_missing=Λείπει δυνατότητα σύνδεσης μεταφοράς. +torlauncher.bootstrapWarning.pt_missing=Λείπει το pluggable transport -torlauncher.nsresult.NS_ERROR_NET_RESET=Χάθηκε η σύνδεση στον διακομιστή. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Δεν έγινε σύνδεση στον διακομιστή. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Δεν έγινε σύνδεση στο διακομιστή μεσολάβησης. +torlauncher.nsresult.NS_ERROR_NET_RESET=Χάθηκε η σύνδεση στον server. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Δεν έγινε σύνδεση στον server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Δεν έγινε σύνδεση στο proxy. diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 1aa88ea..e3b43c4 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -4,30 +4,30 @@ torlauncher.error_title=Lanzador de Tor torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto puede deberse a un error en tu archivo torrc, un fallo en Tor u otro programa en tu sistema, o componentes electrónicos defectuosos. Hasta que arregles el problema subyacente y reinicies Tor, el navegador Tor no arrancará. -torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o hardware defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor envía una copia de tu archivo de registro de Tor al equipo de soporte técnico. +torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o componentes electrónicos defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor enviá una copia de tu bitácora Tor al equipo de soporte técnico. torlauncher.tor_exited2=Reiniciar Tor no cerrará las pestañas de navegación. torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor torlauncher.tor_control_failed=Falló toma de control de Tor -torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red Tor +torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red de Tor torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S -torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor +torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo torrc y no pudo ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no pudo ser creado. torlauncher.password_hash_missing=Falló al conseguir contraseñas encriptadas. torlauncher.failed_to_get_settings=No se pudo acceder a las configuraciones de Tor.\n\n%S torlauncher.failed_to_save_settings=No se pudieron guardar las configuraciones de Tor\n\n%S -torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose. +torlauncher.ensure_tor_is_running=Por favor, asegurate que Tor esté ejecutándose. -torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet. -torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy. -torlauncher.error_bridges_missing=Debes especificar uno o más puentes. -torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. +torlauncher.error_proxy_addr_missing=Debés especificar tanto una dirección IP, o el nombre de tu equipo, como un número de puerto para configurar Tor de manera que utilice un proxy para acceder a Internet. +torlauncher.error_proxy_type_missing=Debés seleccionar el tipo de proxy. +torlauncher.error_bridges_missing=Debés especificar uno o más puentes. +torlauncher.error_default_bridges_type_missing=Debés seleccionar un tipo de transporte para los puentes provistos. torlauncher.error_bridgedb_bridges_missing=Por favor solicitá un puente. -torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. +torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajustá tu configuración. torlauncher.bridge_suffix.meek-amazon=(funciona en China) torlauncher.bridge_suffix.meek-azure=(funciona en China) @@ -47,31 +47,31 @@ torlauncher.quit=Quitar torlauncher.quit_win=Salir torlauncher.done=Hecho -torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.forAssistance2=Para asistencia, visita %S +torlauncher.forAssistance=Para asistencia, contactá %S +torlauncher.forAssistance2=Para asistencia, visitá %S -torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor están listos para ser pegados en un editor de textos o un e-mail. +torlauncher.copiedNLogMessages=Copia completa. %S registros de bitácora de Tor están listos para ser pegados en un editor de textos o un correo electrónico. -torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio -torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio -torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo -torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red de trabajo -torlauncher.bootstrapStatus.loading_keys=Cargando certificados de dominio -torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión -torlauncher.bootstrapStatus.loading_descriptors=Cargando información de retransmisión -torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor -torlauncher.bootstrapStatus.handshake_or=Estableciendo una ruta Tor -torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! +torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de relevos +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión encriptada al directorio +torlauncher.bootstrapStatus.requesting_status=Obteniendo el estado de red +torlauncher.bootstrapStatus.loading_status=Cargando el estado de red +torlauncher.bootstrapStatus.loading_keys=Cargando certificados de autoridad +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de relevos +torlauncher.bootstrapStatus.loading_descriptors=Cargando información de relevos +torlauncher.bootstrapStatus.conn_or=Conectando a la red de Tor +torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor +torlauncher.bootstrapStatus.done=¡Conectado a la red de Tor! -torlauncher.bootstrapWarning.done=finalizado +torlauncher.bootstrapWarning.done=hecho torlauncher.bootstrapWarning.connectrefused=conexión rechazada torlauncher.bootstrapWarning.misc=misceláneo torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes -torlauncher.bootstrapWarning.identity=error de indentificación -torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión +torlauncher.bootstrapWarning.identity=identidad no coincidente +torlauncher.bootstrapWarning.timeout=tiempo de espera para conexión agotado torlauncher.bootstrapWarning.noroute=sin ruta al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escritura -torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n +torlauncher.bootstrapWarning.pt_missing=transporte insertable faltante torlauncher.nsresult.NS_ERROR_NET_RESET=La conexión al servidor fue perdida. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=No se pudo conectar al servidor. diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 10da60d..d194b7d 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "تنظیمات شبکه تور"> <!ENTITY torsettings.wizard.title.default "اتصال به تور"> <!ENTITY torsettings.wizard.title.configure "تنظیمات شبکه Tor"> -<!ENTITY torsettings.wizard.title.connecting "ارتباط برقرار شده است ."> +<!ENTITY torsettings.wizard.title.connecting "ارتباط پایدار است">  <!ENTITY torlauncher.localePicker.title "زبان مرورگر تور"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "برای اتصال به تور بر روی "اتصال" کلیک کنید."> +<!ENTITY torSettings.configurePrompt "اگر شما در کشورهایی هستید که سعی می کنند تور را سانسور کنند (مانند مصر، چین، ترکیه)، یا اگر از یک شبکه خصوصی که نیاز به یک پروکسی دارد استفاده کنید؛ برای اعمال تنظیمات شبکه روی "پیکربندی" کلیک کنید."> <!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connect "اتصال"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "اختیاری"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "من برای دسترسی به اینترنت از پروکسی استفاده می‌کنم."> <!ENTITY torsettings.useProxy.type "نوع پراکسی:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "یک نوع پروکسی را انتخاب کنید"> <!ENTITY torsettings.useProxy.address "آدرس:"> <!ENTITY torsettings.useProxy.address.placeholder "آدرس آی‌پی یا نام میزبان"> <!ENTITY torsettings.useProxy.port "پورت:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد."> <!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.checkbox "تور در کشور من فیلتر یا سانسور شده است"> +<!ENTITY torsettings.useBridges.default "پل ساخته شده را انتخاب کنید"> +<!ENTITY torsettings.useBridges.default.placeholder "یک پل انتخاب کنید"> +<!ENTITY torsettings.useBridges.bridgeDB "درخواست یک پل از torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "حروف موجود در تصویر را وارد کنید"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "یک چالش جدید داشته باشید"> <!ENTITY torsettings.useBridges.captchaSubmit "ثبت کردن"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.custom "یک پل فراهم کنید که من می‌شناسم."> +<!ENTITY torsettings.useBridges.label "اطلاعات پل را از یک منبع مورد اعتماد وارد کنید."> +<!ENTITY torsettings.useBridges.placeholder "نوع آدرس: درگاه - پورت (هر کدام در یک خط)"> <!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> <!ENTITY torsettings.proxyHelpTitle "کمک پروکسی"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "اگر از طریق شبکه‌ی یک شرکت، مدرسه، یا دانشگاه به اینترنت متصل می‌شوید، ممکن است احتیاج به یک پروکسی داخلی داشته باشید. اگر از احتیاج به پروکسی داخلی مطمئن نیستید، به تنظیمات شبکه یک مرورگر دیگر یا تنظیمات شبکه سیستم خود نگاه کنید."> <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 1b6ff51..135530f 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -10,15 +10,15 @@  <!ENTITY torSettings.connectPrompt "לחץ על “התחבר“ כדי להתחבר אל Tor."> -<!ENTITY torSettings.configurePrompt "לחץ על ”הגדר“ כדי להתאים הגדרות רשת אם אתה במדינה שמצנזרת את Tor (למשל מצרים, סין וטורקיה) או אם אתה מתחבר מרשת פרטית הדורשת ייפוי־כוח."> -<!ENTITY torSettings.configure "הגדר"> +<!ENTITY torSettings.configurePrompt "לחץ על ”תצר“ כדי להתאים הגדרות רשת אם אתה במדינה שמצנזרת את Tor (למשל מצרים, סין וטורקיה) או אם אתה מתחבר מרשת פרטית הדורשת ייפוי־כוח."> +<!ENTITY torSettings.configure "תצר"> <!ENTITY torSettings.connect "התחבר">  <!ENTITY torsettings.startingTor "ממתין אל Tor להתחיל..."> <!ENTITY torsettings.restartTor "הפעל מחדש את Tor"> -<!ENTITY torsettings.reconfigTor "הגדר מחדש"> +<!ENTITY torsettings.reconfigTor "תצר מחדש"> <!ENTITY torsettings.discardSettings.prompt "הגדרת גשרי Tor או הכנסת הגדרות ייפוי־כוח מקומי.  כדי לעשות חיבור ישיר לרשת Tor, הגדרות אלו חייבות להיות מוסרות."> <!ENTITY torsettings.discardSettings.proceed "הסר הגדרות והתחבר"> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 29f2c1f..68c61e1 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -22,7 +22,7 @@ torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות torlauncher.failed_to_save_settings=לא היה ניתן לשמור הגדרות Tor.\n\n%S torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל. -torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי להגדיר את Tor להשתמש בייפוי־כוח כדי לגשת לאינטרנט. +torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי לתצר את Tor להשתמש בייפוי־כוח כדי לגשת לאינטרנט. torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי־הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. @@ -38,7 +38,7 @@ torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S -torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_meek=דפדפן זה אינו מתוצר עבור meek, אשר דרוש כדי להשיג גשרים. torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. torlauncher.connect=התחבר diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 4676680..33e81fb 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Smelltu á "Tengjast" til að tengjast við Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Smelltu á “Stilla” til að breyta netstillingum ef þú ert í landi sem ritskoðar umferð um Tor (svo sem Egyptalandi, Kína, Tyrklandi) eða ef þú ert að tengjast af einkaneti sem krefst þess að fara um milliþjón."> <!ENTITY torSettings.configure "Stilla"> <!ENTITY torSettings.connect "Tengjast"> @@ -20,7 +20,7 @@ <!ENTITY torsettings.restartTor "Endurræsa Tor"> <!ENTITY torsettings.reconfigTor "Endurstilla"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Þú hefur sett upp brýr fyrir Tor eða að þú hefur farið inn í stillingar milliþjóns á kerfinu.  Til að útbúa beina tengingu inn á Tor-netið, þá verður að fjarlægja þessar stillingar."> <!ENTITY torsettings.discardSettings.proceed "Fjarlægja stillingar og tengjast"> <!ENTITY torsettings.optional "Valkvætt"> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Þessi tölva tengist í gegnum eldvegg sem leyfir einungis tengingar í gegnum tilteknar gáttir"> <!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir:"> <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu"> <!ENTITY torsettings.useBridges.default "Veldu innbyggða brú"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Hugsanlega þarf að nota staðværan milliþjón (proxy) þegar tengst er í gegnum net fyrirtækis, skóla eða stofnunar. Ef þú ert ekki viss hvort þurfi að nota milliþjón, kíktu þá á netstillingarnar í einhverjum öðrum vafra eða á uppsetningu netsins í stýrikerfinu þínu."> <!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Brýr eru faldir endurvarpar sem gera erfiðara að loka á tengingar á Tor netinu.  Hver tegund af brúm notar mismunandi aðferðir til að forðast ritskoðun.  obfs-brýrnar láta netumferðina þína líta út sem handahófskennt suð og meek-brýr láta netumferðina þína líta út fyrir að tengjast þeirri þjónustu í staðinn fyrir Tor."> +<!ENTITY torsettings.bridgeHelp2 "Vegna þess hvernig sum lönd reyna að loka á umferð um Tor, munu sumar brýr virka í sumum löndum en aðrar ekki.  Ef þú ert ekki viss um hvaða brýr virka í landinu þínu, skaltu skoða torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c68bbdc..1e51efd 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor-ræsir -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited_during_startup=Tor hætti óvænt í ræsingu. Þetta gæti verið villa í torrc-skránni, í sjálfum Tor, öðru forriti á kerfinu þínu eða galli í vélbúnaði. Þar til þú endurræsir Tor mun Tor-vafrinn ekki geta tengst neinum vefsvæðum. Ef undirliggjandi vandamál er ekki leyst og Tor endurræst, þá mun Tor-vafrinn ekki fara í gang. +torlauncher.tor_exited=Tor hætti óvænt. Þetta gæti verið villa í sjálfum Tor, öðru forriti á kerfinu þínu eða galli í vélbúnaði. Þar til þú endurræsir Tor mun Tor-vafrinn ekki geta tengst neinum vefsvæðum. Ef vandamálið er viðvarandi, skaltu senda atvikaskrá Tor (log) til aðstoðarteymisins. torlauncher.tor_exited2=Endurræsing Tor mun ekki loka flipum vafrans. torlauncher.tor_controlconn_failed=Gat ekki tengst stýrigátt Tor. torlauncher.tor_failed_to_start=Tor ræstist ekki. @@ -22,12 +22,12 @@ torlauncher.failed_to_get_settings=Tókst ekki að nálgast stillingar fyrir Tor torlauncher.failed_to_save_settings=Tókst ekki að vista stillingar fyrir Tor.\n\n%S torlauncher.ensure_tor_is_running=Gakktu úr skugga um að Tor sé keyrandi. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +torlauncher.error_proxy_addr_missing=Þú þarft að tilgreina bæði IP-vistfang eða vélarheiti og númer gáttar til að setja Tor í að nota milliþjón (proxy) fyrir aðgang að internetinu. torlauncher.error_proxy_type_missing=Þú verður að velja tegund milliþjóns. torlauncher.error_bridges_missing=Þú verður að tilgreina eina eða fleiri brýr. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=Þú verður að tilgreina gerð tengileiðar fyrir þessar brýr. torlauncher.error_bridgedb_bridges_missing=Biðja um brú. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_bridge_bad_default_type=Engar meðfylgjandi brýr sem eru með tengileiðina %S eru til taks. Lagaðu stillingarnar þínar. torlauncher.bridge_suffix.meek-amazon=(virkar í Kína) torlauncher.bridge_suffix.meek-azure=(virkar í Kína) @@ -50,10 +50,10 @@ torlauncher.done=Búið torlauncher.forAssistance=Til að fá hjálp, hafðu samband við %S torlauncher.forAssistance2=Til að fá hjálp, heimsæktu %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Afritun lokið. %S færslur úr Tor-atvikaskrá eru tilbúnar til að líma inn í textaritil eða tölvupóst. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection +torlauncher.bootstrapStatus.conn_dir=Tengist við yfirlitsskrá um endurvarpa +torlauncher.bootstrapStatus.handshake_dir=Kem á tengingu við dulritaða yfirlitsskrá torlauncher.bootstrapStatus.requesting_status=Næ í stöðu netkerfis torlauncher.bootstrapStatus.loading_status=Hleð inn stöðu netkerfis torlauncher.bootstrapStatus.loading_keys=Hleð inn skilríkjum vottunarstöðvar @@ -69,7 +69,7 @@ torlauncher.bootstrapWarning.misc=ýmislegt torlauncher.bootstrapWarning.resourcelimit=ekki nægileg tilföng torlauncher.bootstrapWarning.identity=auðkenni samsvara ekki torlauncher.bootstrapWarning.timeout=tenging féll á tíma -torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.noroute=engin leið til hýsils torlauncher.bootstrapWarning.ioerror=les/skrifvilla torlauncher.bootstrapWarning.pt_missing=vantar 'pluggable transport' tengileiðir diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index ac1e9a4..72017f1 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "კავშირის დამყარება">  -<!ENTITY torlauncher.localePicker.title "Tor-ის ბრაუზერის ენა"> +<!ENTITY torlauncher.localePicker.title "Tor-ბრაუზერის ენა"> <!ENTITY torlauncher.localePicker.prompt "გთხოვთ, აირჩიოთ ენა.">  @@ -20,16 +20,16 @@ <!ENTITY torsettings.restartTor "Tor-ის ხელახლა გაშვება"> <!ENTITY torsettings.reconfigTor "ხელახლა გამართვა"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "თქვენ გამართული გაქვთ Tor-ის გადამცემი ხიდები ან მითითებული გაქვთ ადგილობრივი პროქსის პარამეტრები.  Tor-ქსელთან პირდაპირ დასაკავშირებლად, საჭიროა ამ პარამეტრების მოცილება."> <!ENTITY torsettings.discardSettings.proceed "პარამეტრების მოცილება და დაკავშირება"> -<!ENTITY torsettings.optional "დამატებითი"> +<!ENTITY torsettings.optional "არასავალდებულო"> <!ENTITY torsettings.useProxy.checkbox "ინტერნეტთან დასაკავშირებლად პროქსის ვიყენებ"> <!ENTITY torsettings.useProxy.type "პროქსის სახეობა:"> <!ENTITY torsettings.useProxy.type.placeholder "მიუთითეთ პროქსის სახეობა"> <!ENTITY torsettings.useProxy.address "მისამართი"> -<!ENTITY torsettings.useProxy.address.placeholder "IP მისამართი ან დასახელება"> +<!ENTITY torsettings.useProxy.address.placeholder "IP-მისამართი ან დასახელება"> <!ENTITY torsettings.useProxy.port "პორტი:"> <!ENTITY torsettings.useProxy.username "მომხმარებლის სახელი:"> <!ENTITY torsettings.useProxy.password "პაროლი"> @@ -39,24 +39,24 @@ <!ENTITY torsettings.firewall.checkbox "კომპიუტერი ინტერნეტს უკავშირდება ქსელის ფარის გავლით, რომელშიც მხოლოდ ცალკეული პორტებია დაშვებული"> <!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები:"> <!ENTITY torsettings.useBridges.checkbox "Tor შეზღუდულია ჩემს ქვეყანაში"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> +<!ENTITY torsettings.useBridges.default "ჩაშენებული გადამცემი ხიდის მითითება"> +<!ENTITY torsettings.useBridges.default.placeholder "ხიდის მითითება"> +<!ENTITY torsettings.useBridges.bridgeDB "გადამცემი ხიდის მოთხოვნა საიტიდან torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "შეიყვანეთ სურათზე მოცემული სიმბოლოები"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ახალი გამოწვევა"> -<!ENTITY torsettings.useBridges.captchaSubmit "წარუდგინოს"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ახალი კოდის მიღება"> +<!ENTITY torsettings.useBridges.captchaSubmit "გაგზავნა"> +<!ENTITY torsettings.useBridges.custom "ნაცნობი გადამცემი ხიდის მითითება"> +<!ENTITY torsettings.useBridges.label "გადამცემი ხიდის მონაცემების მითითება სანდო წყაროდან."> <!ENTITY torsettings.useBridges.placeholder "აკრიფეთ მისამართი:პორტი (თითო ცალკე ხაზზე)"> <!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების დაკოპირება"> <!ENTITY torsettings.proxyHelpTitle "პროქსი — დახმარება"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "ადგილობრივი პროქსი მაშინაა საჭირო, როცა ინტერნეტს უკავშირდებით კომპანიის, სკოლის ან უნივერსიტეტის ქსელის გავლით. თუ დარწმუნებული არ ხართ პროქსის საჭიროებაში, გადახედეთ ინტერნეტის პარამეტრებს სხვა ბრაუზერში ან იხილეთ სისტემის ქსელის პარამეტრები."> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "დახმარება გადამცემი ხიდის თაობაზე"> +<!ENTITY torsettings.bridgeHelp1 "ხიდები წარმოადგენს აღუნუსხავ გადამცემებს, რომელთა გამოყენებაც ართულებს Tor-ქსელთან კავშირის შეზღუდვას.  თითოეული სახის ხიდი იყენებს განსხვავებულ საშუალებებს, ცენზურის ასარიდებლად.  obfs-გადამყვანი, გადაცემულ მონაცემებს წარმოადგენს შემთხვევითი ხმაურის სახით, ხოლო meek-გადამყვანი კი თქვენს მონაცემთა მიმოცვლას წარმოაჩენს ისე, თითქოს ცალკეულ მომსახურებას უკავ შირდებით და არა Tor-ს."> +<!ENTITY torsettings.bridgeHelp2 "იმისდა მიხედვით, თუ როგორ ზღუდავს ცალკეული ქვეყანა Tor-ს, გარკვეული სახის გადამცემი ხიდები, მხოლოდ შესაბამის ქვეყნებში იმუშავებს და არა სხგავან.  თუ დანამდვილებით არ იცით, რომელი გადამცემი მუშაობს თქვენს ქვეყანაში, ეწვიეთ დახმარების გვერდს torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "გთხოვთ, მოითმინოთ სანამ დაუკავშირდება Tor-ქსელს.  რამდენიმე წუთს შეიძლება გასტანოს."> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 2218a43..48a7acf 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -3,18 +3,18 @@ torlauncher.error_title=Tor-ის გამშვები -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Tor-ის ხელახლა ჩართვით თქვენი ბრაუზერის ჩანართები არ დაიხურება. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_exited_during_startup=Tor მოულოდნელად დაიხურა გაშვებისას. ამის მიზეზი შესაძლოა იყოს შეცდომა torrc-ფაილში, Tor-ის ხარვეზი, სისტემაში არსებული სხვა პროგრამა ან დაზიანებული აპარატურა. სანამ აღნიშნულ გაუმართაობას არ გამოასწორებთ და Tor-ს ხელახლა არ გაუშვებთ, Tor-ბრაუზერი არ ჩაირთვება. +torlauncher.tor_exited=Tor მოულოდნელად დაიხურა. ამის მიზეზი შესაძლოა იყოს თავად Tor-ის ხარვეზი, სისტემაში არსებული სხვა პროგრამა ან დაზიანებული აპარატურა. Tor-ის ხელახლა გაშვების გარეშე, Tor-ბრაუზერი ვერ შეძლებს საიტების გახსნას. თუ გაუმართაობა არ მოგვარდება, გთხოვთ, გადაუგზავნოთ Tor-ის აღრიცხვის ჩანაწერის ასლი მხარდაჭერის გუნდს. +torlauncher.tor_exited2=Tor-ის ხელახლა გაშვებით, თქვენი ბრაუზერის ჩანართები არ დაიხურება. +torlauncher.tor_controlconn_failed=Tor-ის მართვის პორტთან დაკავშირება ვერ ხერხდება. torlauncher.tor_failed_to_start=Tor-ის გაშვება ვერ მოხერხდა. torlauncher.tor_control_failed=Tor-ის მართვა ვერ ხერხდება. torlauncher.tor_bootstrap_failed=Tor ვერ ახერხებს Tor-ქსელთან კავშირის დამყარებას. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S ვერ მოხერხდა (%2$S). torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ ხერხდება.\n\n%S torlauncher.tor_missing=Tor-ის გამშვები ვერ მოიძებნა. -torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.torrc_missing=torrc-ფაილი ვერ მოინახა და ვერ შეიქმნება. torlauncher.datadir_missing=Tor-ის მონაცემთა საქაღალდე არ არსებობს და ვერ შეიქმნება. torlauncher.password_hash_missing=ჰეშირებული პაროლის მიღება ვერ მოხერხდა. @@ -22,57 +22,57 @@ torlauncher.failed_to_get_settings=Tor-ის პარამეტრები torlauncher.failed_to_save_settings=Tor-ის პარამეტრების შენახვა ვერ ხერხდება.\n\n%S torlauncher.ensure_tor_is_running=გთხოვთ დარწმუნდეთ, რომ Tor გაშვებულია. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=თქვენ უნდა მიუთითოთ ორივე, IP-მისამართი ან დასახელება და პორტის ნომერი, რომ Tor დაუკავშირდეს ინტერნეტს პროქსის საშუალებით. +torlauncher.error_proxy_type_missing=უნდა მიუთითოთ პროქსის სახეობა. +torlauncher.error_bridges_missing=უნდა მიუთითოთ ერთი ან რამდენიმე გადამცემი ხიდი. +torlauncher.error_default_bridges_type_missing=უნდა მიუთითოთ გადამყვანის სახეობა, მოცემული გადამცემი ხიდებისთვის. +torlauncher.error_bridgedb_bridges_missing=გთხოვთ, მოითხოვოთ გადამცემი ხიდი. +torlauncher.error_bridge_bad_default_type=არცერთი მოცემული გადამცემ ხიდისთვის, %S სახის გადამყვანი არაა ხელმისაწვდომი. გთხოვთ გამართოთ თქვენი პარამეტრები. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(მუშაობს ჩინეთში) +torlauncher.bridge_suffix.meek-azure=(მუშაობს ჩინეთში) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=გადამცემი ხიდის მოთხოვნა... +torlauncher.request_a_new_bridge=ახალი გადამცემი ხიდის მოთხოვნა... +torlauncher.contacting_bridgedb=დაკავშირება BridgeDB-სთან. გთხოვთ, მოითმინოთ. +torlauncher.captcha_prompt=გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის. +torlauncher.bad_captcha_solution=გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა. +torlauncher.unable_to_get_bridge=გადამცემი ხიდების მიღება BridgeDB-იდან ვერ ხერხდება.\n\n%S +torlauncher.no_meek=ბრაუზერი არაა გამართული meek-ისთვის, რომელიც საჭიროა გადამცემი ხიდების მისაღებად. +torlauncher.no_bridges_available=ამჟამად გადამცემი ხიდები არაა ხელმისაწვდომი. ვწუხვართ. torlauncher.connect=დაკავშირება torlauncher.restart_tor=Tor-ის ხელახლა გაშვება -torlauncher.quit=Quit +torlauncher.quit=დახურვა torlauncher.quit_win=გასვლა torlauncher.done=შესრულებულია -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=დახმარებისთვის დაუკავშირდით %S +torlauncher.forAssistance2=დახმარებისთვის ეწვიეთ %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=დაკოპირება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=გადამცემთა ცნობართან დაკავშირება +torlauncher.bootstrapStatus.handshake_dir=დაშიფრული კავშირის დამყარება ცნობართან +torlauncher.bootstrapStatus.requesting_status=ქსელის მდგომარეობის დადგენა +torlauncher.bootstrapStatus.loading_status=ქსელის მდგომარეობის ჩატვირთვა +torlauncher.bootstrapStatus.loading_keys=უფლებამოსილი სერტიფიკატების ჩატვირთვა +torlauncher.bootstrapStatus.requesting_descriptors=გადამცემის მონაცემების მოთხოვნა +torlauncher.bootstrapStatus.loading_descriptors=გადამცემის მონაცემების ჩატვირთვა torlauncher.bootstrapStatus.conn_or=უკავშირდება Tor-ქსელს -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.handshake_or=Tor-ის კავშირის წრედის დამყარება +torlauncher.bootstrapStatus.done=Tor-ქსელთან დაკავშირებულია! -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=მზადაა +torlauncher.bootstrapWarning.connectrefused=კავშირი უარყოფილია +torlauncher.bootstrapWarning.misc=სხვადასხვა +torlauncher.bootstrapWarning.resourcelimit=არასაკმარისი რესურსები +torlauncher.bootstrapWarning.identity=მოწმობა არ ემთხვევა +torlauncher.bootstrapWarning.timeout=კავშირის ვადა +torlauncher.bootstrapWarning.noroute=მისამართი არაა აღნიშნული +torlauncher.bootstrapWarning.ioerror=წაკითხვა/ჩაწერის შეცდომა +torlauncher.bootstrapWarning.pt_missing=მისაერთებელი გადამყვანი ვერ მოიძებნა -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=სერვერთან კავშირი დაიკარგა. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=სერვერთან დაკავშირება ვერ ხერხდება. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=პროქსისთან დაკავშირება ვერ ხერხდება. diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 9b19476..3807906 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en e torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen. torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven. torlauncher.error_default_bridges_type_missing=Je moet een transport-type selecteren voor de verstrekte bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Selekteer s.v.p. een brug. torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub je instellingen aan. torlauncher.bridge_suffix.meek-amazon=(Werkt in China) torlauncher.bridge_suffix.meek-azure=(werkt in China) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=Verzoek een brug... +torlauncher.request_a_new_bridge=Verzoek een Nieuwe Brug... torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. +torlauncher.captcha_prompt=Los de CAPTCHA op om een brug te verzoeken. torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.unable_to_get_bridge=Kan geen brug verkrijgen van BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=Geen bruggen zijn beschikbaar op dit moment. Sorry. torlauncher.connect=Verbind torlauncher.restart_tor=Herstart Tor diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 8a90487..d32caea 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "點擊"連接"來連上 Tor "> -<!ENTITY torSettings.configurePrompt "如果您處於會監視tor網絡的國家（例如埃及，中國，土耳其）或者您位於私人網絡中，需要代理訪問互聯網。請點擊“配置”更改網絡設置。"> +<!ENTITY torSettings.configurePrompt "如果您處於會監視tor網絡的國家（例如埃及，中國，土耳其）或者您位於私人網路中，需要代理訪問互聯網。請點擊，「設定」更改網路設置。"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connect "連接"> @@ -41,8 +41,8 @@ <!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查"> <!ENTITY torsettings.useBridges.default "選擇內建的橋接"> <!ENTITY torsettings.useBridges.default.placeholder "選擇網橋"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.bridgeDB "從 torproject.org 請求網橋"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "輸入圖片中的文字"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "提交"> <!ENTITY torsettings.useBridges.custom "提供一個認識的橋接 ">

1 0

[torbutton/master] Release preparations for 2.1.1
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit d343226ef34e037ceb5dafec9242da80e380287b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:35:04 2018 +0000 Release preparations for 2.1.1 Changelog update and version bump --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 8bffbe8b..468d2a99 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +2.1.1 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 28082: Add locales cs, el, hu, ka + * Translations update + 2.1 * Bug 27175: Add pref to allow users to persist custom noscript settings * Bug 27760: Use new NoScript API for IPC and fix about:blank issue diff --git a/src/install.rdf b/src/install.rdf index 5df0f129..fcd857a4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.1</em:version> + <em:version>2.1.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tabs in the TabsLayoutItemView. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 34242a922172ddfcee8e089949e9972f4c0a882f Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:27 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tabs in the TabsLayoutItemView. r=JanH --- mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java index bfd09e2a5e56..329eb9f437f4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java @@ -201,6 +201,7 @@ public class TabsLayoutItemView extends LinearLayout final Context appContext = getContext().getApplicationContext(); mOngoingIconLoad = Icons.with(appContext) .pageUrl(url) + .setPrivateMode(tab.isPrivate()) .skipNetwork() .targetSize(iconSize) .textSize(textSize)

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1458905 - Update to FreeType 2.9.1. r=jfkthame
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit ce5aede0dc562dab1636baac96e82c955cffad0b Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue May 8 11:48:29 2018 -0400 Bug 1458905 - Update to FreeType 2.9.1. r=jfkthame --- modules/freetype2/CMakeLists.txt | 389 +- modules/freetype2/ChangeLog | 3650 +------ modules/freetype2/ChangeLog.21 | 2 +- modules/freetype2/ChangeLog.24 | 2 +- modules/freetype2/ChangeLog.28 | 3136 ++++++ modules/freetype2/Jamfile | 2 +- modules/freetype2/README | 10 +- modules/freetype2/README.moz-patches | 17 +- modules/freetype2/builds/amiga/makefile | 10 +- modules/freetype2/builds/amiga/makefile.os4 | 10 +- modules/freetype2/builds/amiga/smakefile | 8 +- modules/freetype2/builds/cmake/FindHarfBuzz.cmake | 57 +- modules/freetype2/builds/detect.mk | 67 +- modules/freetype2/builds/dos/detect.mk | 2 +- modules/freetype2/builds/freetype.mk | 23 +- .../builds/mac/FreeType.m68k_cfm.make.txt | 3 - .../builds/mac/FreeType.m68k_far.make.txt | 3 - .../builds/mac/FreeType.ppc_carbon.make.txt | 3 - .../builds/mac/FreeType.ppc_classic.make.txt | 3 - modules/freetype2/builds/modules.mk | 4 +- modules/freetype2/builds/newline | 1 - modules/freetype2/builds/os2/detect.mk | 2 +- modules/freetype2/builds/symbian/freetype.mmp | 2 - modules/freetype2/builds/toplevel.mk | 3 +- modules/freetype2/builds/unix/config.guess | 478 +- modules/freetype2/builds/unix/config.sub | 213 +- modules/freetype2/builds/unix/configure | 458 +- modules/freetype2/builds/unix/configure.ac | 28 +- modules/freetype2/builds/unix/configure.raw | 26 +- modules/freetype2/builds/unix/ftconfig.in | 26 +- modules/freetype2/builds/unix/install.mk | 30 +- modules/freetype2/builds/unix/unix-cc.in | 8 +- modules/freetype2/builds/unix/unix-def.in | 3 + modules/freetype2/builds/vms/ftconfig.h | 26 +- .../builds/wince/vc2005-ce/freetype.vcproj | 3047 +----- .../freetype2/builds/wince/vc2005-ce/index.html | 10 +- .../builds/wince/vc2008-ce/freetype.vcproj | 10159 +----------------- .../freetype2/builds/wince/vc2008-ce/index.html | 10 +- modules/freetype2/builds/windows/detect.mk | 24 +- modules/freetype2/builds/windows/ftver.rc | 43 - .../builds/windows/vc2005/freetype.vcproj | 451 +- modules/freetype2/builds/windows/vc2005/index.html | 10 +- .../builds/windows/vc2008/freetype.vcproj | 1534 +-- modules/freetype2/builds/windows/vc2008/index.html | 10 +- .../freetype2/builds/windows/vc2010/freetype.sln | 36 +- .../builds/windows/vc2010/freetype.vcxproj | 4 +- .../builds/windows/vc2010/freetype.vcxproj.filters | 6 - modules/freetype2/builds/windows/vc2010/index.html | 40 +- .../freetype2/builds/windows/visualc/freetype.dsp | 49 +- .../builds/windows/visualc/freetype.vcproj | 1534 +-- .../freetype2/builds/windows/visualc/index.html | 10 +- .../freetype2/builds/windows/visualce/freetype.dsp | 49 +- .../builds/windows/visualce/freetype.vcproj | 10376 +------------------ .../freetype2/builds/windows/visualce/index.html | 10 +- modules/freetype2/configure | 2 +- modules/freetype2/docs/CHANGES | 58 +- modules/freetype2/docs/INSTALL | 4 +- modules/freetype2/docs/INSTALL.ANY | 2 - modules/freetype2/docs/INSTALL.CROSS | 2 +- modules/freetype2/docs/INSTALL.GNU | 4 +- modules/freetype2/docs/INSTALL.UNIX | 2 +- modules/freetype2/docs/MAKEPP | 2 +- modules/freetype2/docs/VERSIONS.TXT | 1 + modules/freetype2/docs/freetype-config.1 | 2 +- .../freetype2/docs/reference/ft2-auto_hinter.html | 4 +- .../docs/reference/ft2-base_interface.html | 17 +- .../freetype2/docs/reference/ft2-basic_types.html | 4 +- .../freetype2/docs/reference/ft2-bdf_fonts.html | 4 +- .../docs/reference/ft2-bitmap_handling.html | 4 +- modules/freetype2/docs/reference/ft2-bzip2.html | 4 +- .../docs/reference/ft2-cache_subsystem.html | 4 +- .../freetype2/docs/reference/ft2-cff_driver.html | 6 +- .../freetype2/docs/reference/ft2-cid_fonts.html | 4 +- .../freetype2/docs/reference/ft2-computations.html | 4 +- .../docs/reference/ft2-error_code_values.html | 4 +- .../docs/reference/ft2-error_enumerations.html | 4 +- .../freetype2/docs/reference/ft2-font_formats.html | 4 +- .../freetype2/docs/reference/ft2-gasp_table.html | 4 +- .../docs/reference/ft2-glyph_management.html | 4 +- .../docs/reference/ft2-glyph_stroker.html | 4 +- .../docs/reference/ft2-glyph_variants.html | 4 +- .../docs/reference/ft2-gx_validation.html | 4 +- modules/freetype2/docs/reference/ft2-gzip.html | 4 +- .../docs/reference/ft2-header_file_macros.html | 4 +- .../docs/reference/ft2-header_inclusion.html | 4 +- .../freetype2/docs/reference/ft2-incremental.html | 4 +- modules/freetype2/docs/reference/ft2-index.html | 6 +- .../docs/reference/ft2-lcd_filtering.html | 4 +- .../docs/reference/ft2-list_processing.html | 4 +- modules/freetype2/docs/reference/ft2-lzw.html | 4 +- .../freetype2/docs/reference/ft2-mac_specific.html | 4 +- .../docs/reference/ft2-module_management.html | 4 +- .../docs/reference/ft2-multiple_masters.html | 4 +- .../docs/reference/ft2-ot_validation.html | 4 +- .../docs/reference/ft2-outline_processing.html | 4 +- .../docs/reference/ft2-parameter_tags.html | 4 +- .../freetype2/docs/reference/ft2-pcf_driver.html | 4 +- .../freetype2/docs/reference/ft2-pfr_fonts.html | 10 +- .../freetype2/docs/reference/ft2-properties.html | 4 +- .../docs/reference/ft2-quick_advance.html | 4 +- modules/freetype2/docs/reference/ft2-raster.html | 4 +- .../freetype2/docs/reference/ft2-sfnt_names.html | 4 +- .../docs/reference/ft2-sizes_management.html | 4 +- .../docs/reference/ft2-system_interface.html | 4 +- .../docs/reference/ft2-t1_cid_driver.html | 4 +- modules/freetype2/docs/reference/ft2-toc.html | 6 +- .../docs/reference/ft2-truetype_engine.html | 4 +- .../docs/reference/ft2-truetype_tables.html | 4 +- .../freetype2/docs/reference/ft2-tt_driver.html | 4 +- .../freetype2/docs/reference/ft2-type1_tables.html | 4 +- .../docs/reference/ft2-user_allocation.html | 4 +- modules/freetype2/docs/reference/ft2-version.html | 6 +- .../freetype2/docs/reference/ft2-winfnt_fonts.html | 4 +- .../freetype2/include/freetype/config/ftconfig.h | 25 +- .../freetype2/include/freetype/config/ftoption.h | 4 + modules/freetype2/include/freetype/freetype.h | 29 +- modules/freetype2/include/freetype/ftdriver.h | 4 +- modules/freetype2/include/freetype/ftgasp.h | 5 + modules/freetype2/include/freetype/ftpfr.h | 6 +- .../freetype2/include/freetype/internal/ftobjs.h | 2 +- modules/freetype2/modules.cfg | 27 +- modules/freetype2/moz.build | 2 - modules/freetype2/src/autofit/afblue.c | 6 + modules/freetype2/src/autofit/afblue.dat | 8 +- modules/freetype2/src/autofit/afblue.h | 298 +- modules/freetype2/src/autofit/afranges.c | 25 +- modules/freetype2/src/autofit/afscript.h | 2 +- modules/freetype2/src/autofit/aftypes.h | 6 +- modules/freetype2/src/base/Jamfile | 4 +- modules/freetype2/src/base/ftbase.c | 2 + modules/freetype2/src/base/ftbitmap.c | 10 +- modules/freetype2/src/base/ftlcdfil.c | 4 +- modules/freetype2/src/base/ftoutln.c | 7 +- modules/freetype2/src/base/ftver.rc | 61 + modules/freetype2/src/base/rules.mk | 2 + modules/freetype2/src/cff/cffload.c | 18 + modules/freetype2/src/pshinter/pshglob.c | 4 +- modules/freetype2/src/sfnt/sfobjs.c | 9 + modules/freetype2/src/sfnt/ttcmap.c | 43 +- modules/freetype2/src/sfnt/ttpost.c | 4 +- modules/freetype2/src/sfnt/ttsbit.c | 2 +- modules/freetype2/src/smooth/ftgrays.c | 2 +- modules/freetype2/src/tools/apinames.c | 19 +- modules/freetype2/src/tools/docmaker/content.py | 12 +- modules/freetype2/src/tools/docmaker/docbeauty.py | 18 +- modules/freetype2/src/tools/docmaker/docmaker.py | 24 +- modules/freetype2/src/tools/docmaker/sources.py | 10 +- modules/freetype2/src/tools/docmaker/tohtml.py | 100 +- modules/freetype2/src/truetype/ttgload.c | 34 +- modules/freetype2/src/truetype/ttgxvar.c | 96 +- modules/freetype2/src/truetype/ttinterp.c | 4 +- modules/freetype2/src/truetype/ttobjs.c | 22 +- modules/freetype2/src/type1/t1load.c | 18 + modules/freetype2/vms_make.com | 4 +- 154 files changed, 5989 insertions(+), 31412 deletions(-) diff --git a/modules/freetype2/CMakeLists.txt b/modules/freetype2/CMakeLists.txt index b0f86126b3c8..ad8ded0bbdb4 100644 --- a/modules/freetype2/CMakeLists.txt +++ b/modules/freetype2/CMakeLists.txt @@ -12,35 +12,40 @@ # fully. # # -# As a preliminary, create a compilation directory and change into it, for -# example +# The following will 1. create a build directory and 2. change into it and +# call cmake to configure the build with default parameters as a static +# library. # -# mkdir ~/freetype2.compiled -# cd ~/freetype2.compiled -# -# Now you can say -# -# cmake <path-to-freetype2-src-dir> -# -# to create a Makefile that builds a static version of the library. +# cmake -E make_directory build +# cmake -E chdir build cmake .. # # For a dynamic library, use # -# cmake <path-to-freetype2-src-dir> -D BUILD_SHARED_LIBS:BOOL=true +# cmake -E chdir build cmake -D BUILD_SHARED_LIBS:BOOL=true .. # # For a framework on OS X, use # -# cmake <path-to-freetype2-src-dir> -D BUILD_FRAMEWORK:BOOL=true -G Xcode -# -# instead. +# cmake -E chdir build cmake -G Xcode -D BUILD_FRAMEWORK:BOOL=true .. # # For an iOS static library, use # -# cmake -D IOS_PLATFORM=OS -G Xcode <path-to-freetype2-src-dir> +# cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=OS .. # # or # -# cmake -D IOS_PLATFORM=SIMULATOR -G Xcode <path-to-freetype2-src-dir> +# cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=SIMULATOR .. +# +# Finally, build the project with: +# +# cmake --build build +# +# Install it with +# +# (sudo) cmake --build build --target install +# +# A binary distribution can be made with +# +# cmake --build build --config Release --target package # # Please refer to the cmake manual for further options, in particular, how # to modify compilation and linking parameters. @@ -59,28 +64,33 @@ # . `CMakeLists.txt' is provided as-is since it is normally not used by the # developer team. # -# . If you want to disable the automatic generation of the distribution -# targets, add the `-D FREETYPE_NO_DIST=true' command line argument. -# -# . Set the `WITH_ZLIB', `WITH_BZip2', `WITH_PNG', and `WITH_HarfBuzz' -# CMake variables to `ON' or `OFF' to force or skip using a dependency. +# . Set the `FT_WITH_ZLIB', `FT_WITH_BZIP2', `FT_WITH_PNG', and +# `FT_WITH_HARFBUZZ' CMake variables to `ON' to force using a dependency. # Leave a variable undefined (which is the default) to use the dependency -# only if it is available. Example: +# only if it is available. Set `CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE' to +# disable a dependency completely (CMake package name, so `BZip2' instead of +# `BZIP2'). Example: # -# cmake ... -DWITH_ZLIB=ON -DWITH_HarfBuzz=OFF ... +# cmake -DFT_WITH_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE [...] # # . Installation of FreeType can be controlled with the CMake variables # `SKIP_INSTALL_HEADERS', `SKIP_INSTALL_LIBRARIES', and `SKIP_INSTALL_ALL' # (this is compatible with the same CMake variables in zlib's CMake # support). +# FreeType explicitly marks the API to be exported and relies on the compiler +# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property +# starting with 2.8.12. +cmake_minimum_required(VERSION 2.8.12) -cmake_minimum_required(VERSION 2.6) - +if (NOT CMAKE_VERSION VERSION_LESS 3.3) + # Allow symbol visibility settings also on static libraries. CMake < 3.3 + # only sets the propery on a shared library build. + cmake_policy(SET CMP0063 NEW) +endif () include(CheckIncludeFile) - # CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which # configures the base build environment and references the toolchain file if (APPLE) @@ -116,30 +126,47 @@ else () endif () -project(freetype) +project(freetype C) +set(VERSION_MAJOR "2") +set(VERSION_MINOR "9") +set(VERSION_PATCH "1") + +# SOVERSION scheme: CURRENT.AGE.REVISION +# If there was an incompatible interface change: +# Increment CURRENT. Set AGE and REVISION to 0 +# If there was a compatible interface change: +# Increment AGE. Set REVISION to 0 +# If the source code was changed, but there were no interface changes: +# Increment REVISION. +set(LIBRARY_VERSION "6.16.0") +set(LIBRARY_SOVERSION "6") + +# These options mean "require x and complain if not found". They'll get +# optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable +# searching for a packge entirely (x is the CMake package name, so "BZip2" +# instead of "BZIP2"). +option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF) +option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF) +option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF) +option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF) -if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS) - message(FATAL_ERROR "Building shared libraries on Windows needs MinGW") -endif () # Disallow in-source builds if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") message(FATAL_ERROR - " -In-source builds are not permitted! Make a separate folder for" - " building, e.g.," - " - mkdir build; cd build; cmake .." - " -Before that, remove the files created by this failed run with" - " - rm -rf CMakeCache.txt CMakeFiles") + "In-source builds are not permitted! Make a separate folder for" + " building, e.g.,\n" + " cmake -E make_directory build\n" + " cmake -E chdir build cmake ..\n" + "Before that, remove the files created by this failed run with\n" + " cmake -E remove CMakeCache.txt\n" + " cmake -E remove_directory CMakeFiles") endif () # Add local cmake modules -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds/cmake) +list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/builds/cmake) if (BUILD_FRAMEWORK) @@ -152,45 +179,32 @@ if (BUILD_FRAMEWORK) endif () -set(VERSION_MAJOR "2") -set(VERSION_MINOR "9") -set(VERSION_PATCH "0") - -set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) -set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) - - -# Compiler definitions for building the library -add_definitions(-DFT2_BUILD_LIBRARY) - - # Find dependencies -foreach (d ZLIB BZip2 PNG HarfBuzz) - string(TOUPPER "${d}" D) - - if (DEFINED WITH_${d} OR DEFINED WITH_${D}) - if (WITH_${d} OR WITH_${D}) - find_package(${d} QUIET REQUIRED) - endif () - else () - find_package(${d} QUIET) - endif () - - if (${d}_FOUND OR ${D}_FOUND) - message(STATUS "Building with ${d}") - endif () -endforeach () +if (FT_WITH_HARFBUZZ) + find_package(HarfBuzz 1.3.0 REQUIRED) +else () + find_package(HarfBuzz 1.3.0) +endif () +if (FT_WITH_PNG) + find_package(PNG REQUIRED) +else () + find_package(PNG) +endif () -message(STATUS - "Creating directory ${PROJECT_BINARY_DIR}/include/freetype/config") -file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include/freetype/config") +if (FT_WITH_ZLIB) + find_package(ZLIB REQUIRED) +else () + find_package(ZLIB) +endif () +if (FT_WITH_BZIP2) + find_package(BZip2 REQUIRED) +else () + find_package(BZip2) +endif () # Create the configuration file -message(STATUS - "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h") - if (UNIX) check_include_file("unistd.h" HAVE_UNISTD_H) check_include_file("fcntl.h" HAVE_FCNTL_H) @@ -200,38 +214,27 @@ if (UNIX) FTCONFIG_H) if (HAVE_UNISTD_H) string(REGEX REPLACE - "#undef +(HAVE_UNISTD_H)" "#define \\1" + "#undef +(HAVE_UNISTD_H)" "#define \\1 1" FTCONFIG_H "${FTCONFIG_H}") endif () if (HAVE_FCNTL_H) string(REGEX REPLACE - "#undef +(HAVE_FCNTL_H)" "#define \\1" + "#undef +(HAVE_FCNTL_H)" "#define \\1 1" FTCONFIG_H "${FTCONFIG_H}") endif () if (HAVE_STDINT_H) string(REGEX REPLACE - "#undef +(HAVE_STDINT_H)" "#define \\1" + "#undef +(HAVE_STDINT_H)" "#define \\1 1" FTCONFIG_H "${FTCONFIG_H}") endif () string(REPLACE "/undef " "#undef " FTCONFIG_H "${FTCONFIG_H}") - file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h-new" - "${FTCONFIG_H}") -else () - file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h" - FTCONFIG_H) - file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h-new" + file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" "${FTCONFIG_H}") endif () -execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h-new" - "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h") # Create the options file -message(STATUS - "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") - file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftoption.h" FTOPTION_H) if (ZLIB_FOUND) @@ -254,16 +257,8 @@ if (HARFBUZZ_FOUND) "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1" FTOPTION_H "${FTOPTION_H}") endif () -file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h-new" +file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h" "${FTOPTION_H}") -execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h-new" - "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") - - -# Specify library include directories -include_directories("${PROJECT_SOURCE_DIR}/include") -include_directories(BEFORE "${PROJECT_BINARY_DIR}/include") file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h") @@ -278,13 +273,11 @@ set(BASE_SRCS src/base/ftbdf.c src/base/ftbitmap.c src/base/ftcid.c - src/base/ftfntfmt.c src/base/ftfstype.c src/base/ftgasp.c src/base/ftglyph.c src/base/ftgxval.c src/base/ftinit.c - src/base/ftlcdfil.c src/base/ftmm.c src/base/ftotval.c src/base/ftpatent.c @@ -316,25 +309,25 @@ set(BASE_SRCS ) if (WIN32) - set(BASE_SRCS ${BASE_SRCS} builds/windows/ftdebug.c) + enable_language(RC) + list(APPEND BASE_SRCS builds/windows/ftdebug.c + src/base/ftver.rc) elseif (WINCE) - set(BASE_SRCS ${BASE_SRCS} builds/wince/ftdebug.c) + list(APPEND BASE_SRCS builds/wince/ftdebug.c) else () - set(BASE_SRCS ${BASE_SRCS} src/base/ftdebug.c) + list(APPEND BASE_SRCS src/base/ftdebug.c) endif () - if (BUILD_FRAMEWORK) - set(BASE_SRCS - ${BASE_SRCS} - builds/mac/freetype-Info.plist - ) + list(APPEND BASE_SRCS builds/mac/freetype-Info.plist) endif () + if (NOT DISABLE_FORCE_DEBUG_POSTFIX) set(CMAKE_DEBUG_POSTFIX d) endif() + add_library(freetype ${PUBLIC_HEADERS} ${PUBLIC_CONFIG_HEADERS} @@ -342,15 +335,35 @@ add_library(freetype ${BASE_SRCS} ) +set_target_properties( + freetype PROPERTIES + C_VISIBILITY_PRESET hidden) + +target_compile_definitions( + freetype PRIVATE FT2_BUILD_LIBRARY) + +if (WIN32) + target_compile_definitions( + freetype PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS) +endif () if (BUILD_SHARED_LIBS) set_target_properties(freetype PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${SHARED_LIBRARY_VERSION} - COMPILE_DEFINITIONS freetype_EXPORTS - ) + VERSION ${LIBRARY_VERSION} + SOVERSION ${LIBRARY_SOVERSION}) endif () +target_include_directories( + freetype BEFORE # Pick up ftconfig.h and ftoption.h generated above. + PRIVATE "${PROJECT_BINARY_DIR}/include") + +target_include_directories( + freetype + PRIVATE "${PROJECT_SOURCE_DIR}/include") + +target_include_directories( + freetype + PUBLIC $<INSTALL_INTERFACE:include/freetype2>) if (BUILD_FRAMEWORK) set_property(SOURCE ${PUBLIC_CONFIG_HEADERS} @@ -364,91 +377,121 @@ if (BUILD_FRAMEWORK) ) endif () -if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) - target_include_directories(freetype - PUBLIC $<INSTALL_INTERFACE:include/freetype2>) -endif () -if (CMAKE_VERSION VERSION_LESS 2.8.12) - set(MAYBE_PRIVATE "") -else () - set(MAYBE_PRIVATE "PRIVATE") -endif () +set(PKG_CONFIG_REQUIRED_PRIVATE "") if (ZLIB_FOUND) - target_link_libraries(freetype ${MAYBE_PRIVATE} ${ZLIB_LIBRARIES}) - include_directories(${ZLIB_INCLUDE_DIRS}) + target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) + target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) + list(APPEND PKG_CONFIG_REQUIRED_PRIVATE zlib) endif () if (BZIP2_FOUND) - target_link_libraries(freetype ${MAYBE_PRIVATE} ${BZIP2_LIBRARIES}) - include_directories(${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS + target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) + target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS + list(APPEND PKG_CONFIG_REQUIRED_PRIVATE bzip2) endif () if (PNG_FOUND) - add_definitions(${PNG_DEFINITIONS}) - target_link_libraries(freetype ${MAYBE_PRIVATE} ${PNG_LIBRARIES}) - include_directories(${PNG_INCLUDE_DIRS}) + target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) + target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS}) + target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS}) + list(APPEND PKG_CONFIG_REQUIRED_PRIVATE libpng) endif () if (HARFBUZZ_FOUND) - target_link_libraries(freetype ${MAYBE_PRIVATE} ${HARFBUZZ_LIBRARIES}) - include_directories(${HARFBUZZ_INCLUDE_DIRS}) + target_link_libraries(freetype PRIVATE ${HARFBUZZ_LIBRARIES}) + target_include_directories(freetype PRIVATE ${HARFBUZZ_INCLUDE_DIRS}) + list(APPEND PKG_CONFIG_REQUIRED_PRIVATE harfbuzz) endif () -# Installations -# Note the trailing slash in the argument to the `DIRECTORY' directive +# Installation +include(GNUInstallDirs) + if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ - DESTINATION include/freetype2 - PATTERN "internal" EXCLUDE - PATTERN "ftconfig.h" EXCLUDE - PATTERN "ftoption.h" EXCLUDE - ) - install(FILES - ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h - ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h - DESTINATION include/freetype2/freetype/config - ) + install( + # Note the trailing slash in the argument to `DIRECTORY'! + DIRECTORY ${PROJECT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2 + COMPONENT headers + PATTERN "internal" EXCLUDE + PATTERN "ftconfig.h" EXCLUDE + PATTERN "ftoption.h" EXCLUDE) + install( + FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h + ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config + COMPONENT headers) endif () if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - install(TARGETS freetype + # Generate the pkg-config file + if (UNIX) + file(READ ${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in FREETYPE2_PC_IN) + + string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}") + + string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX} + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%exec_prefix%" "\${prefix}" + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}" + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%ft_version%" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}" + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + string(REPLACE "%LIBS_PRIVATE%" "" # All libs support pkg-config + FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) + + file(WRITE ${PROJECT_BINARY_DIR}/freetype2.pc ${FREETYPE2_PC_IN}) + + install( + FILES ${PROJECT_BINARY_DIR}/freetype2.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT pkgconfig) + endif () + + install( + TARGETS freetype + EXPORT freetype-targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION Library/Frameworks + COMPONENT libraries) + install( EXPORT freetype-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - FRAMEWORK DESTINATION Library/Frameworks - ) - install(EXPORT freetype-targets - DESTINATION lib/cmake/freetype - FILE freetype-config.cmake - ) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype + FILE freetype-config.cmake + COMPONENT headers) endif () # Packaging -# CPack version numbers for release tarball name. +set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The FreeType font rendering library.") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/LICENSE.TXT") + set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}}) -if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY) - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME}") -endif () -if (NOT DEFINED CPACK_SOURCE_PACKAGE_FILE_NAME) - set(CPACK_SOURCE_PACKAGE_FILE_NAME - "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-r${PROJECT_REV}" - CACHE INTERNAL "tarball basename" - ) -endif () -set(CPACK_SOURCE_GENERATOR TGZ) -set(CPACK_SOURCE_IGNORE_FILES - "/CVS/;/.svn/;.swp$;.#;/#;/build/;/serial/;/ser/;/parallel/;/par/;~;/preconfig.out;/autom4te.cache/;/.config") -set(CPACK_GENERATOR TGZ) -include(CPack) +set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) +set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +if (WIN32) + set(CPACK_GENERATOR ZIP) +else() + set(CPACK_GENERATOR TGZ) +endif() -# Add `make dist' target if FREETYPE_DIST is set (which is the default) -if (NOT DEFINED FREETYPE_NO_DIST) - add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) -endif () +set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries") +set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers") +set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION + "Library used to build programs which use FreeType") +set(CPACK_COMPONENT_HEADERS_DESCRIPTION + "C/C++ header files for use with FreeType") +set(CPACK_COMPONENT_HEADERS_DEPENDS libraries) +set(CPACK_COMPONENT_LIBRARIES_GROUP "Development") +set(CPACK_COMPONENT_HEADERS_GROUP "Development") -# eof +include(CPack) diff --git a/modules/freetype2/ChangeLog b/modules/freetype2/ChangeLog index fa38730b7327..806b8354a906 100644 --- a/modules/freetype2/ChangeLog +++ b/modules/freetype2/ChangeLog @@ -1,3 +1,530 @@ +2018-05-01 Werner Lemberg <wl(a)gnu.org> + + * Version 2.9.1 released. + ========================= + + + Tag sources with `VER-2-9-1'. + + * docs/VERSION.TXT: Add entry for version 2.9.1. + * docs/CHANGES: Updated. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + src/base/ftver.rc, builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.9/2.9.1/, s/29/291/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 22:1:16. + * CMakeLists.txt (VERSION_PATCH): Set to 1. + + * include/freetype/ftgasp.h: Use FT_BEGIN_HEADER and FT_END_HEADER. + +2018-04-26 Werner Lemberg <wl(a)gnu.org> + + Another fix for handling invalid format 2 cmaps. + + Sigh. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8003 + + * src/sfnt/ttcmap.c (tt_cmap2_char_next): Adjust condition to avoid + an endless loop. + +2018-04-24 Ben Wagner <bungeman(a)google.com> + + [base] Avoid undefined behaviour in lcd filtering code (#53727). + + * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy): + Ensure `height > 0'. + +2018-04-22 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftoutln.c (FT_Outline_Decompose): Improve error tracing. + +2018-04-22 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [base] Fix bitmap emboldening. + + Bug introduced after release 2.8. + + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): We use + `FT_QALLOC_MULT', which doesn't zero out the buffer. Adjust the + bitmap copying code to take care of this fact. + +2018-04-22 Werner Lemberg <wl(a)gnu.org> + + Another fix for handling invalid format 2 cmaps. + + The previous commit was incomplete. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7928 + + * src/sfnt/ttcmap.c (tt_cmap2_char_next): Adjust condition to avoid + an endless loop. + +2018-04-19 Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Georgian Mtavruli characters. + + This will be part of the forthcoming Unicode 11.0. + + * src/autofit/afblue.dat: Add blue zone data for Mtavruli. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Mtavruli standard character. + +2018-04-18 Werner Lemberg <wl(a)gnu.org> + + Fix handling of invalid format 2 cmaps. + + The problem was introduced after the last release. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7828 + + * src/sfnt/ttcmap.c (tt_cmap2_char_next): Avoid endless loop. + +2018-04-17 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow issues. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7739 + + * src/truetype/ttinterp.c (Ins_CEILING): Use FT_PIX_CEIL_LONG. + +2018-04-16 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow issues. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7718 + + * src/truetype/ttinterp.c (Ins_MIRP): Use ADD_LONG. + +2018-04-15 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [build] Use `info' function of make 3.81. + + * configure, docs/INSTALL, docs/INSTALL.CROSS, docs/INSTALL.GNU, + docs/INSTALL.UNIX, docs/MAKEPP: Bump make version requirements. + + * builds/detect.mk (std_setup): Replace `echo' with `info'. + (dos_setup): Removed. + * builds/unix/install.mk, builds/modules.mk, builds/dos/detect.mk, + builds/windows/detect.mk, builds/os2/detect.mk: Updated. + * builds/newline: No longer needed. + +2018-04-15 Werner Lemberg <wl(a)gnu.org> + + [truetype]: Limit `SLOOP' bytecode argument to 16 bits. + + This fixes + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7707 + + * src/truetype/ttinterp.c (Ins_SLOOP): Do it. + +2018-04-14 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow issues. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7652 + + * src/truetype/ttinterp.c (Ins_MDAP): Use SUB_LONG. + +2018-04-14 Werner Lemberg <wl(a)gnu.org> + + [autofit] Update to Unicode 11.0.0. + + But no support new scripts (volunteers welcomed). + + * src/autofit/afranges.c (af_arab_nonbase_uniranges, + af_beng_nonbase_uniranges, af_cakm_nonbase_uniranges, + af_deva_nonbase_uniranges, af_geor_uniranges, + af_gujr_nonbase_uniranges, af_mlym_nonbase_uniranges, + af_nkoo_nonbase_uniranges, af_telu_nonbase_uniranges, + af_hani_uniranges): Add new data. + +2018-04-10 Nikolaus Waxweiler <madigens(a)gmail.com> + + * CMakeLists.txt, builds/cmake/FindHarfBuzz.cmake: Extensive + modernization measures. + + This brings up the minimum required CMake version to 2.8.12. + + The installation paths follow the GNU defaults now, e.g. installing on a + 64 bit host will place binaries into the lib64/ folder on e.g. Fedora. + + Symbols are hidden by default (e.g. `-fvisibility=hidden' on GCC). + + CMake will no longer look for a C++ compiler. + + Library and .so version now match the Autotools build. + + Comments in the build file and informational messages now use platform + agnostic example commands. + + ftoption.h and ftconfig.h are written directly without a redundant `-new' + copy. + + External dependencies are expressed as option()s and will turn up as such + in cmake-gui. + + Internal: Properties such as dependencies and include directories are now + privately set on the freetype library instead of globally. + + The CPack definitions have been cleaned up, the `make dist' has been + removed. Source packages generated with CPack don't contain Autotools + files and aren't used by the maintainters anyway. + + On Windows, src/base/ftver.rc is compiled to decorate the library with + version and copyright information. + + A pkg-config file is now generated and installed. + +2018-04-09 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow issues. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7453 + + * src/truetype/ttinterp.c (Round_Super, Round_Super_45): Use + ADD_LONG and SUB_LONG. + +2018-04-06 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [windows, wince] Clean up legacy project files. + + * builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2008-ce/freetype.vcproj, + builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2008/freetype.vcproj, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/freetype.dsp: Remove per-file compile flags. + +2018-04-04 Werner Lemberg <wl(a)gnu.org> + + [cff, type1] Sanitize `BlueFuzz' and `BlueShift'. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7371 + + * src/cff/cffload.c (cff_load_private_dict): Sanitize + `priv->blue_shift' and `priv->blue_fuzz' to avoid overflows later + on. + + * src/type1/t1load.c (T1_Open_Face): Ditto. + +2018-04-04 Ben Wagner <bungeman(a)google.com> + + * src/truetype/ttobjs.c (trick_names): Add 3 tricky fonts (#53554), + `DFHei-Md-HK-BF', `DFKaiShu-Md-HK-BF' and `DFMing-Bd-HK-BF'. + (tt_check_trickyness_sfnt_ids): Add checksums for 3 tricky fonts + in above. + +2018-04-01 Werner Lemberg <wl(a)gnu.org> + + * builds/toplevel.mk (work): Use $(SEP). + + This fixes the `make refdoc' using Cygwin: $(CAT) is `type' on this + platform, and this program only understands backslashes in paths. + + Reported by Nikhil Ramakrishnan <ramakrishnan.nikhil(a)gmail.com>. + +2018-03-30 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix memory leak (only if tracing is on). + + * src/truetype/ttgxvar.c (TT_Get_MM_Var) [FT_DEBUG_LEVEL_TRACE}: Fix + it. + +2018-03-23 Ben Wagner <bungeman(a)google.com> + + [sfnt] Correctly handle missing bitmaps in sbix format (#53404). + + * src/sfnt/ttfsbit.c (tt_face_load_sbix_image): Fix return value. + +2018-03-23 Ben Wagner <bungeman(a)google.com> + + [truetype] Fix advance of empty glyphs in bitmap fonts (#53393). + + * src/truetype/ttgload.c (TT_Load_Glyph): Apply scaling to metrics + for empty bitmaps. + +2018-03-22 Werner Lemberg <wl(a)gnu.org> + + Remove `ftlcdfil.c' and `ftfntfmt.c' from build files (#53415). + + builds/amiga/makefile, builds/amiga/makefile.os4, + builds/amiga/smakefile, builds/mac/FreeType.m68k_cfm.make.txt, + builds/mac/FreeType.m68k_far.make.txt, + builds/mac/FreeType.ppc_carbon.make.txt, + builds/mac/FreeType.ppc_classic.make.txt, + builds/symbian/freetype.mmp, builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2008-ce/freetype.vcproj, + builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/freetype.vcxproj.filters, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, vms_make.com: Do it. + +2018-03-13 Werner Lemberg <wl(a)gnu.org> + + * src/sfnt/ttcmap.c (tt_cmap2_validate): Fix potential numeric + overflow. + +2018-03-13 Werner Lemberg <wl(a)gnu.org> + + Fix cmap format 2 handling (#53320). + + The patch introduced for #52646 was not correct. + + * src/sfnt/ttcmap.c (tt_cmap2_char_next): Adjust condition. + +2018-03-10 Nikolaus Waxweiler <madigens(a)gmail.com> + + * CMakeLists.txt (BASE_SRCS): Update to changes from 2018-03-05. + +2018-03-09 Chun-wei Fan <fanc999(a)yahoo.com.tw> + + * CMakeLists.txt [win32]: Allow MSVC DLL builds (#53287). + + Do not limit DLL builds to MinGW, since we already have + `__declspec(dllexport)' directives in `ftconfig.h'. + Also suppress more warnings for POSIX functions. + +2018-03-08 Hugh McMaster <hugh.mcmaster(a)outlook.com> + + Make installation of `freetype-config' optional (#53093). + + * builds/unix/configure.raw: Add option `--enable-freetype-config' + and set `INSTALL_FT2_CONFIG'. + * builds/unix/unix-def.in (INSTALL_FT2_CONFIG): Define. + * builds/unix/install.mk (install): Handle it. + +2018-03-05 Werner Lemberg <wl(a)gnu.org> + + Make `ftlcdfil.c' part of the `base' module. + + `ftobjs.c' needs `ft_lcd_padding'. + + Problem reported by duhuanpeng <548708880(a)qq.com>. + + * modules.cfg (BASE_EXTENSIONS): Don't include `ftlcdfil.c'. + + * src/base/ftbase.c: Include `ftlcdfil.c'. + * src/base/rules.mk (BASE_SRC): Add `ftlcdfil.c'. + * src/base/Jamfile (_sources): Adjusted. + + * docs/INSTALL.ANY: Updated. + +2018-03-05 Werner Lemberg <wl(a)gnu.org> + + Make `ftfntfmt.c' part of the `base' module. + + `ftobjs.c' needs `FT_Get_Font_Format'. + + Problem reported by duhuanpeng <548708880(a)qq.com>. + + * modules.cfg (BASE_EXTENSIONS): Don't include `ftfntfmt.c'. + + * src/base/ftbase.c: Include `ftfntfmt.c'. + * src/base/rules.mk (BASE_SRC): Add `ftfntfmt.c'. + * src/base/Jamfile (_sources): Adjusted. + + * docs/INSTALL.ANY: Updated. + +2018-03-01 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttinterp.c (TT_RunIns): Fix tracing arguments. + +2018-02-23 Werner Lemberg <wl(a)gnu.org> + + * builds/unix/configure.raw: Need HarfBuzz 1.3.0 or newer. + + Problem reported by Alan Coopersmith <alan.coopersmith(a)oracle.com>. + +2018-02-17 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Prefer `CBDT'/`CBLC' over `glyf' table (#53154). + +2018-02-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow issues. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6027 + + * src/truetype/ttinterp.c (Ins_MSIRP, Ins_MIAP, Ins_MIRP): Use + SUB_LONG; avoid FT_ABS. + +2018-02-04 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [unix] Use -fvisibility=hidden. + + It is now widely recommended that ELF shared libraries hide symbols + except those with explicit __attribute__((visibility("default"))). + This is supported by all major compilers and should rather be an + option in libtool. + + * builds/unix/configure.raw: Add -fvisibility=hidden to CFLAGS. + * builds/unix/ftconfig.in, builds/vms/ftconfig.h, + include/freetype/config/ftconfig.h (FT_EXPORT): Use visibility + attribute. + +2018-01-27 Werner Lemberg <wl(a)gnu.org> + + [truetype] Better protection against invalid VF data. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5739 + + Bug introduced in commit 08cd62deedefe217f2ea50e392923ce8b5bc7ac7. + + * src/truetype/ttgxvar.c (TT_Set_Var_Design): Always initialize + `normalizedcoords'. + +2018-01-27 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736 + +2018-01-27 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgxvar.c (tt_set_mm_blend): Minor. + +2018-01-27 Werner Lemberg <wl(a)gnu.org> + + [truetype] Better trace VF instances. + + * src/truetype/ttgxvar.c (ft_var_to_normalized): Don't emit number + of coordinates. + (TT_Get_MM_Var): Trace instance indices names. + (TT_Set_Var_Design): Updated. + +2018-01-27 Werner Lemberg <wl(a)gnu.org> + + [truetype] Beautify tracing of VF axis records. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Show axis records in a + table-like manner. + +2018-01-26 Ben Wagner <bungeman(a)google.com> + + [truetype] Fix multiple calls of `FT_Get_MM_Var' (#52955). + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Set + `face->blend->num_axis' in case we have to initialize the + `face->blend'. + +2018-01-23 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [apinames] Anonymous version map for GNU linker. + + * src/tools/apinames.c (PROGRAM_VERSION): Set to 0.3. + (OutputFormat): Add `OUTPUT_GNU_VERMAP'. + (names_dump): Handle it. + (usage): Updated. + (main): Handle new command line flag `-wL'. + +2018-01-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [unix] Call libtool to clean up. + + * builds/unix/install.mk (clean_project_unix, distclean_project_unix): + Use libtool. + * builds/freetype.mk: Minor. + +2018-01-18 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/base/ftver.rc: Fix mingw-w64 compilation. + +2018-01-18 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [build] Enable VERSIONINFO resource for Cygwin/MinGW. + + * builds/unix/configure.raw: Check for resource compiler. + * builds/unix/unix-cc.in: Conditionally set up resource compiler. + * builds/freetype.mk: Add conditional rule for `ftver.rc'. + * src/base/ftver.rc: Copyright notice and year update. + +2018-01-18 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [build] Move VERSIONINFO resource. + + * builds/windows/vc2010/freetype.vcxproj: Updated. + * builds/windows/ftver.rc: Move file from here... + * src/base/ftver.rc: ... to here. + +2018-01-12 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [build] Expand dllexport/dllimport to Cygwin/MinGW. + + * include/freetype/config/ftconfig.h: Respect DLL_EXPORT, + s/_MSC_VER/_WIN32/. + * builds/unix/ftconfig.in: Replicate here. + * builds/vms/ftconfig.h: Replicate here. + +2018-01-12 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [build] Improve and document MSVC build. + + * include/freetype/config/ftconfig.h: Guard dllexport/dllimport + attributes with _DLL and FT2_DLLIMPORT. + * builds/windows/vc2010/index.html: Update documentation. + +2018-01-10 Steve Robinson <ssrobins(a)gmail.com> + + * CMakeLists.txt [win32]: Suppress warnings for POSIX functions. + +2018-01-10 Ewald Hew <ewaldhew(a)gmail.com> + + [psaux] Correctly handle Flex features (#52846). + + * src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO, + cf2_cmdHMOVETO>: Do not move if doing Flex. + +2018-01-09 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * builds/windows/vc2010/freetype.sln: Synchronize with the project. + 2018-01-08 Werner Lemberg <wl(a)gnu.org> * Version 2.9 released. @@ -30,7 +557,7 @@ (FREETYPE_PATCH): Set to 0. * builds/unix/configure.raw (version_info): Set to 22:0:16. - * CMakeLists.txt (VERSION_PATCH): Set to 1. + * CMakeLists.txt (VERSION_PATCH): Set to 0. 2018-01-07 Werner Lemberg <wl(a)gnu.org> @@ -1806,3129 +2333,10 @@ * build/windows/vc2010/freetype.vcxproj: Use MaxSpeed (/02) optimization for Release configuration throughout the project. -2017-09-16 Werner Lemberg <wl(a)gnu.org> - - * Version 2.8.1 released. - ========================= - - - Tag sources with `VER-2-8-1'. - - * docs/VERSION.TXT: Add entry for version 2.8.1. - * docs/CHANGES: Updated. - - * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, - builds/windows/vc2005/index.html, - builds/windows/vc2008/freetype.vcproj, - builds/windows/vc2008/index.html, - builds/windows/vc2010/freetype.vcxproj, - builds/windows/vc2010/index.html, - builds/windows/visualc/freetype.dsp, - builds/windows/visualc/freetype.vcproj, - builds/windows/visualc/index.html, - builds/windows/visualce/freetype.dsp, - builds/windows/visualce/freetype.vcproj, - builds/windows/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.8/2.8.1/, s/28/281/. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. - - * builds/unix/configure.raw (version_info): Set to 21:0:15. - * CMakeLists.txt (VERSION_PATCH): Set to 1. - -2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - - [sfnt] lowest gcc for vectors (e1d0249e) is changed to 4.7. - - __builtin_shuffle() was introduced in gcc-4.7. The lowest - gcc to enable vector operation is delayed from 4.6 to 4.7. - - * src/sfnt/pngshim.c (premultiply_data): Fix cpp-macro to - enable the vector operation, to change the lowest gcc version - from 4.6 to 4.7. - -2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - - [cache] Fix a possible overflow by signed integer comparison. - - Improve the code by 5d3ff05615dda6d1325ed612381a17a0df04c975 , - issues are found by Behdad Esfahbod and Werner Lemberg. - - * src/cache/ftcbasic.c (FTC_ImageCache_Lookup): Replace - a subtraction to check higher bit by a bit operation, - and cpp-conditionalize for appropriate systems. Add better - documentation to the comment. - (FTC_ImageCache_LookupScaler): Ditto. - (FTC_SBitCache_Lookup): Ditto. - (FTC_SBitCache_LookupScaler): Ditto. - -2017-09-13 Werner Lemberg <wl(a)gnu.org> - - [autofit] Really fix #41334 (#52000). - - * src/autofit/aflatin.c (af_latin_hints_compute_segments): Set - `segment->delta' everywhere. - -2017-09-12 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - - [autofit, sfnt] Fix for `make multi'. - - * src/autofit/afshaper.c: Include FT_ADVANCE_H, to use - FT_Get_Advance() in it. - * src/sfnt/ttcmap.c: Include FT_SERVICE_POSTSCRIPT_CMAPS_H - to use PS_Unicodes in it, also include `ttpost.h' to use - tt_face_get_ps_name() in it. - -2017-09-11 Azzuro <azzuro(a)team-mediaportal.com> - - [build] Improve builds with different MS Visual Studio versions. - - * builds/windows/vc2010/freetype.vcxproj: Switch platform toolset - according to the Visual Studio version. - -2017-09-11 Werner Lemberg <wl(a)gnu.org> - - * src/sfnt/ttkern.c (tt_face_load_kern): Reject format 2 tables. - - Reported by Behdad. - -2017-09-09 Werner Lemberg <wl(a)gnu.org> - - [autofit] Improve communication with ftgrid. - - * src/autofit/afhints.c (af_glyph_hints_get_segment_offset): - Provide values in font units. - -2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - - [base] Remove a check for resource ID in the resource fork driver. - - LastResort.dfont has a marginal resource ID 0xFFFF for sfnt - resource. Inside Macintosh: More Macintosh Toolbox, `Resource IDs' - (1-46), tells that some IDs are reserved and should not be used. - FreeType2 just uses resource ID to sort the fragmented resource. - To accept the marginal fonts, the checking is removed. - - * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Remove res_id - validity check, fix a trace message format. - -2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - - [sfnt, truetype] Register the tags for marginal fonts. - - The first 32bit of standard TrueType variants is 0x00010000, - `OTTO', `ttcf', `true' or `typ1'. 2 marginal dfonts on legacy Mac - OS X, Keyboard.dfont and LastResort.dfont, have the sfnt resources - starting 0xA5 followed by `kbd' or `lst'. Considering the following - data could be parsed as conventional TrueType fonts, the header - checking is updated to allow these tags. It seems that recent Mac - OS X has already switched to normal TTF for these fonts. - - See the discussion at - http://u88.n24.queensu.ca/exiftool/forum/index.php?topic=3931.0 - - * include/freetype/tttags.h (TTAG_0xA5kbd, TTAG_0xA5lst): New header - tags for Keyboard.dfont and LastResort.dfont. - * src/sfnt/sfobjs.c (sfnt_open_font): Accept the sfnt resource - starts with TTAG_0xA5kbd or TTAG_0xA5lst. - * src/truetype/ttobjs.c (tt_face_init): Accept the face with the - format tag is TTAG_0xA5kbd or TTAG_0xA5lst. - -2017-09-05 Werner Lemberg <wl(a)gnu.org> - - Fix multiple calls of `FT_Bitmap_Convert'. - - The documentation of `FT_Bitmap_Convert' says that multiple calls do - proper reallocation of the target FT_Bitmap object. However, this - failed for the sequence - - non-empty bitmap - empty bitmap - non-empty bitmap - - Reason was that `FT_Bitmap_Convert' only reallocated the bitmap - buffer if it became too small; it didn't make the buffer smaller. - For an empty bitmap following a non-empty one, only the buffer - dimension got set to zero, without deallocation. If the next call - was a non-empty buffer again, an assertion in `ft_mem_qrealloc' was - triggered. - - * src/base/ftbitmap.c (FT_Bitmap_Convert): Always reallocate target - buffer to the correct size. - - * docs/CHANGES: Document it. - -2017-09-05 Werner Lemberg <wl(a)gnu.org> - - [bdf] Fix size and resolution handling. - - * src/bdf/bdfdrivr.c (BDF_Face_Init): Use `SIZE' values if - `POINT_SIZE', `RESOLUTION_X', or `RESOLUTION_Y' properties are - missing. - - * docs/CHANGES: Document it. - -2017-08-25 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - Swap `ALLOC_MULT' arguments (#51833). - - * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Updated. - * src/winfonts/winfnt.c (FNT_Load_Glyph): Updated. - * src/raster/ftrend1.c (ft_raster1_render): Updated. - -2017-08-23 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Fix clang compilation (#51788). - - * src/sfnt/pngshim.c (premultiply_data): Use vectors instead of - scalars. - (vector_shuffle): New macro to take care of a different built-in - function name on clang. - -2017-08-22 Werner Lemberg <wl(a)gnu.org> - - [base] Don't zero out allocated memory twice (#51816). - - Patch applied from bug report. - - * src/base/ftutil.c (ft_mem_qrealloc): Use low-level allocation to - avoid unnecessary overhead. - -2017-08-22 Werner Lemberg <wl(a)gnu.org> - - [truetype] Integer overflow. - - Changes triggered by - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3107 - - * src/truetype/ttinterp.c (Ins_MDRP, Ins_MIRP, Ins_ALIGNPTS): Use - NEG_LONG. - -2017-08-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [sfnt] Avoid synthetic unicode for symbol fonts with PUA. - - Reported as - - https://bugs.chromium.org/p/chromium/issues/detail?id=754574 - - * src/sfnt/sfobjs.c (sfnt_load_face): Check for FT_ENCODING_MS_SYMBOL. - -2017-08-16 Werner Lemberg <wl(a)gnu.org> - - * src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings. - -2017-08-15 Behdad Esfahbod <behdad(a)behdad.org> - - [sfnt] Speed up PNG image loading. - - This reduces the overhead of `premultiply_data' by 60%. - - * src/sfnt/pngshim.c (premultiply_data): Provide code which uses - gcc's (and clang's) `vector_byte' attribute to process 4 pixels at a - time. - -2017-08-11 Werner Lemberg <wl(a)gnu.org> - - [sfnt, truetype] Improve handling of missing sbits. - - Requested by Behdad. - - Modern bitmap-only SFNTs like `NotoColorEmoji.ttf' don't contain - entries in the bitmap strike(s) for empty glyphs. Instead, they - rely that a space glyph gets created from the font's metrics data. - This commit makes FreeType behave accordingly. - - * include/freetype/fterrdef.h (FT_Err_Missing_Bitmap): New error - code. - - * src/sfnt/ttsbit.c (tt_sbit_decoder_load_image): Change error codes - to make a distinction between a missing bitmap in a composite and a - simple missing bitmap. - - * src/truetype/ttgload.c (TT_Load_Glyph): For a missing bitmap (in a - bitmap-only font), synthesize an empty bitmap glyph if metrics are - available. - -2017-08-10 Werner Lemberg <wl(a)gnu.org> - - [base] Minor API improvement for default variation axis setting. - - * src/base/ftmm.c (FT_Set_MM_Design_Coordinates, - FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, - FT_Set_Var_Blend_Coordinates): Allow coords==NULL if num_coords==0. - - * docs/CHANGES: Updated. - -2017-08-08 Werner Lemberg <wl(a)gnu.org> - - [psnames] Really fix issue #49949. - - We now use a separate preprocessor macro to handle both definition - and declaration of the glyph name arrays. - - * src/psnames/psmodule.c (DEFINE_PS_TABLE_DATA): New macro. - - * src/tools/glnames.py (StringTable::dump, - StringTable::dump_sublist): Use `DEFINE_PS_TABLE_DATA'. - (dump_encoding): Ditto. - (main): Use `wb' mode for writing the output file, which works on - Windows also. - - * src/psnames/pstables.h: Regenerated. - -2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [smooth] Harmony LCD rendering. - - This is a new technology for LCD-optimized rendering. It capitalizes - on the fact that each color channel grid is shifted by a third of a - pixel. Therefore it is logical to render 3 separate monochrome - bitmaps shifting the outline by 1/3 pixel, and then combine them. - Importantly, the resulting output does not require additional LCD - filtering. - - * src/smooth/ftsmooth.c (ft_smooth_render_generic) - [!FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Implement new LCD-optimized - rendering. - - * include/freetype/ftlcdfil.h, include/freetype/freetype.h, - include/freetype/config/ftoption.h, devel/ftoption.h: Updated - documentation. - -2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Clean up. - -2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/sfnt/ttpost.c (format): Use otspec-compliant versions. - -2017-08-05 Werner Lemberg <wl(a)gnu.org> - - [truetype] Integer overflow. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2868 - - * src/truetype/ttinterp.c (Ins_ALIGNRP): Use NEG_LONG. - -2017-08-05 Werner Lemberg <wl(a)gnu.org> - - [base, truetype] New function `FT_Get_Var_Axis_Flags'. - - The reserved `flags' field got a value in OpenType version 1.8.2; - unfortunately, the public `FT_Var_Axis' structure misses the - corresponding element. Since we can't add a new field, we add an - access function. - - * src/base/ftmm.c (FT_Get_Var_Axis_Flags): New function. - - * include/freetype/ftmm.h (FT_VAR_AXIS_FLAG_HIDDEN): New macro. - Updated. - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Increase allocated memory - of `mmvar' to hold axis flags. - Fill the axis flags array. - - * docs/CHANGES: Updated. - -2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> - - [truetype] Fix metrics of B/W hinting in v40 mode. - - Phantom points are now saved outside v40 backwards compatibility - mode. This fixes the jumping glyphs when switching between v35 and - v40 monochrome mode. - - * src/truetype/ttgload.c (TT_Hint_Glyph): Fix inversed bool logic. - -2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> - - [truetype] Do not set any ClearType flags in v40 monochrome mode. - - This fixes weird behavior of instructions that resulted in rendering - differences between v35 and v40 in monochrome mode, e.g., in - `timesbi.ttf'. - - * src/truetype/ttinterp.c (Ins_GETINFO) - [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Check - `subpixel_hinting_lean'. - -2017-08-01 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko. - -2017-08-01 Behdad Esfahbod <behdad(a)behdad.org> - - [truetype] Fix loading of named instances. - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Preserve file position - while loading the `avar' table. - -2017-08-01 Werner Lemberg <wl(a)gnu.org> - - [sfnt, truetype] Minor adjustments for OpenType 1.8.2. - - * src/sfnt/sfobjs.c (sfnt_load_face): The units per EM value has now - (tighter) limits. - - * src/truetype/ttgload.c (load_truetype_glyph): The new OpenType - version explicitly allows all negative values for the number of - contours if we have a composite glyph (this is for better backwards - compatibility I guess), but it still recommends value -1. - -2017-07-26 Werner Lemberg <wl(a)gnu.org> - - [cff] Integer overflow. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2738 - - * src/cff/cf2hints.c (cf2_glyphpath_computeOffset, - cf2_glyphpath_curveTo): Use ADD_INT32. - -2017-07-13 Werner Lemberg <wl(a)gnu.org> - - [base] Fix memory leak. - - Reported as - - https://bugs.chromium.org/p/chromium/issues/detail?id=738362 - - * src/base/ftglyph.c (FT_Get_Glyph): Do proper deallocation in case - of error. - -2017-07-12 Werner Lemberg <wl(a)gnu.org> - - [base] Integer overflow. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2573 - - * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use - FT_PIX_CEIL_LONG and FT_PIX_ROUND_LONG. - -2017-07-12 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttpload.c (tt_face_get_location): Off-by-one typo. - - Also improve tracing message. - - Problem reported as - - https://bugs.chromium.org/p/chromium/issues/detail?id=738919 - -2017-07-07 Werner Lemberg <wl(a)gnu.org> - - [cff] Integer overflow. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2517 - - * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32. - -2017-07-05 Werner Lemberg <wl(a)gnu.org> - - * src/sfnt/ttcmap.c (tt_cmap_unicode_class_rec): Fix warning. - -2017-07-05 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Fix warning (#51395). - -2017-07-04 Werner Lemberg <wl(a)gnu.org> - - [truetype] Prevent address overflow (#51365). - - * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Add guard. - -2017-07-03 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/base/ftlcdfil.c (ft_lcd_filter_fir): Improve code. - -2017-07-03 Werner Lemberg <wl(a)gnu.org> - - [truetype] Integer overflow. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2455 - - * src/truetype/ttinterp.c (Ins_SCFS): Use SUB_LONG. - -2017-07-01 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/sfnt/sfobjs.c (sfnt_load_face): Ignore No_Unicode_Glyph_Name. - -2017-06-28 Ben Wagner <bungeman(a)google.com> - - Avoid Microsoft compiler warnings (#51331). - - While clang's sanitizer recommends a cast to unsigned for safe - negation (to handle -INT_MIN), both MSVC and Visualc emit warning - C4146 if an unsigned value gets negated. - - * include/freetype/internal/ftcalc.h (NEG_LONG, NEG_INT32), - src/base/ftcalc.c (FT_MOVE_SIGN): Replace negation with a - subtraction. - -2017-06-27 Werner Lemberg <wl(a)gnu.org> - - * src/cff/cffparse.c (do_fixed): Fix typo. - - Spotted by chris <chris(a)gcjd.org>. - -2017-06-27 Werner Lemberg <wl(a)gnu.org> - - [truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2384 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2391 - - * src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix): Use - NEG_LONG. - - * src/truetype/ttinterp.c (Ins_SxVTL): Use NEG_LONG. - -2017-06-24 Werner Lemberg <wl(a)gnu.org> - - [truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2364 - - * src/truetype/ttinterp.c (Ins_ISECT): Use NEG_LONG. - -2017-06-22 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2323 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2328 - - * src/cff/cf2blues.c (cf2_blues_capture): Use ADD_INT32 and - SUB_INT32. - - * src/truetype/ttinterp.c (Ins_SDPVTL): Use SUB_LONG and NEG_LONG. - -2017-06-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [sfnt] Synthesize a Unicode charmap if one is missing. - - * src/sfnt/ttcmap.h (tt_cmap_unicode_class_rec): Declare it. - * src/sfnt/ttcmap.c (tt_get_glyph_name, tt_cmap_unicode_init, - tt_cmap_unicode_done, tt_cmap_unicode_char_index, - tt_cmap_unicode_char_next, tt_cmap_unicode_class_rec): Implement - synthetic Unicode charmap class. - (tt_get_cmap_info): Make sure the callback is available. - - * src/sfnt/sfobjs.c (sfnt_load_face) - [FT_CONFIG_OPTION_POSTSCRIPT_NAMES]: If Unicode charmap is missing, - synthesize one. - - * include/freetype/config/ftoption.h: Document it. - * devel/ftoption.h: Ditto. - -2017-06-20 Tony Theodore <tonyt(a)logyst.com> - - Fix pkg-config in freetype-config for cross-compiling (#51274). - - * builds/unix/unix-def.in (PKG_CONFIG): New variable. - (freetype-config): Use it in sed expression. - - * builds/unix/freetype-config.in: s/pkg-config/%PKG_CONFIG%/. - -2017-06-20 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2300 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2313 - - * src/cff/cf2hints.c (cf2_hintmap_adjustHints): Use ADD_INT32. - - * src/truetype/ttinterp.c (Ins_ABS): Avoid FT_ABS. - -2017-06-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [base, smooth] LCD filtering cleanups. - - * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy): - Clean up, start filtering from the bottom-left origin. - - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Updated. - -2017-06-16 Werner Lemberg <wl(a)gnu.org> - - [truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2270 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2276 - - * src/truetype/ttinterp.c (Ins_MDRP, _iup_worker_interpolate): Use - ADD_LONG and SUB_LONG. - -2017-06-15 Werner Lemberg <wl(a)gnu.org> - - [bdf, cff] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2244 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2261 - - * src/bdf/bdfdrivr.c (BDF_Face_Init): Replace calls to FT_ABS with - direct code to avoid value negation. - - * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32 and - ADD_INT32. - -2017-06-13 Werner Lemberg <wl(a)gnu.org> - - * src/winfonts/winfnt.c (FNT_Face_Init): Don't set active encoding. - - FreeType only sets a default active encoding for Unicode. - -2017-06-13 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2216 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2218 - - * src/cff/cf2fixed.h (cf2_fixedAbs): Use NEG_INT32. - - * src/truetype/ttinterp.c (Ins_IP): Use SUB_LONG. - -2017-06-11 Werner Lemberg <wl(a)gnu.org> - - [cff] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2200 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2210 - - * src/cff/cf2hints.c (cf2_hintmap_insertHint): Use SUB_INT32 and - ADD_INT32. - - * src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO>: Use - ADD_INT32. - -2017-06-10 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix TT_Set_Var_Design. - - Reported by Nikolaus Waxweiler <madigens(a)gmail.com>. - - * src/truetype/ttgxvar.c (TT_Set_Var_Design): Correctly handle the - case where we have less input coordinates than axes. - -2017-06-10 Werner Lemberg <wl(a)gnu.org> - - * src/base/ftcalc.c (FT_DivFix): Fix embarrassing typo. - - Bug introduced 2017-05-28. - -2017-06-09 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2144 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2151 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2153 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2173 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2186 - - * src/cff/cf2blues.c (cf2_blues_init): Use SUB_INT32. - - * src/truetype/ttinterp.c (Round_None, Round_To_Grid, - Round_To_Half_Grid, Round_Down_To_Grid, Round_Up_To_Grid, - Round_To_Double_Grid, Round_Super, Round_Super_45): Use ADD_LONG, - SUB_LONG, NEG_LONG, FT_PIX_ROUND_LONG, FT_PIX_CEIL_LONG, - FT_PAD_ROUND_LONG - (Ins_SxVTL, Ins_MIRP): Use SUB_LONG. - (_iup_worker_shift): Use SUB_LONG and ADD_LONG. - -2017-06-09 Werner Lemberg <wl(a)gnu.org> - - Provide more macros for flooring, ceiling, and rounding. - - These versions don't produce run-time errors due to integer - overflow. - - * include/freetype/internal/ftobjs.h: Include FT_INTERNAL_CALC_H. - (FT_PAD_ROUND_LONG, FT_PAD_CEIL_LONG, FT_PIX_ROUND_LONG, - FT_PIX_CEIL_LONG): New macros. - (FT_PAD_ROUND_INT32, FT_PAD_CEIL_INT32, FT_PIX_ROUND_INT32, - FT_PIX_CEIL_INT32): New macros. - -2017-06-09 Werner Lemberg <wl(a)gnu.org> - - Remove unused macros. - - * include/freetype/internal/ftcalc.h (ADD_INT, SUB_INT, MUL_INT, - NEG_INT): Deleted. - -2017-06-09 Werner Lemberg <wl(a)gnu.org> - - */*: Remove `OVERFLOW_' prefix. - - This increases readability. - -2017-06-07 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2133 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2137 - - * src/cff/cf2hints.c (cf2_hint_init): Use OVERFLOW_SUB_INT32. - - * src/truetype/ttinterp.c (PROJECT, DUALPROJ): Use - OVERFLOW_SUB_LONG. - -2017-06-06 Werner Lemberg <wl(a)gnu.org> - - [cff] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2109 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2110 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2122 - - * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. - - * src/cff/cf2hints.c (cf2_hintmap_map): Synchronize if-else - branches. - -2017-06-05 Werner Lemberg <wl(a)gnu.org> - - [cff] Integer overflow. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2089 - - * src/cff/cffload.c (cff_blend_doBlend): User OVERFLOW_ADD_INT32. - -2017-06-04 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2075 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2088 - - * src/cff/cf2font.c (cf2_font_setup): Use OVERFLOW_MUL_INT32. - - * src/truetype/ttinterp.c (Ins_ISECT): Use OVERFLOW_MUL_LONG, - OVERFLOW_ADD_LONG, and OVERFLOW_SUB_LONG. - -2017-06-03 Werner Lemberg <wl(a)gnu.org> - - [base, cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2060 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2062 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2063 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2068 - - * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use - OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. - - * src/cff/cf2blues.c (cf2_blues_capture), src/cff/cf2hints.c - (cf2_hintmap_adjustHints): Use OVERFLOW_SUB_INT32. - - * src/truetype/ttgload.c (compute_glyph_metrics): User - OVERFLOW_SUB_LONG. - - * src/truetype/ttinterp.c (Direct_Move, Direct_Move_Orig, - Direct_Move_X, Direct_Move_Y, Direct_Move_Orig_X, - Direct_Move_Orig_Y, Move_Zp2_Point, Ins_MSIRP): Use - OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. - -2017-06-03 Werner Lemberg <wl(a)gnu.org> - - * builds/unix/freetype-config.in: Fix pkg-config test (#51162). - - Patch directly taken from bug report. - -2017-06-03 Werner Lemberg <wl(a)gnu.org> - - [bdf] Synchronize sanity checks with pcf driver. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2054 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2058 - - * src/bdf/bdfdrivr.c (BDF_Face_Init): Check font ascent and descent. - Check AVERAGE_WIDTH, POINT_SIZE, PIXEL_SIZE, RESOLUTION_X, and - RESOLUTION_Y properties. - -2017-06-03 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2047 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2057 - - * src/cff/cf2hints.c (cf2_hintmap_map): Use OVERFLOW_SUB_INT32. - - * src/truetype/ttinterp.c (Ins_ADD): Use OVERFLOW_ADD_LONG. - (Ins_SUB): Use OVERFLOW_SUB_LONG. - (Ins_NEG): Use NEG_LONG. - -2017-06-03 Werner Lemberg <wl(a)gnu.org> - - ftcalc.h: Avoid left-shift of negative numbers. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2055 - - * include/freetype/internal/ftcalc.h (INT_TO_F26DOT6, - INT_TO_F2DOT14, INT_TO_FIXED, F2DOT14_TO_FIXED): Use multiplication. - -2017-06-02 Werner Lemberg <wl(a)gnu.org> - - [cff] Even more integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2046 - - * src/cff/cf2intrp.c (cf2_doStems, cf2_interpT2CharString): Use - OVERFLOW_ADD_INT32. - -2017-06-02 Werner Lemberg <wl(a)gnu.org> - - [cff] More integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2032 - - * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. - -2017-06-02 Werner Lemberg <wl(a)gnu.org> - - [bdf] Don't left-shift negative numbers. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2031 - - * src/bdf/bdfdrivr.c (BDF_Face_Init): Use multiplication. - -2017-06-02 Werner Lemberg <wl(a)gnu.org> - - [bdf] Fix integer scanning routines. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2029 - - * src/bdf/bdflib.c (_bdf_atoul, _bdf_atol, _bdf_atous, _bdf_atos): - Stop scanning if result would overflow. - -2017-06-02 Werner Lemberg <wl(a)gnu.org> - - [cff] Fix integer overflows. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2027 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2028 - - * src/cff/cf2hints.c (cf2_hintmap_insertHint), src/cff/cf2intrp.c - (cf2_doFlex): Use OVERFLOW_ADD_INT32 and OVERFLOW_SUB_INT32. - -2017-06-01 Werner Lemberg <wl(a)gnu.org> - - [smooth] Some 32bit integer overflow run-time errors. - - * src/smooth/ftgrays.c [STANDALONE] (OVERFLOW_ADD_LONG, - OVERFLOW_SUB_LONG, OVERFLOW_MUL_LONG, NEG_LONG): New macros. - [!STANDALONE]: Include FT_INTERNAL_CALC_H. - (gray_render_cubic): Use those macros where appropriate. - -2017-06-01 Werner Lemberg <wl(a)gnu.org> - - * src/base/ftglyph.c (FT_Get_Glyph): Check `slot->advance'. - -2017-06-01 Werner Lemberg <wl(a)gnu.org> - - [psaux] 32bit integer overflow tun-time errors (#46149). - - * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Use - OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG where appropriate. - -2017-06-01 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter again. - - Problem reported by Marek KaÅ¡Ãk <mkasik(a)redhat.com>. - - The problematic font that exceeds the old limit is Padauk-Bold, - version 3.002, containing bytecode generated by a buggy version of - ttfautohint. - -2017-05-31 Werner Lemberg <wl(a)gnu.org> - - [cff] 32bit integer overflow run-time errors 2/2 (#46149). - - This commit handles the new engine. - - * include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32, - OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG, - NEG_INT32): New macros. - - * src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32. - - * src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init, - cf2_hintmap_map, cf2_glyphpath_hintPoint, - cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset, - cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use - OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and - NEG_INT32 where appropriate. - - * src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend, - cf2_interpT2CharString): Ditto. - Also add some other code where needed to avoid overflow. - -2017-05-30 Werner Lemberg <wl(a)gnu.org> - - [cff] 32bit integer overflow run-time errors 1/2 (#46149). - - This commit handles the old engine. - - * src/cff/cffgload.c: Include FT_INTERNAL_CALC_H. - (cff_decoder_parse_charstrings): Use OVERFLOW_ADD_LONG and - OVERFLOW_SUB_LONG where needed. - - * src/cff/cffparse.c: Include FT_INTERNAL_CALC_H. - (power_ten_limits): New static array. - (do_fixed): Use it to prevent multiplication overflow. - (cff_parser_run): Use OVERFLOW_ADD_LONG. - -2017-05-30 Werner Lemberg <wl(a)gnu.org> - - [psaux] Correctly handle sequences of multiple number signs. - - * src/psaux/psconv.c (PS_Conv_Strtol, PS_Conv_ToFixed): Return zero - if we encounter more than a single sign. - -2017-05-29 Werner Lemberg <wl(a)gnu.org> - - [pcf] 32bit integer overflow run-time errors (#46149). - - * src/pcf/pcfread.c (pcf_get_accel): Add sanity checks for - `fontAscent' and `fontDescent'. - (pcf_load_font): Add sanity checks for global height. - Add sanity checks for AVERAGE_WIDTH, POINT_SIZE, PIXEL_SIZE, - RESOLUTION_X, and RESOLUTION_Y properties. - -2017-05-29 Werner Lemberg <wl(a)gnu.org> - - Handle some integer overflow run-time errors (#46149, #48979). - - This commit (mainly for 32bit CPUs) is the first of a series of - similar commits to handle known integer overflows. Basically, all - of them are harmless, since they affect rendering of glyphs only, - not posing security threats. It is expected that fuzzying will show - up more overflows, to be fixed in due course. - - The idea is to mark places where overflows can occur, using macros - that simply cast to unsigned integers, because overflow arithmetic - is well defined in this case. Doing so suppresses run-time errors - of sanitizers without adding computational overhead. - - * include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT, - OVERFLOW_SUB_INT, OVERFLOW_MUL_INT, OVERFLOW_ADD_LONG, - OVERFLOW_SUB_LONG, OVERFLOW_MUL_LONG): New macros. - - * src/base/ftcalc.c (FT_RoundFix, FT_CeilFix, FT_Matrix_Multiply, - FT_Matrix_Multiply_Scaled, FT_Vector_Transform_Scaled, - ft_corner_orientation): Use new macros. - - * src/base/ftoutln.c (FT_Outline_Get_Orientation): Use new macros. - -2017-05-28 Werner Lemberg <wl(a)gnu.org> - - * include/freetype/internal/ftcalc.h (FLOAT_TO_FIXED): Remove. - - This macro is not used. - -2017-05-28 Werner Lemberg <wl(a)gnu.org> - - [cff] s/cf2_floatToFixed/cf2_doubleToFixed/. - - The new name better describes what the macro actually does; - additionally, we don't need a trailing `f' for literals (there was - only a single such instance in the code, but this caused a clang - warning because the macro itself uses `double' literals). - - * src/cff/cf2blues.c, src/cff/cf2blues.h, src/cff/cf2fixed.h, - src/cff/cf2font.c, src/cff/cf2hints.c: Updated. - -2017-05-28 Werner Lemberg <wl(a)gnu.org> - - Fix negation of INT_MIN and LONG_MIN (#46149). - - * src/base/ftcalc.c (FT_MOVE_SIGN): Add argument to pass unsigned - value, to be used as the result. - (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix, FT_MulFix, - FT_Vector_NormLen): Updated. - -2017-05-27 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix handling of design coordinates (#51127). - - * src/truetype/ttgxvar.c (tt_set_mm_blend): Compute all design - coordinates if we have to create the `blends->coord' array. - (TT_Get_MM_Blend, TT_Get_Var_Design): Select default instance - coordinates if no instance is selected yet. - -2017-05-24 Werner Lemberg <wl(a)gnu.org> - - [bdf, pcf] Support ISO646.1991-IRV character encoding (aka ASCII). - - Problem reported by Marek KaÅ¡Ãk <mkasik(a)redhat.com>, cf. - - https://bugzilla.redhat.com/show_bug.cgi?id=1451795 - - * src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c - (PCF_Face_Init): Implement it. - -2017-05-20 Nikolaus Waxweiler <madigens(a)gmail.com> - - [truetype] Always use interpreter v35 for B/W rendering (#51051). - - * src/truetype/ttgload.c (tt_loader_init) - [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Adjust - `subpixel_hinting_lean', `grayscale_cleartype', and - `vertical_lcd_lean' accordingly. - - * src/truetype/ttinterp.c (Ins_GETINFO): Updated. - (TT_RunIns): Update `backward_compatibility' flag. - -2017-05-20 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [smooth] Implement minimal dynamic padding for LCD filtering. - - Extra bitmap padding for LCD filtering depends on the filter. The - default 5-tap filter needs 2 extra subpixels. The light 3-tap filter - needs only 1 extra subpixel. This space could be already available - due to rounding. In order to optimize the padding, we now expand - CBox for the given filter weights before rounding. - - This change breaks current Skia (and Firefox). - - * include/freetype/internal/ftobjs.h (FT_LibraryRec) - [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Remove `lcd_extra' field. - - * src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights, - FT_Library_SetLcdFilter): Remove `lcd_extra' initializations. - - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Implement dymanic - LCD padding. - -2017-05-15 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Return proper scaling values for SBIX bitmaps. - - Problem reported by Hin-Tak Leung <htl10(a)users.sourceforge.net>. - - * src/sfnt/ttsbit.c (tt_face_load_strike_metrics): Implement it. - -2017-05-15 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix error handling for embedded bitmaps. - - Problem reported by Hin-Tak Leung <htl10(a)users.sourceforge.net>. - - * src/truetype/ttgload.c (TT_Load_Glyph) - [TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Handle error if font is not - scalable. - -2017-05-15 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [autofit] Make autohint warping NORMAL option. - - This moves warping option from LIGHT to NORMAL mode. This makes LIGHT - truly void of hinting in x-direction, with left side bearing never - changed and right side bearing only altered by advance rounding. - Therefore, LIGHT is now ready to return fractional advance. As a - NORMAL option, warping substitutes normal hinting. - - * src/autofit/afcjk.c (af_cjk_hints_apply): Updated. - * src/autofit/aflatin.c (af_latin_hints_apply): Updated. - * src/autofit/aflatin2.c (af_latin2_hints_apply): Updated. - - * src/autofit/afloader.c (af_loader_load_glyph): Handle warping - phantom points as normal. - -2017-05-14 Werner Lemberg <wl(a)gnu.org> - - Remove remnants of raster pool. - - * include/freetype/internal/ftobjs.h (FT_LibraryRec): Remove - `raster_pool' and `raster_pool_size' fields. - - * src/base/ftobjs.c (FT_New_Library), src/raster/ftrend1.c - (ft_raster1_init), src/smooth/ftsmooth.c (ft_smooth_init): Updated. - -2017-05-13 Werner Lemberg <wl(a)gnu.org> - - * Version 2.8 released. - ======================= - - - Tag sources with `VER-2-8'. - - * docs/VERSION.TXT: Add entry for version 2.8. - * docs/CHANGES: Updated. - - * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, - builds/windows/vc2005/index.html, - builds/windows/vc2008/freetype.vcproj, - builds/windows/vc2008/index.html, - builds/windows/vc2010/freetype.vcxproj, - builds/windows/vc2010/index.html, - builds/windows/visualc/freetype.dsp, - builds/windows/visualc/freetype.vcproj, - builds/windows/visualc/index.html, - builds/windows/visualce/freetype.dsp, - builds/windows/visualce/freetype.vcproj, - builds/windows/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.7.1/2.8/, s/271/28/. - - * include/freetype/freetype.h (FREETYPE_MINOR): Set to 8. - (FREETYPE_PATCH): Set to 0. - - * builds/unix/configure.raw (version_info): Set to 20:0:14. - * CMakeLists.txt (VERSION_MINOR): Set to 8. - (VERSION_PATCH): Set to 0. - -2017-05-12 Hin-Tak Leung <htl10(a)users.sourceforge.net> - - Fix `FT_UINT_TO_POINTER' macro for Windows. - - * builds/unix/ftconfig.in, builds/vms/ftconfig.h, - include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER) [_WIN64]: - Fix definition. - -2017-05-11 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Chakma script. - - * src/autofit/afblue.dat: Add blue zone data for Chakma. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Chakma standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Chakma data. - -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Kayah Li script. - - * src/autofit/afblue.dat: Add blue zone data for Kayah Li. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Kayah Li standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Kayah Li data. - -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Bamum script. - - * src/autofit/afblue.dat: Add blue zone data for Bamum. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Bamum standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Bamum data. - -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Saurashtra script. - - * src/autofit/afblue.dat: Add blue zone data for Saurashtra. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Saurashtra standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Saurashtra - data. - -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Buhid script. - - * src/autofit/afblue.dat: Add blue zone data for Buhid. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Buhid standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Buhid data. - -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Shavian script. - - * src/autofit/afblue.dat: Add blue zone data for Shavian. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Shavian standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Shavian data. - -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Vai script. - - * src/autofit/afblue.dat: Add blue zone data for Vai. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Vai standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Vai data. - -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Osmanya script. - - * src/autofit/afblue.dat: Add blue zone data for Osmanya. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Osmanya standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Osmanya data. - -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Coptic script. - - * src/autofit/afblue.dat: Add blue zone data for Coptic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Coptic standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Coptic data. - -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Carian script. - - * src/autofit/afblue.dat: Add blue zone data for Carian. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Carian standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Carian data. - -2017-05-07 Werner Lemberg <wl(a)gnu.org> - - [truetype] Add tricky font `DFGirl-W6-WIN-BF' (from Dynalab). - - Reported by Roy Tam <roytam(a)gmail.com>. - - * src/truetype/ttobjs.c (tt_check_trickyness_family): Implement it. - -2017-05-07 Roy Tam <roytam(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - [truetype] More tricky fonts (mainly from Dynalab). - - * src/truetype/ttobjs.c (tt_check_trickyness_family, - tt_check_trickyness_sfnt_ids): Add them. - -2017-05-07 Werner Lemberg <wl(a)gnu.org> - - [truetype] Add tricky font `DLCHayMedium' (from Dynalab). - - Reported by Roy Tam <roytam(a)gmail.com>. - - * src/truetype/ttobjs.c (tt_check_trickyness_family): Implement it. - -2017-05-03 Werner Lemberg <wl(a)gnu.org> - - */*: s/backwards compatibility/backward compatibility/. - -2017-05-03 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Unified Canadian Syllabics script. - - * src/autofit/afblue.dat: Add blue zone data for Unified Canadian - Syllabics. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Unified Canadian Syllabics standard - character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Unified - Canadian Syllabics data. - -2017-05-03 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org> - - [autofit] Add blue-zone support for Sundanese script. - - This essentially moves the Sundanese script from the `Indic' hinter - to the `Latin' hinter. - - * src/autofit/afblue.dat: Add blue zone data for Sundanese. - - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Sundanese standard character and move - data out of AF_CONFIG_OPTION_INDIC block. - - * src/autofit/afranges.c: Move Sundanese data out of - AF_CONFIG_OPTION_INDIC block. - - * src/autofit/afstyles.h: Update Sundanese data; in particular, use - AF_WRITING_SYSTEM_LATIN. - -2017-05-03 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Avestan script. - - * src/autofit/afblue.dat: Add blue zone data for Avestan. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Avestan standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Avestan data. - -2017-05-02 Behdad Esfahbod <behdad(a)behdad.org> - - [truetype] Make `IUP' gvar deltas do the same as Apple (#50832). - - When points are not touched by gvar interpolation deltas, FreeType - gave a slightly different result than Apple's CoreText. - - The OpenType working group will update the specification to document - the following behaviour: If the two points with deltas to the `left' - and `right' of the untouched point have the same coordinate, then - the inferred delta for the untouched point should be zero. - - * src/truetype/ttgxvar.c (tt_delta_interpolate): Implement new - behaviour. - -2017-05-02 Werner Lemberg <wl(a)gnu.org> - - [autofit] Remove `slight' auto-hint mode again. - - A poll on freetype-devel favoured changes directly applied to - `light'. - - * include/freetype/freetype.h (FT_LOAD_TARGET_SLIGHT, - FT_RENDER_MODE_SLIGHT): Removed. - - * src/autofit/afcjk.c (af_cjk_hints_init), src/autofit/aflatin.c - (af_latin_hints_init), src/autofit/aflatin2.c - (af_latin2_hints_init): Revert change from 2017-04-22. - - * src/autofit/afloader.c (af_loader_load_glyph) Remove references to - FT_RENDER_MODE_SLIGHT. - [AF_CONFIG_OPTION_TT_SIZE_METRICS]: Enable TrueType-like metrics - unconditionally. - - * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Revert change from - 2017-04-22. - - * src/base/ftobjs.c (FT_Load_Glyph): Revert change from 2017-04-22. - - * src/pshinter/pshalgo.c (ps_hints_apply): Revert change from - 2017-04-22. - - * src/smooth/ftsmooth.c (ft_smooth_render): Revert change from - 2017-04-22. - - * docs/CHANGES: Updated. - -2017-04-30 Werner Lemberg <wl(a)gnu.org> - - [autofit] Fix metrics computation. - - Problem reported by Markus Trippelsdorf <markus(a)trippelsdorf.de> and - Nikolaus Waxweiler <madigens(a)gmail.com>. - - * src/base/ftobjs.c (FT_Request_Size): Trigger recomputation of - auto-hinter metrics. Without this change, multiple size changing - calls for a single face fail. - -2017-04-29 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttdriver.c (tt_size_request): Properly check `error'. - - Reported by Earnestly <zibeon(a)googlemail.com> in - - https://lists.nongnu.org/archive/html/freetype/2017-04/msg00031.html - -2017-04-27 Werner Lemberg <wl(a)gnu.org> - - Introduce AF_CONFIG_OPTION_TT_SIZE_METRICS configuration option. - - * include/freetype/config/ftoption.h - (AF_CONFIG_OPTION_TT_SIZE_METRICS): New option, commented out by - default. - - * src/autofit/afloader.c (af_loader_load_glyph): Use - AF_CONFIG_OPTION_TT_SIZE_METRICS to guard the corresponding code. - -2017-04-26 Werner Lemberg <wl(a)gnu.org> - - * include/freetype/freetype.h (FT_Render_Mode): Fix order. - - This retains backward compatibility. - - Noted by Alexei. - -2017-04-22 Werner Lemberg <wl(a)gnu.org> - - [truetype] Do linear scaling for FT_LOAD_NO_HINTING (#50470). - - * src/truetype/ttobjs.h (TT_SizeRec): Add field `hinted_metrics' to - hold hinted metrics. - Make `metrics' a pointer so that `tt_glyph_load' can easily switch - between metrics. - - * src/truetype/ttdriver.c (tt_size_request): Updated. - (tt_glyph_load): Use top-level metrics if FT_LOAD_NO_HINTING is - used. - - * src/truetype/ttgload.c (TT_Hint_Glyph, TT_Process_Simple_Glyph, - TT_Process_Composite_Component, load_truetype_glyph, - compute_glyph_metrics, TT_Load_Glyph): Updated. - - * src/truetype/ttinterp.c (TT_Load_Context): Updated. - - * src/truetype/ttobjs.c (tt_size_reset): Updated. - - * src/truetype/ttsubpix.c (sph_set_tweaks): Updated. - -2017-04-22 Werner Lemberg <wl(a)gnu.org> - - Add new `slight' auto-hinting mode. - - This mode uses fractional advance widths and doesn't scale glyphs - horizontally, only applying vertical scaling and hinting. - - At the same time, the behaviour of the `light' auto-hinter gets - restored for backward compatibility: Both vertical and horizontal - scaling is again based on rounded metrics values (this was changed - in a commit from 2017-03-30 as a side effect). To be more precise, - the behaviour is restored for TrueType fonts only; for other font - formats like Type 1, this is a new feature of the `light' hinting - mode. - - * include/freetype/freetype.h (FT_LOAD_TARGET_SLIGHT): New macro. - (FT_RENDER_MODE_SLIGHT): New render mode. - - * include/freetype/internal/ftobjs.h (FT_Size_InternalRec): Add - `autohint_mode' and `autohint_metrics' fields. - - * src/autofit/afcjk.c (af_cjk_hints_init), src/autofit/aflatin.c - (af_latin_hints_init), src/autofit/aflatin2 (af_latin2_hints_init): - Updated. - - * src/autofit/afloader.c (af_loader_embolden_glyph_in_slot): Use - `autohint_metrics'. - (af_loader_load_glyph): s/internal/slot_internal/. - Initialize `autohint_metrics' and `autohint_mode' depending on - current auto-hint mode. - Use `autohint_metrics'. - Updated. - - * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Updated. - - * src/base/ftobjs.c (FT_Load_Glyph): Updated. - (FT_New_Size): Allocate `internal' object. - - * src/pshinter/pshalgo.c (ps_hints_apply): Updated. - - * src/smooth/ftsmooth.c (ft_smooth_render): Updated. - -2017-04-22 Werner Lemberg <wl(a)gnu.org> - - Introduce `FT_Size_InternalRec' structure. - - We are going to extend this later on. - - * include/freetype/internal/ftobjs.h (FT_Size_InternalRec): New - structure with a single field `module_data'. - - * src/base/ftobjs.c (FT_New_Size): Allocate `internal' field of - `FT_Size' structure. - - * src/cff/cffgload.c (cff_builder_init, cff_decoder_prepare): Use - `size->internal->module_data' instead of `size->internal'. - - * src/cff/cffobjs.c (cff_size_done): Deallocate `module_data'. - (cff_size_init, cff_size_select, cff_size_request): Use - `size->internal->module_data' instead of `size->internal'. - - * src/cif/cidobjs.c (cid_size_done, cid_size_init, - cid_size_request): Use `size->internal->module_data' instead of - `size->internal'. - - * src/psaux/psobjs.c (t1_builder_ini): Use - `size->internal->module_data' instead of `size->internal'. - - * src/type1/t1objs.c (T1_Size_Done, T1_Size_Init, T1_Size_Request): - Use `size->internal->module_data' instead of `size->internal'. - -2017-04-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftsmooth.h: Remove unused guards and declaration. - -2017-04-16 Hin-Tak Leung <htl10(a)users.sourceforge.net> - - Fix tracing messages. - - * src/base/ftobjs.c (FT_Face_GetCharVariantIndex, - FT_Face_GetCharVariantIsDefault, FT_Face_GetVariantsOfChar): Print - correct function name. - -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Old Turkic script. - - * src/autofit/afblue.dat: Add blue zone data for Old Turkic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Old Turkic standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Old Turkic data. - -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Gothic script. - - * src/autofit/afblue.dat: Add blue zone data for Gothic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Gothic standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Gothic data. - -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Cypriot script. - - * src/autofit/afblue.dat: Add blue zone data for Cypriot. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Cypriot standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Cypriot data. - -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Deseret script. - - * src/autofit/afblue.dat: Add blue zone data for Deseret. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Deseret standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Deseret data. - -2017-04-07 Werner Lemberg <wl(a)gnu.org> - - [autofit] Fix invalid character range description (#50745). - - Also reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1034 - - * src/autofit/afranges.c (af_glag_nonbase_uniranges): Fix typo in - recent commit. - -2017-04-07 Werner Lemberg <wl(a)gnu.org> - - [ftfuzzer] Fix clang warnings. - - * src/tools/ftfuzzer/ftfuzzer.cc (LLVMFuzzerTestOneInput): Add - casts. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Lisu script. - - * src/autofit/afblue.dat: Add blue zone data for Lisu. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Lisu standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Lisu data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Osage script. - - * src/autofit/afblue.dat: Add blue zone data for Osage. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Osage standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Osage data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Glagolitic script. - - * src/autofit/afblue.dat: Add blue zone data for Glagolitic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Glagolitic standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Glagolitic data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Tai Viet script. - - * src/autofit/afblue.dat: Add blue zone data for Tai Viet. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Tai Viet standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Tai Viet data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for Tifinagh script. - - * src/autofit/afblue.dat: Add blue zone data for Tifinagh. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Tifinagh standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Tifinagh data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org - - [autofit] Add support for N'Ko script. - - * src/autofit/afblue.dat: Add blue zone data for N'Ko. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add N'Ko standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add N'Ko data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - - [autofit] Add support for Adlam script. - - * src/autofit/afblue.dat: Add blue zone data for Adlam. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Adlam standard characters. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Adlam data. - -2017-04-06 Sascha Brawer <sascha(a)google.com> - - [autofit] Add support for Ol Chiki script. - - * src/autofit/afblue.dat: Add blue zone data for Ol Chiki. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - - * src/autofit/afscript.h: Add Ol Chiki standard character. - - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Ol Chiki data. - -2017-04-03 Werner Lemberg <wl(a)gnu.org> - - [truetype] Avoid reexecution of `fpgm' and `prep' in case of error. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=981 - - * include/freetype/fterrdef.h (FT_Err_DEF_In_Glyf_Bytecode): New - error code. - - * src/truetype/ttinterp.c (Ins_FDEF, Ins_IDEF): Prohibit execution - of these two opcodes in `glyf' bytecode. - (TT_RunIns): Don't enforce reexecution of `fpgm' and `prep' bytecode - in case of error since function tables can no longer be modified - (due to the changes in `Ins_FDEF' and `Ins_IDEF'). This change can - enormously speed up handling of broken fonts. - -2017-04-02 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [autofit] Disable metrics adjustment for `FT_LOAD_TARGET_LCD'. - - * src/autofit/aflatin.c (af_latin_hints_init): Updated. - * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto. - -2017-04-01 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttgload.c: Include FT_CONFIG_CONFIG_H. - - Otherwise FT_UINT_TO_POINTER might not be defined. - - Problem reported by Alexei. - -2017-03-31 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - [autofit] Disable stem adjustment for `FT_LOAD_TARGET_LCD'. - - * include/freetype/freetype.h (FT_LOAD_TARGET_LCD): Document it. - * src/autofit/afcjk.c (af_cjk_hints_init): Updated. - * src/autofit/aflatin.c (af_latin_hints_init): Ditto. - * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto. - -2017-03-31 Werner Lemberg <wl(a)gnu.org> - - * src/cff/cffload.c (cff_font_load): Improve fix from 2017-01-04. - - Allow CFFs containing a single font to have an empty font name. - - Problem reported by åŒµä¿è <418092625(a)qq.com> in - - https://lists.nongnu.org/archive/html/freetype-devel/2017-03/msg00074.html - -2017-03-30 Werner Lemberg <wl(a)gnu.org> - - * src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also. - - Requested by Dave Arnold. - -2017-03-30 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix HVAR and VVAR handling (#50678). - - * src/truetype/ttgxvar.c (tt_hvadvance_adjust): Handle - glyph indices larger than `mapCount' as described in the - specification. - -2017-03-30 Werner Lemberg <wl(a)gnu.org> - - [truetype] Allow linear scaling for unhinted rendering (#50470). - - * src/truetype/ttdriver.c (tt_size_request): Revert change from - 2011-07-16; the intended metrics fix seems now to be implemented in - a different way, making the patch unnecessary. Note that this - change was usually patched out by all major GNU/Linux distributions - due to heavy side effects. - - * src/truetype/ttgload.c (compute_glyph_metrics, TT_Load_Glyph): - Refer to the metrics of the `TT_Size' object. - -2017-03-29 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix thinko related to PS name of default named instance. - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): `strid' and `psid' are - name ID values, not indices into the array of name entries. - -2017-03-27 Werner Lemberg <wl(a)gnu.org> - - [cid, truetype] Don't use `index' as a variable name. - - At least on FreeBSD there is a global declaration of `index' in file - `/usr/include/strings.h'. - - * src/cff/cf2intrp.c, src/truetype/ttgload.c: s/index/idx/ where - appropriate. - -2017-03-27 Wojciech Mamrak <wmamrak(a)gmail.com> - - [sfnt] Minor improvement for handling kern tables. - - * src/sfnt/ttkern.c (tt_face_load_kern): Don't check for - cross-stream kerning tables since we reject format 2 tables later - on anyways. - Modify code for limit test... - (tt_face_get_kerning): ... to avoid a limit test here. - -2017-03-27 Werner Lemberg <wl(a)gnu.org> - - [pcf] Fix compiler warnings. - - Reported by Alexander Hedges <ahedges(a)student.ethz.ch>. - - * src/pcf/pcfdrivr.c (pcf_property_set, pcf_property_get): Tag - `property_name' with `FT_UNUSED' where necessary. - -2017-03-26 Werner Lemberg <wl(a)gnu.org> - - * src/psaux/psobjs.c (t1_builder_close_contour): Add safety guard. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941 - -2017-03-23 Werner Lemberg <wl(a)gnu.org> - - [psaux] Better protect `flex' handling. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935 - - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - <callothersubr>: Since there is not a single flex operator but a - series of subroutine calls, malformed fonts can call arbitrary other - operators after the start of a flex, possibly adding points. For - this reason we have to check the available number of points before - inserting a point. - -2017-03-23 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Fix check for default named instance. - - * src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four - bytes, not two... - -2017-03-23 Werner Lemberg <wl(a)gnu.org> - - Make MM fonts work (again). - - * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore - return value of `ft_face_get_mvar_service'; instead, check whether a - service is actually returned. - -2017-03-20 Werner Lemberg <wl(a)gnu.org> - - [truetype] Some variable renamings. - - Too much local variables holding different structures were called - `metrics'. - - * src/truetype/ttdriver.c (tt_size_select): s/metrics/size_metrics/. - - * src/truetype/ttgload.c (tt_get_metrics_incr_overrides, - compute_glyph_metrics): s/metrics/incr_metrics/. - (load_sbit_image): s/metrics/sbit_metrics/. - - * src/truetype/ttobjs.c (tt_size_run_fpgm): s/metrics/size_metrics/. - (tt_size_init_bytecode): s/metrics/tt_metrics/. - (tt_size_reset): s/metrics/size_metrics/. - -2017-03-20 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Don't add instances to non-variation fonts. - - * src/sfnt/sfobjs.c (sfnt_init_face): Fix it. - -2017-03-20 Werner Lemberg <wl(a)gnu.org> - - * src/cff/cffgload.c (cff_builder_init): Add safety guard (#50578). - -2017-03-18 Werner Lemberg <wl(a)gnu.org> - - Introduce FT_UINT_TO_POINTER macro (#50560). - - We have to make a separate case for Windows 64's LLP64 data model. - - * builds/unix/ftconfig.in, builds/vms/ftconfig.h, - include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER): New macro. - - * src/truetype/ttgload.c (load_truetype_glyph): Use it. - -2017-03-18 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter (#50573). - - The problematic font that exceeds the old limit is Lato-Regular, - version 2.007, containing bytecode generated by a buggy version of - ttfautohint. - -2017-03-18 Werner Lemberg <wl(a)gnu.org> - - [truetype] Another limitation for bytecode loop count maximum. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=900 - - * src/truetype/ttinterp.c (TT_RunIns): Limit `loopcall_counter_max' - by number of glyphs also. - -2017-03-18 Werner Lemberg <wl(a)gnu.org> - - [ftfuzzer] Minor improvement. - - * src/tools/ftfuzzer/ftfuzzer.cc: Don't set intermediate axis if - bitmap strikes are active. - -2017-03-18 Werner Lemberg <wl(a)gnu.org> - - Improve `make multi'. - - * src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2. - - * src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH. - - * src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM. - - * src/sfnt/pngshim.c: Guard file with - TT_CONFIG_OPTION_EMBEDDED_BITMAPS also. - - * src/sfnt/ttbdf.c: Avoid empty source file. - * src/sfnt/ttpost.c: Guard file with - TT_CONFIG_OPTION_POSTSCRIPT_NAMES. - * src/sfnt/ttsbit.c: Guard file with - TT_CONFIG_OPTION_EMBEDDED_BITMAPS. - - * src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty - source file. - - * src/truetype/ttsubpix.c: Guard file with - TT_USE_BYTECODE_INTERPRETER also. - - * src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM. - - * src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c, - src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c, - src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c, - src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c, - src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c, - src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort - entries. - -2017-03-17 Werner Lemberg <wl(a)gnu.org> - - Fixes for conditional compilation. - - * src/autofit/afcjk.c, src/autofit/afindic.c: Include `afcjk.h' - earlier. - - * src/sfnt/sfobjs.c (sfnt_init_face): Put `memory' variable into - TT_CONFIG_OPTION_GX_VAR_SUPPORT block. - (sfnt_done_face): Protect some code with - TT_CONFIG_OPTION_GX_VAR_SUPPORT. - - * src/sfnt/ttsbit.c (tt_face_load_sbix_image): Remove compiler - warning. - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Put `tmp' variable - into TT_USE_BYTECODE_INTERPRETER block. - - (tt_loader_init): Put `error' variable into - TT_USE_BYTECODE_INTERPRETER block. - -2017-03-17 Werner Lemberg <wl(a)gnu.org> - - Fix preprocessor warning. - - * devel/ftoption.h, include/freetype/config/ftoption.h: Test whether - TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined before checking its - value. - -2017-03-17 Werner Lemberg <wl(a)gnu.org> - - `make multi' fixes; compiler warnings. - - * src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H. - - * src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include - FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H. - - * src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include - FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H. - (get_win_string, get_apple_string): Initialize `result'. - -2017-03-17 Dave Arnold <darnold(a)adobe.com> - - [cff] Fix potential bugs in default NDV for CFF2. - - * src/cff/cffload.c (cff_blend_build_vector): Explicitly build blend - vector when `lenNDV' is zero; don't rely on zero-init. - Save `lenNDV' as part of cache key even when `lenNDV' is zero. - -2017-03-17 Dave Arnold <darnold(a)adobe.com> - - [cff] Fix CFF2 stack allocation. - - * src/cff/cffparse.c (cff_parser_init) add 1 for operator. - -2017-03-16 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttgxvar.c (tt_done_blend): Free `vvar_table'. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=883 - -2017-03-15 Werner Lemberg <wl(a)gnu.org> - - Remove clang compiler warnings (#50548). - - * include/freetype/internal/tttypes.h (TT_FaceRec): Make - `var_postscript_prefix_len' unsigned. - - * src/autofit/afwarp.c (af_warper_compute_line_best): Remove - redundant assignment. - - * src/cff/cffload.c (cff_subfont_load): Add casts. - - * src/cff/cffparse.c (cff_parse_blend): Remove redundant assignment. - - * src/sfnt/sfdriver.c (fmix32, murmur_hash_3_128): Add `static' - keyword. - Add casts. - (fixed2float): Add cast. - (sfnt_get_var_ps_name): Make `p' always initialized. - Add casts. - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Add casts. - -2017-03-15 Werner Lemberg <wl(a)gnu.org> - - [ftfuzzer] Limit number of tested faces and instances. - - This is inspired by the discussion in and analysis of - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=859 - - * src/tools/ftfuzzer/ftfuzzer.cc (LLVMFuzzerTestOneInput): Use only - up to 20 face indices. - Use only up to 20 instance indices. - -2017-03-15 Werner Lemberg <wl(a)gnu.org> - - * src/tools/ftfuzzer/ftfuzzer.cc: Improve readability; formatting. - -2017-03-14 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Implement PS names for font instances [3/3]. - - Everything is guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT. - - * include/freetype/internal/tttypes.h (TT_FaceRec): New fields - `var_postscript_prefix' and `var_postscript_prefix_len'. - - * src/sfnt/sfdriver.c: Include FT_TRUETYPE_IDS_H. - (sfnt_is_alphanumeric): New wrapperfunction for `ft_isalnum'. - (get_win_string, get_apple_string): Remove `const' from return - value. - (MAX_VALUE_DESCRIPTOR_LEN, MAX_PS_NAME_LEN): New macros. - (hexdigits): New array. - (sfnt_get_var_ps_name): New function, implementing Adobe TechNote - 5902 to construct a PS name for a variation font instance. - (sfnt_get_ps_name): Call `sfnt_get_var_ps_name' for font instances. - - * src/sfnt/sfobjs.c (sfnt_done_face): Updated. - - * src/truetype/ttgxvar.c (tt_set_mm_blend): Reset - `face->postscript_name' to trigger recalculation for new instance - parameters. - -2017-03-14 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Implement PS names for font instances [2/3]. - - * src/sfnt/sfdriver.c (fix2float) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: - New function to find the shortest representation of a 16.16 - fractional number. - -2017-03-14 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Implement PS names for font instances [1/3]. - - Add 128bit MurmurHash 3 function. - - Everything is guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT. - - * src/sfnt/sfdriver.c (ROTL32): New macro. - (fmix32, murmur_hash_3_128): New functions. - -2017-03-13 Werner Lemberg <wl(a)gnu.org> - - [truetype] Ignore invalid MVAR tags. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=838 - - * src/truetype/ttgxvar.c (ft_var_load_mvar): Ignore value and emit - warning for invalid tags. - (tt_apply_mvar): Ignore invalid tags. - -2017-03-12 Werner Lemberg <wl(a)gnu.org> - - [truetype] Store and use design coordinates also. - - * include/freetype/internal/services/svmm.h (FT_Get_Var_Blend_Func): - Add `normalizedcoords' argument. - - * src/truetype/ttgxvar.h (GX_BlendRec): Add `coords' field to store - the design coordinates of the current instance. - Updated. - - * src/truetype/ttgxvar.c (TT_Set_MM_Blend): Move functionality to... - (tt_set_mm_blend): ... New function. - Convert data in `normalizedcoords' array to `coords' array on - demand. - (TT_Set_Var_Design): Store argument data in `coords' array. - (TT_Get_Var_Design): Get data from `coords' array. - (tt_get_var_blend): Updated. - (tt_done_blend): Updated. - - * src/cff/cffload.c, src/cff/cffload.h (cff_get_var_blend): Updated. - - * src/cff/cf2ft.c (cf2_getNormalizedVector): Updated. - - * src/cff/cffobjs.c (cff_face_init): Updated. - -2017-03-12 Werner Lemberg <wl(a)gnu.org> - - src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/. - -2017-03-08 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Another fix for buggy variation fonts. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=759 - - * src/sfnt/sfobjs.c (sfnt_init_face): While setting number of - instances to zero for `CFF' fonts table, ensure that there is no - `CFF2' present also (which gets priority). - -2017-03-07 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Improve handling for buggy variation fonts. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=738 - - * src/sfnt/sfobjs.c (sfnt_init_face): While setting number of - instances to zero for `CFF' fonts table, ensure that there is no - `glyf' table present also (which gets priority). - -2017-03-06 Werner Lemberg <wl(a)gnu.org> - - [sfnt, truetype] Always provide default instance. - - As documented in the OpenType specification, an entry for the - default instance may be omitted in the named instance table. In - particular this means that even if there is no named instance table - in the font we actually do have a named instance, namely the default - instance. - - For consistency, we always want the default instance in our list of - named instances. If it is missing, we try to synthesize it. - - * src/sfnt/sfobjs.c (sfnt_init_face): Check whether the default - instance is in the table of named instances. Otherwise adjust - number of instances. - - * src/truetype/ttgxvar.c: Include FT_TRUETYPE_IDS_H. - (TT_Get_MM_Var): Use `face->root.style_flags' as the number of named - instances. - Sythesize a named instance entry if necessary. - (tt_done_blend): Free `normalized_stylecoords'. - -2017-03-05 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Remove redundant code. - - * src/sfnt/sfobjs.c (sfnt_init_face): Remove second test for - `num_instances', which will always succeed. - -2017-03-04 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Add `get_name_id' service. - - * include/freetype/internal/sfnt.h (TT_Get_Name_ID_Func): New - typedef. - (SFNT_Interface): Add `get_name_id' field. - (FT_DEFINE_SFNT_INTERFACE): Updated. - - * src/sfnt/sfdriver.c (search_name_id): Rename to... - (sfnt_get_name_id): ... this. - (sfnt_get_ps_name, sfnt_interface): Updated. - -2017-03-04 Werner Lemberg <wl(a)gnu.org> - - [truetype] Make `TT_Set_MM_Blend' set named instance index. - - * src/truetype/ttgxvar.h (GX_Blend): New array - `normalized_stylecoords'. - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Allocate and fill - `normalized_stylecoords'. - (TT_Set_MM_Blend): Check instance tuple and adjust `face_index' - accordingly. - -2017-03-02 Werner Lemberg <wl(a)gnu.org> - - [truetype] Split off designer/normalized conversion routines. - - * src/truetype/ttgxvar.c (TT_Set_Var_Design): Split off conversion - code designer->normalized coordinates to... - (ft_var_to_normalized): ... New function. - (TT_Get_Var_Design): Split off conversion code normalized->designer - coordinates to... - (ft_var_to_design): ... New function. - -2017-02-28 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Further generalize `sfnt_get_ps_name'; report invalid data. - - * src/sfnt/sfdriver.c (sfnt_ps_map): New array. - (sfnt_is_postscript): New function. - (char_type_func): New typedef. - (get_win_string, get_apple_string): Add argument to specify - character checking function. - Add argument whether argument checking failures should be reported. - Update callers. - (search_name_id): Fix return value. - -2017-02-23 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Split off another bit of `sfnt_get_ps_name'. - - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Split off some - functionality into... - (search_name_id): ... New function. - -2017-02-23 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Modularize `sfnt_get_ps_name'. - - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Split off some - functionality into... - (IS_WIN, IS_APPLE): ... New macros. - (get_win_string, get_apple_string): ... New functions. - -2017-02-23 Werner Lemberg <wl(a)gnu.org> - - [truetype] Minor improvement. - - * src/truetype/ttgload.c (TT_Process_Simple_Glyph, - load_truetype_glyph): Remove unnecessary tests. - -2017-02-23 Werner Lemberg <wl(a)gnu.org> - - * include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/. - - For orthogonality with other structure field names. - - Update all users. - -2017-02-22 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftgrays.c (gray_hline): Improve code. - -2017-02-20 Dominik RÃ¶ttsches <drott(a)google.com> - - Fix some `ttnameid.h' entries (#50313). - - * include/freetype/ttnameid.h: - s/TT_MS_LANGID_SPANISH_INTERNATIONAL_SORT/TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT/, - s/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIA/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN/. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Finish support for `random' operator. - - * src/cff/cfftypes.h (CFF_SubFontRec): Add `random' field. - - * src/cff/cffobjs.c: Updated. - (cff_driver_init): Initialize random seed value. - - * src/cff/cffload.c (cff_random): New function. - (cff_subfont_load): Add `face' argument. - Update all callers. - Initialize random number generator with a proper seed value. - (cff_font_load): Add `face' argument. - Update all callers. - - * src/cff/cffload.h: Updated. - - * src/cff/cf2intrp.c (CF2_FIXME): Removed. - (cf2_interpT2CharString) <cf2_escRANDOM>: Implement opcode. - - * src/cff/cffgload.c (cff_decoder_parse_charstrings): Don't - initialize random seed value. - <cff_op_random>: Use new random seed framework. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Sanitize `initialRandomSeed'. - - * src/cff/cffload.c (cff_load_private_dict): Make - `initial_random_seed' value always positive. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Introduce `random-seed' property (2/2). - - * src/base/ftobjs.c: Include `FT_CFF_DRIVER_H'. - (open_face): Initialize `face->internal->random_seed'. - (FT_Face_Properties): Handle `FT_PARAM_TAG_RANDOM_SEED'. - - * src/cff/cffdrivr.c (cff_property_set): Handle `random-seed' - property. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Introduce `random-seed' property (1/2). - - We need this for support of the `random' operator. - - * include/freetype/ftcffdrv.h (FT_PARAM_TAG_RANDOM_SEED): New macro. - - * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): New - field `random_seed'. - - * src/cff/cffobjs.h (CFF_DriverRec): New field `random_seed'. - -2017-02-17 Werner Lemberg <wl(a)gnu.org> - - Remove clang warnings. - - * src/autofit/aflatin.c (af_latin_sort_blue): Add missing `static' - keyword. - - * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): - Initialize some variables. - -2017-02-16 Nikolaus Waxweiler <madigens(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - Add face property for stem darkening. - - * include/freetype/ftautoh.h (FT_PARAM_TAG_STEM_DARKENING): New - macro. - - * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): Add - `no_stem_darkening' field. - - * src/autofit/afloader.c (af_loader_load_glyph), - src/autofit/afmodule.c (af_property_set): Updated. - - * src/base/ftobjs.c: Include FT_AUTOHINTER_H. - (ft_open_face_internal): Updated. - (FT_Face_Properties): Handle FT_PARAM_TAG_STEM_DARKENING. - - * src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Updated. - - * src/cff/cffdrivr.c (cff_property_set): Updated. - -2017-02-16 Nikolaus Waxweiler <madigens(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - Add face property for LCD filter weights. - - * include/freetype/ftlcdfil.h (FT_PARAM_TAG_LCD_FILTER_WEIGHTS, - FT_LCD_FILTER_FIVE_TAPS): New macros. - (FT_LcdFiveTapFilter): New typedef. - - * include/freetype/ftobjs.h (FT_Face_InternalRec) - [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Add `lcd_weights' field. - (FT_Bitmap_LcdFilterFunc): Change third argument to weights array. - (ft_lcd_filter_fir): New prototype. - (FT_LibraryRec): Updated. - - * src/base/ftlcdfil.c (_ft_lcd_filter_fir): Renamed to... - (ft_lcd_filter_fir): ... this base function. - Updated. - (_ft_lcd_filter_legacy): Updated. - (FT_Library_SetLcdFilterWeights, FT_Library_SetLcdFilter): Updated. - - * src/base/ftobjs.c (ft_open_face_internal): Updated. - (FT_Face_Properties): Handle FT_PARAM_TAG_LCD_FILTER_WEIGHTS. - - * src/smooth/ftsmooth.c (ft_smooth_render_generic) - [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Handle LCD weights from - `FT_Face_Internal'. - -2017-02-14 Nikolaus Waxweiler <madigens(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - Add new function `FT_Face_Properties'. - - This commit provides the framework, to be filled with something - useful in the next commits. - - * include/freetype/freetype.h (FT_Face_Properties): Declare. - - * src/base/ftobjs.c (FT_Face_Properties): New function. - -2017-02-13 Werner Lemberg <wl(a)gnu.org> - - [autofit] Prevent overlapping blue zones. - - Problem reported as - - https://github.com/google/fonts/issues/632 - - The font in question (Nunito) has values 705 and 713 for the - reference and overshoot values, respectively, of the first blue - zone. Blue zone 2, however, has value 710 for both the reference - and overshoot. At 12ppem, reference and overshoot of blue zone 0 - becomes 8px, while blue zone 2 becomes 9px. - - A peculiarity of this font is that the tops of isolated vertical - stems like `N' have a slight overshoot also. The auto-hinter tries - to find the nearest blue zone using the *original* coordinates. For - vertical stems, this is value 713. For normal horizontal tops like - in character `E', this is value 710. Since value 713 is mapped to - 8px but value 710 to 9px, `N' and similar characters are one pixel - higher than `E', which looks very bad. - - This commit sanitizes blue zones to avoid such a behaviour. - - * src/autofit/aflatin.c (af_latin_sort_blue): New function. - (af_latin_metrics_init_blues): Sort blue values and remove overlaps. - -2017-02-12 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftgrays.c (gray_sweep): Improve code. - -2017-02-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] Implement `VVAR' table support. - - * src/truetype/ttgxvar.h (GX_HVarTable): Renamed to... - (GX_HVVarTable): ...This. - (GX_Blend): Add fields for `VVAR' table handling. - Other minor updates. - - * src/truetype/ttgxvar.c (ft_var_load_hvar): Renamed to... - (ft_var_load_hvvar): ...This. - Handle VVAR loading also (controlled by an additional parameter). - (tt_hadvance_adjust): Renamed to... - (tt_hvadvance_adjust): ...This. - Handle application of advance height also (controlled by an - additional parameter). - (tt_hadvance_adjust, tt_vadvance_adjust): Wrappers for - `tt_hvadvance_adjust'. - - * src/truetype/ttdriver.c (tt_service_metrics_variations): Updated. - -2017-02-05 Werner Lemberg <wl(a)gnu.org> - - [autofit] Use better blue zone characters for lowercase latin. - - The number of lowercase characters for computing the top flat blue - zone value was too small (in most cases only `x' and `z'). If one - of the two characters has a large serif, say, it can happen that - FreeType must select between two different values, having a 50% - chance to use the wrong one. As a result, rendering at larger PPEM - values could yield uneven lowercase glyph heights. - - Problem reported by Christoph Koeberlin <christoph(a)koe.berlin>. - - * src/autofit/afblue.dat (AF_BLUE_STRING_LATIN_SMALL): Replaced - with... - (AF_BLUE_STRING_LATIN_SMALL_TOP, AF_BLUE_STRING_LATIN_SMALL_BOTTOM): - ... New, extended sets. - (AF_BLUE_STRINGSET_LATN): Updated. - - * src/autofit/afblue.c, scr/autofit/afblue.h: Regenerated. - -2017-02-04 Werner Lemberg <wl(a)gnu.org> - - Make `freetype-config' a wrapper of `pkg-config' if possible. - - Based on ideas taken from - - http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/tree/freetype-multilib… - http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/tree/freetype-2.5.3-fr… - - * builds/unix/freetype-config.in: Rewritten. Use `pkg-config' to - set output variables if program is available. - - * docs/CHANGES, docs/freetype-config.1: Updated. - -2017-02-04 Werner Lemberg <wl(a)gnu.org> - - * builds/unix/unix-def.in (freetype-config): Fix permissions. - -2017-02-03 Werner Lemberg <wl(a)gnu.org> - - * src/autofit/afglobal.c (af_face_globals_free): Erase useless code. - -2017-02-03 Werner Lemberg <wl(a)gnu.org> - - * include/freetype/ftgasp.h (FT_GASP_SYMMETRIC_GRIDFIT): Fix value. - - Reported by Behdad. - -2017-02-02 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix MVAR post-action handling. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=509 - - * src/truetype/ttobjs.c (tt_size_reset): Do nothing for CFF2. This - is important to make `tt_size_reset_iterator' (called in - `tt_apply_mvar') always work. - -2017-02-02 Werner Lemberg <wl(a)gnu.org> - - Make compilation with FT_CONFIG_OPTION_PIC work again. - - All code committed here is guarded with `FT_CONFIG_OPTION_PIC'. - - * include/freetype/internal/services/svmetric.h - (FT_DEFINE_SERVICE_METRICSVARIATIONSREC): Remove trailing semicolon. - - * src/autofit/aflatin.c (af_latin_hints_compute_edges, - af_latin_hint_edges): Provide `globals' variable. - - * src/autofit/afloader.c (af_loader_load_glyph): Remove shadowing - variable. - - * src/autofit/afmodule.c (AF_SCRIPT_CLASSES_GET, - AF_STYLE_CLASSES_GET): Redefine. - - * src/autofit/aftypes.h (AF_DEFINE_WRITING_SYSTEM_CLASS): Fix typo. - - * src/cff/cffparse.c (CFF_FIELD_BLEND): Provide it. - - * src/cff/cffpic.h (CffModulePIC): Fix typo. - -2017-01-31 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftgrays.c (gray_render_scanline): Improve code. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [cff] Provide metrics variation service interface (#50196). - - Only now I've got an OTF with an HVAR table for testing... - - The code in `ftmm.c' uses `FT_FACE_LOOKUP_SERVICE' to get the - metrics variations interface. However, this didn't work with - `FT_FACE_FIND_GLOBAL_SERVICE' used in `sfnt_init_face'. - - * src/cff/cffdrivr.c: Include FT_SERVICE_METRICS_VARIATIONS_H. - (cff_hadvance_adjust, cff_metrics_adjust): Wrapper functions for - metric service functions from the `truetype' module. - (cff_service_metrics_variations): New service. - (cff_services): Updated. - - * src/cff/cffpic.h (CFF_SERVICE_METRICS_VAR_GET): New macro. - [FT_CONFIG_OPTION_PIC]: Synchronize code. - - * src/sfnt/sfobjs.c (sfnt_init_face): Replace call to - FT_FACE_FIND_GLOBAL_SERVICE with `ft_module_get_service' to always - load the service from the `truetype' module. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - Add framework to support services with 9 functions. - - * include/freetype/internal/ftserv.h (FT_DEFINE_SERVICEDESCREC9): - New macro. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [base] Fix error handing in MM functions. - - * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): - Implement it. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix sanity check for `gvar' table (#50184). - - * src/truetype/ttgxvar.c (ft_var_load_gvar): There might be missing - variation data for some glyphs. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [autofit] Avoid uninitialized jumps (#50191). - - * src/autofit/afcjk.c (af_cjk_metrics_check_digits), - src/autofit/aflatin.c (af_latin_metrics_check_digits): Initialize - `advance'. - -2017-01-27 Werner Lemberg <wl(a)gnu.org> - - s/GB2312/PRC/. - - * include/freetype/freetype.h (FT_ENCODING_PRC): New enum value. - (FT_ENCODING_GB2312): Deprecated. - - * include/freetype/ttnameid.h (TT_MS_ID_PRC): New macro. - (TT_MS_ID_GB2312): Deprecated. - - * src/sfnt/sfobjs.c (sfnt_find_encoding): Updated. - - * docs/CHANGES: Updated. - -2017-01-26 Werner Lemberg <wl(a)gnu.org> - - [base] Add `FT_Get_Sfnt_LangTag' function. - - * include/freetype/ftsnames.h (FT_SfntLangTag): New structure. - (FT_Get_Sfnt_LangTag): New declaration. - - * src/base/ftsnames.c (FT_Get_Sfnt_LangTag): New function. - - * docs/CHANGES: Updated. - -2017-01-26 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Support `name' table format 1. - - * include/freetype/internal/tttypes.h (TT_LangTagRec): New - structure. - (TT_NameTableRec): Add fields `numLangTagRecords' and `langTags'. - - * src/sfnt/ttload.c (tt_face_load_name): Add support for language - tags. - Reduce array size of name strings in case of invalid entries. - (tt_face_free_name): Updated. - - * docs/CHANGES: Updated. - -2017-01-25 Werner Lemberg <wl(a)gnu.org> - - [sfnt] s/TT_NameEntry/TT_Name/. - - * include/freetype/internal/tttypes.h (TT_NameEntryRec): Renamed - to... - (TT_NameRec): This. - (TT_NameTableRec): Updated. - - * src/base/ftsnames.c (FT_Get_Sfnt_Name): Updated. - - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Updated. - - * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, - tt_name_entry_ascii_from_other): Renamed to... - (tt_name_ascii_from_utf16, tt_name_entry_ascii_from_other): This, - respectively. - (TT_NameEntry_ConvertFunc): Renamed to... - (TT_Name_ConvertFunc): This. - (tt_face_get_name): Updated. - - * src/sfnt/ttload.c (tt_face_load_name, tt_face_free_name): - Updated. - -2017-01-24 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Fix Postscript name service for symbol fonts. - - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Accept PID/EID=3/0 - entries also. - -2017-01-24 Werner Lemberg <wl(a)gnu.org> - - [truetype] For OpenType 1.7: s/preferred/typographic/ (sub)family. - - * include/freetype/ftsnames.h - (FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY, - FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY): New macros. - (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY, - FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Deprecated. - - * include/freetype/ttnameid.h (TT_NAME_ID_TYPOGRAPHIC_FAMILY, - TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY): New macros. - (TT_NAME_ID_PREFERRED_FAMILY, TT_NAME_ID_PREFERRED_SUBFAMILY): - Deprecated. - - * src/sfnt/sfobjs.c (sfnt_load_face): Updated. - - * docs/CHANGES: Updated. - -2017-01-23 Werner Lemberg <wl(a)gnu.org> - - [base] Add `FT_Set_Default_Properties' (#49187). - - * include/freetype/ftmodapi.h: Add declaration. - - * src/base/ftinit.c (ft_set_default_properties): Renamed to... - (FT_Set_Default_Properties): ... this. - (FT_Init_FreeType): Updated. - - * docs/CHANGES: Updated. - -2017-01-23 Werner Lemberg <wl(a)gnu.org> - - [truetype] Minor updates for OpenType 1.8.1. - - * src/truetype/ttgxvar.h (GX_MVarTable): `axisCount' has been - removed from the specification; it is now reserved. - - * src/truetype/ttgxvar.c (ft_var_load_mvar): Updated. - (GX_FVar_Head): Remove `countSizePairs'; the corresponding data - field in the `MVAR' table is now reserved. - (fvar_fields): Updated. - -2017-01-23 Werner Lemberg <wl(a)gnu.org> - - [truetype] Avoid segfault for invalid variation data. - - * src/truetype/ttgxvar.c (ft_var_load_item_variation_store): Assure - `itemCount' is not zero. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=441 - -2017-01-20 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttinterp.c (TT_RunIns): Adjust loop detector limits. - -2017-01-17 Werner Lemberg <wl(a)gnu.org> - - * include/freetype/ttnameid.h: Updated to OpenType 1.8.1. - - (TT_APPLE_ID_FULL_UNICODE): New macro. - - (TT_MS_LANGID_BOSNIAN_BOSNIA_HERZ_CYRILLIC, - TT_MS_LANGID_UPPER_SORBIAN_GERMANY, - TT_MS_LANGID_LOWER_SORBIAN_GERMANY, TT_MS_LANGID_IRISH_IRELAND, - TT_MS_LANGID_INUKTITUT_CANADA_LATIN, TT_MS_LANGID_BASHKIR_RUSSIA, - TT_MS_LANGID_LUXEMBOURGISH_LUXEMBOURG, - TT_MS_LANGID_GREENLANDIC_GREENLAND, TT_MS_LANGID_MAPUDUNGUN_CHILE, - TT_MS_LANGID_MOHAWK_MOHAWK, TT_MS_LANGID_BRETON_FRANCE, - TT_MS_LANGID_OCCITAN_FRANCE, TT_MS_LANGID_CORSICAN_FRANCE, - TT_MS_LANGID_ALSATIAN_FRANCE, TT_MS_LANGID_YAKUT_RUSSIA, - TT_MS_LANGID_KICHE_GUATEMALA, TT_MS_LANGID_KINYARWANDA_RWANDA, - TT_MS_LANGID_WOLOF_SENEGAL, TT_MS_LANGID_DARI_AFGHANISTAN): New - macros. - - (TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC): Fix value. - - (TT_MS_LANGID_GERMAN_LIECHTENSTEIN, TT_MS_LANGID_CATALAN_CATALAN, - TT_MS_LANGID_CHINESE_MACAO, TT_MS_LANGID_SPANISH_SPAIN_MODERN_SORT, - TT_MS_LANGID_KOREAN_KOREA, TT_MS_LANGID_ROMANSH_SWITZERLAND, - TT_MS_LANGID_SLOVENIAN_SLOVENIA, TT_MS_LANGID_BASQUE_BASQUE, - TT_MS_LANGID_SETSWANA_SOUTH_AFRICA, - TT_MS_LANGID_ISIXHOSA_SOUTH_AFRICA, - TT_MS_LANGID_ISIZULU_SOUTH_AFRICA, TT_MS_LANGID_KAZAKH_KAZAKHSTAN, - TT_MS_LANGID_KYRGYZ_KYRGYZSTAN, TT_MS_LANGID_KISWAHILI_KENYA, - TT_MS_LANGID_TATAR_RUSSIA, TT_MS_LANGID_ODIA_INDIA, - TT_MS_LANGID_MONGOLIAN_PRC, TT_MS_LANGID_TIBETAN_PRC, - TT_MS_LANGID_WELSH_UNITED_KINGDOM, TT_MS_LANGID_GALICIAN_GALICIAN, - TT_MS_LANGID_SINHALA_SRI_LANKA, TT_MS_LANGID_TAMAZIGHT_ALGERIA, - TT_MS_LANGID_SESOTHO_SA_LEBOA_SOUTH_AFRICA, TT_MS_LANGID_YI_PRC, - TT_MS_LANGID_UIGHUR_PRC): New aliases. - - Remove commented out code. - - (TT_NAME_ID_LIGHT_BACKGROUND, TT_NAME_ID_DARK_BACKGROUND, - TT_NAME_ID_VARIATIONS_PREFIX): New macros. - - (HAVE_LIMIT_ON_IDENTS): Remove macro (which was useless since many - years), use guarded long macros by default and define short versions - as aliases for the long ones. - -2017-01-15 Werner Lemberg <wl(a)gnu.org> - - * src/truetype/ttgxvar.c (tt_apply_var): Handle underline parameters - also. - -2017-01-11 Werner Lemberg <wl(a)gnu.org> - - * src/base/ftobjs.c (ft_open_face_internal): Improve tracing. - -2017-01-11 Werner Lemberg <wl(a)gnu.org> - - [truetype] Actually use metrics variation service. - - * src/base/ftmm.c: Include FT_SERVICE_METRICS_VARIATIONS_H. - (ft_face_get_mvar_service): New auxiliary function to look up - metrics variation service. - (FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, - FT_Set_Var_Blend_Coordinates): Call metrics variation service. - - * src/truetype/ttobjs.c (tt_face_init): Use metrics variations for - named instances. - -2017-01-11 Werner Lemberg <wl(a)gnu.org> - - [truetype] Provide metrics variation service. - - * include/freetype/internal/services/svmetric.h - (FT_Metrics_Adjust_Func): Reduce number of necessary parameters. - - * src/truetype/ttgxvar.c: Include FT_LIST_H. - (tt_size_reset_iterator): New auxiliary function for... - (tt_apply_var): New function. - - * src/truetype/ttgxvar.h: Updated. - - * src/truetype/ttdriver.c (tt_service_metrics_variations): Add - `tt_apply_mvar'. - - * include/freetype/internal/ftserv.h (FT_ServiceCache): Add metrics - variation service. - -2017-01-11 Werner Lemberg <wl(a)gnu.org> - - [truetype] Parse `MVAR' table. - - * src/truetype/ttgxvar.h (MVAR_TAG_XXX): New macros for MVAR tags. - (GX_Value, GX_MVarTable): New structures. - (GX_Blend): Add it. - - * src/truetype/ttgxvar.c (GX_VALUE_SIZE, GX_VALUE_CASE, - GX_GASP_CASE): New macros. - (ft_var_get_value_pointer): New auxiliary function to get a pointer - to a value from various SFNT tables already stored in `TT_Face'. - (ft_var_load_mvar): New function. - (TT_Get_MM_Var): Call it. - (tt_done_blend): Updated. - -2017-01-11 Werner Lemberg <wl(a)gnu.org> - - [truetype] More preparations for MVAR support. - - * src/truetype/ttobjs.c (tt_size_reset): Add argument to make - function only recompute ascender, descender, and height. - - * src/truetype/ttobjs.h: Updated. - - * src/truetype/ttdriver.c (tt_size_select, tt_size_request): - Updated. - -2017-01-09 Werner Lemberg <wl(a)gnu.org> - - [pcf] Disable long family names by default. - - * include/freetype/config/ftoption.h - (PCF_CONFIG_OPTION_LONG_FAMILY_NAMES): Comment out. - -2017-01-09 Werner Lemberg <wl(a)gnu.org> - - [pcf] Make long family names configurable. - - The change from 2016-09-29 was too radical (except for people using - the openSuSE GNU/Linux distribution). To ameliorate the situation, - PCF_CONFIG_OPTION_LONG_FAMILY_NAMES gets introduced which controls - the feature; if set, a new PCF property option - `no-long-family-names' can be used to switch this feature off. - - * include/freetype/config/ftoption.h, devel/ftoption.h - (PCF_CONFIG_OPTION_LONG_FAMILY_NAMES): New option. - - * include/freetype/ftpcfdrv.h: New header file (only containing - comments currently, used for building the documentation). - - * include/freetype/config/ftheader.h (FT_PCF_DRIVER_H): New macro. - - * src/pcf/pcf.h (PCF_Driver): Add `no_long_family_names' field. - - * src/pcf/pcfdrivr.c: Include FT_SERVICE_PROPERTIES_H and - FT_PCF_DRIVER_H. - (pcf_property_set, pcf_property_get): New functions. - (pcf_service_properties): New service. - (pcf_services): Updated. - (pcf_driver_init) [PCF_CONFIG_OPTION_LONG_FAMILY_NAMES]: Handle - `no_long_family_names'. - - * src/pcf/pcfread.c (pcf_load_font): Handle `no_long_family_names' - and PCF_CONFIG_OPTION_LONG_FAMILY_NAMES. - - * docs/CHANGES: Updated. - -2017-01-09 Werner Lemberg <wl(a)gnu.org> - - [pcf] Introduce a driver structure. - - To be filled later on with something useful. - - * src/pcf/pcf.h (PCF_Driver): New structure. - - * src/pcf/pcfdrivr.c (pcf_driver_init, pcf_driver_done): New dummy - functions. - (pcf_driver_class): Updated. - -2017-01-08 Werner Lemberg <wl(a)gnu.org> - - [truetype] Again some GX code shuffling. - - We need this later on for MVAR also. - - * src/truetype/ttgxvar.c (tt_hadvance_adjust): Split off computing - an item store variation delta into... - (ft_var_get_item_delta): ...new function. - -2017-01-08 Werner Lemberg <wl(a)gnu.org> - - [truetype] Adjust font variation flags for MVAR. - - * include/freetype/internal/tttypes.h (TT_FACE_FLAG_VAR_XXX): - Remove all flags related to MVAR; replace it with... - (TT_FACE_FLAG_VAR_MVAR): ...this new macro. - (TT_Face): Remove `mvar_support' field (which was still unused). - -2017-01-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] More GX code shuffling. - - We need this later on for MVAR also. - - * src/truetype/ttgxvar.c (tt_done_blend): Split off handling of item - variation store into... - (ft_var_done_item_variation_store): ...new function. - -2017-01-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] More generalization of GX stuff. - - We need this later on for MVAR also. - - * src/truetype/ttgxvar.c (ft_var_load_delta_set_index_mapping): Add - parameters for delta-set index mapping and item variation store. - (ft_var_load_item_variation_store): Add parameter for item variation - store. - s/hvarData/varData/. - Move allocation of `hvar_table' to... - (ft_var_load_hvar): ...this function. - Updated. - -2017-01-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] Some GX structure renames for generalization. - - We need this later on for MVAR also. - - * src/truetype/ttgxvar.h (GX_HVarData): Renamed to... - (GX_ItemVarData): ...this. - (GX_HVarRegion): Renamed to... - (GX_VarRegion): ...this. - (GX_HVStore): Renamed to... - (GX_ItemVarStore): ...this. - (GX_WidthMap): Renamed to... - (GX_DeltaSetIdxMap): ...this. - - (GX_HVarTable): Updated. - - * src/truetype/ttgxvar.c: Updated. - -2017-01-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] Code shuffling. - - * src/truetype/ttgxvar.c (ft_var_load_hvar): Split off loading of - item variation store and delta set index mapping into... - (ft_var_load_item_variation_store, - ft_var_load_delta_set_index_mapping): ...new functions. - -2017-01-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] Add HVAR access without advance width map. - - * src/truetype/ttgxvar.c (ft_var_load_hvar): Handle case where - `offsetToAdvanceWidthMapping' is zero. - (tt_hadvance_adjust): Implement direct deltaSet access by glyph - index. - -2017-01-06 Werner Lemberg <wl(a)gnu.org> - - [pcf] Revise driver. - - This commit improves tracing and handling of malformed fonts. In - particular, the changes to `pcf_get_properties' fix - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=379 - - * src/pcf/pcfread.c (tableNames): Use long names for better - readability. - (pcf_read_TOC): Allow at most 9 tables. - (pcf_get_properties): Allow at most 256 properties. - Limit strings array length to 256 * (65536 + 1) bytes. - Better tracing. - (pcf_get_metric): Trace metric data. - (pcf_get_metrics): Allow at most 65536 metrics. - Fix comparison of `metrics->ascent' and `metrics->descent' to avoid - potential overflow. - Better tracing. - (pcf_get_bitmaps): Allow at most 65536 bitmaps. - Better tracing. - (pcf_get_encodings, pcf_get_accel): Better tracing. - - * src/pcf/pcfdrivr.c (PCF_Glyph_Load): Don't trace `format' details. - These are now shown by `pcf_get_bitmaps'. - -2017-01-04 Werner Lemberg <wl(a)gnu.org> - - * src/pcf/pcfdrivr.c (PCF_Face_Init): Trace compression format. - -2017-01-04 Werner Lemberg <wl(a)gnu.org> - - [cff] More consistency checks for pure CFFs. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=378 - - * src/cff/cffload.c (cff_font_load): Check element number and size - of Name and Top DICT indices. - -2017-01-04 Werner Lemberg <wl(a)gnu.org> - - [cff, truetype] Minor tracing improvement. - - * src/cff/cffobjs.c (cff_face_init), src/truetype/ttobjs.c - (tt_face_init): Indent first tracing message from SFNT driver. - -2017-01-03 Werner Lemberg <wl(a)gnu.org> - - [truetype] Various minor fixes. - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check instruction - size only if we do native hinting. - (TT_Load_Glyph): Trace returned error code. - - * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep): Trace - returned error code. - (tt_size_ready_bytecode): Don't run `prep' table if `fpgm' table is - invalid. - -2017-01-03 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Don't fail if PCLT, EBLC (and similar tables) are invalid. - - These tables are optional. - - * src/sfnt/sfobjs.c (sfnt_load_face): Implement it. - -2017-01-03 Werner Lemberg <wl(a)gnu.org> - - * src/cff/cffparse.c (cff_parse_num): Simplify. - -2017-01-03 Werner Lemberg <wl(a)gnu.org> - - Various fixes for clang's undefined behaviour sanitizer. - - * src/cff/cffload.c (FT_fdot14ToFixed): Fix casting. - (cff_blend_doBlend): Don't left-shift negative numbers. - Handle 5-byte numbers byte by byte to avoid alignment issues. - - * src/cff/cffparse.c (cff_parse_num): Handle 5-byte numbers byte by - byte to avoid alignment issues. - - * src/cid/cidload (cid_read_subrs): Do nothing if we don't have any - subrs. - - * src/psaux/t1decode.c (t1_decode_parse_charstring): Fix tracing. - - * src/tools/glnames.py (main): Put `DEFINE_PSTABLES' guard around - definition of `ft_get_adobe_glyph_index'. - - * src/psnames/pstables.h: Regenerated. - - * src/psnames/psmodule.c: Include `pstables.h' twice to get both - declaration and definition. - - * src/truetype/ttgxvar.c (FT_fdot14ToFixed, FT_intToFixed): Fix - casting. - -2017-01-01 Werner Lemberg <wl(a)gnu.org> - - [cff] Handle multiple `blend' operators in a row correctly. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=368 - - * src/cff/cffload.c (cff_blend_doBlend): Adjust `parser->stack' - pointers into `subFont->blend_stack' after reallocation. - -2017-01-01 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Return correct number of named instances for TTCs. - - Without this patch, requesting information for face index N returned - the data for face index N+1 (or index 0). - - * src/sfnt/sfobjs.c (sfnt_init_face): Correctly adjust `face_index' - for negative `face_instance_index' values. - -2016-12-31 Werner Lemberg <wl(a)gnu.org> - - */*: Use hex numbers for errors in tracing messages. - -2016-12-31 Werner Lemberg <wl(a)gnu.org> - - [truetype] Check axis count in HVAR table. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=362 - - * src/truetype/ttgxvar.c (ft_var_load_hvar): Check axis count. - (ft_var_load_avar): Fix tracing message. - ---------------------------------------------------------------------------- -Copyright 2016-2018 by +Copyright 2017-2018 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/modules/freetype2/ChangeLog.21 b/modules/freetype2/ChangeLog.21 index 01883f1113a2..1adc81783708 100644 --- a/modules/freetype2/ChangeLog.21 +++ b/modules/freetype2/ChangeLog.21 @@ -6995,7 +6995,7 @@ 2002-09-08 David Turner <david(a)freetype.org> - Various updates to correctly support sub-pixel rendering. + Various updates to correctly support subpixel rendering. * include/freetype/config/ftmodule.h: Add two renderers for LCD. diff --git a/modules/freetype2/ChangeLog.24 b/modules/freetype2/ChangeLog.24 index 7661aee1994d..44abc4060b4d 100644 --- a/modules/freetype2/ChangeLog.24 +++ b/modules/freetype2/ChangeLog.24 @@ -744,7 +744,7 @@ 2013-01-16 David 'Digit' Turner <digit(a)google.com> - [truetype] Improve sub-pixel code. + [truetype] Improve subpixel code. This patches fixes many issues with the ttsubpix implementation. diff --git a/modules/freetype2/ChangeLog.28 b/modules/freetype2/ChangeLog.28 new file mode 100644 index 000000000000..ca1ff3850f17 --- /dev/null +++ b/modules/freetype2/ChangeLog.28 @@ -0,0 +1,3136 @@ +2017-09-16 Werner Lemberg <wl(a)gnu.org> + + * Version 2.8.1 released. + ========================= + + + Tag sources with `VER-2-8-1'. + + * docs/VERSION.TXT: Add entry for version 2.8.1. + * docs/CHANGES: Updated. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.8/2.8.1/, s/28/281/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 21:0:15. + * CMakeLists.txt (VERSION_PATCH): Set to 1. + +2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + + [sfnt] lowest gcc for vectors (e1d0249e) is changed to 4.7. + + __builtin_shuffle() was introduced in gcc-4.7. The lowest + gcc to enable vector operation is delayed from 4.6 to 4.7. + + * src/sfnt/pngshim.c (premultiply_data): Fix cpp-macro to + enable the vector operation, to change the lowest gcc version + from 4.6 to 4.7. + +2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + + [cache] Fix a possible overflow by signed integer comparison. + + Improve the code by 5d3ff05615dda6d1325ed612381a17a0df04c975 , + issues are found by Behdad Esfahbod and Werner Lemberg. + + * src/cache/ftcbasic.c (FTC_ImageCache_Lookup): Replace + a subtraction to check higher bit by a bit operation, + and cpp-conditionalize for appropriate systems. Add better + documentation to the comment. + (FTC_ImageCache_LookupScaler): Ditto. + (FTC_SBitCache_Lookup): Ditto. + (FTC_SBitCache_LookupScaler): Ditto. + +2017-09-13 Werner Lemberg <wl(a)gnu.org> + + [autofit] Really fix #41334 (#52000). + + * src/autofit/aflatin.c (af_latin_hints_compute_segments): Set + `segment->delta' everywhere. + +2017-09-12 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + + [autofit, sfnt] Fix for `make multi'. + + * src/autofit/afshaper.c: Include FT_ADVANCE_H, to use + FT_Get_Advance() in it. + * src/sfnt/ttcmap.c: Include FT_SERVICE_POSTSCRIPT_CMAPS_H + to use PS_Unicodes in it, also include `ttpost.h' to use + tt_face_get_ps_name() in it. + +2017-09-11 Azzuro <azzuro(a)team-mediaportal.com> + + [build] Improve builds with different MS Visual Studio versions. + + * builds/windows/vc2010/freetype.vcxproj: Switch platform toolset + according to the Visual Studio version. + +2017-09-11 Werner Lemberg <wl(a)gnu.org> + + * src/sfnt/ttkern.c (tt_face_load_kern): Reject format 2 tables. + + Reported by Behdad. + +2017-09-09 Werner Lemberg <wl(a)gnu.org> + + [autofit] Improve communication with ftgrid. + + * src/autofit/afhints.c (af_glyph_hints_get_segment_offset): + Provide values in font units. + +2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + + [base] Remove a check for resource ID in the resource fork driver. + + LastResort.dfont has a marginal resource ID 0xFFFF for sfnt + resource. Inside Macintosh: More Macintosh Toolbox, `Resource IDs' + (1-46), tells that some IDs are reserved and should not be used. + FreeType2 just uses resource ID to sort the fragmented resource. + To accept the marginal fonts, the checking is removed. + + * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Remove res_id + validity check, fix a trace message format. + +2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + + [sfnt, truetype] Register the tags for marginal fonts. + + The first 32bit of standard TrueType variants is 0x00010000, + `OTTO', `ttcf', `true' or `typ1'. 2 marginal dfonts on legacy Mac + OS X, Keyboard.dfont and LastResort.dfont, have the sfnt resources + starting 0xA5 followed by `kbd' or `lst'. Considering the following + data could be parsed as conventional TrueType fonts, the header + checking is updated to allow these tags. It seems that recent Mac + OS X has already switched to normal TTF for these fonts. + + See the discussion at + http://u88.n24.queensu.ca/exiftool/forum/index.php?topic=3931.0 + + * include/freetype/tttags.h (TTAG_0xA5kbd, TTAG_0xA5lst): New header + tags for Keyboard.dfont and LastResort.dfont. + * src/sfnt/sfobjs.c (sfnt_open_font): Accept the sfnt resource + starts with TTAG_0xA5kbd or TTAG_0xA5lst. + * src/truetype/ttobjs.c (tt_face_init): Accept the face with the + format tag is TTAG_0xA5kbd or TTAG_0xA5lst. + +2017-09-05 Werner Lemberg <wl(a)gnu.org> + + Fix multiple calls of `FT_Bitmap_Convert'. + + The documentation of `FT_Bitmap_Convert' says that multiple calls do + proper reallocation of the target FT_Bitmap object. However, this + failed for the sequence + + non-empty bitmap + empty bitmap + non-empty bitmap + + Reason was that `FT_Bitmap_Convert' only reallocated the bitmap + buffer if it became too small; it didn't make the buffer smaller. + For an empty bitmap following a non-empty one, only the buffer + dimension got set to zero, without deallocation. If the next call + was a non-empty buffer again, an assertion in `ft_mem_qrealloc' was + triggered. + + * src/base/ftbitmap.c (FT_Bitmap_Convert): Always reallocate target + buffer to the correct size. + + * docs/CHANGES: Document it. + +2017-09-05 Werner Lemberg <wl(a)gnu.org> + + [bdf] Fix size and resolution handling. + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Use `SIZE' values if + `POINT_SIZE', `RESOLUTION_X', or `RESOLUTION_Y' properties are + missing. + + * docs/CHANGES: Document it. + +2017-08-25 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + Swap `ALLOC_MULT' arguments (#51833). + + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Updated. + * src/winfonts/winfnt.c (FNT_Load_Glyph): Updated. + * src/raster/ftrend1.c (ft_raster1_render): Updated. + +2017-08-23 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Fix clang compilation (#51788). + + * src/sfnt/pngshim.c (premultiply_data): Use vectors instead of + scalars. + (vector_shuffle): New macro to take care of a different built-in + function name on clang. + +2017-08-22 Werner Lemberg <wl(a)gnu.org> + + [base] Don't zero out allocated memory twice (#51816). + + Patch applied from bug report. + + * src/base/ftutil.c (ft_mem_qrealloc): Use low-level allocation to + avoid unnecessary overhead. + +2017-08-22 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow. + + Changes triggered by + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3107 + + * src/truetype/ttinterp.c (Ins_MDRP, Ins_MIRP, Ins_ALIGNPTS): Use + NEG_LONG. + +2017-08-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [sfnt] Avoid synthetic unicode for symbol fonts with PUA. + + Reported as + + https://bugs.chromium.org/p/chromium/issues/detail?id=754574 + + * src/sfnt/sfobjs.c (sfnt_load_face): Check for FT_ENCODING_MS_SYMBOL. + +2017-08-16 Werner Lemberg <wl(a)gnu.org> + + * src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings. + +2017-08-15 Behdad Esfahbod <behdad(a)behdad.org> + + [sfnt] Speed up PNG image loading. + + This reduces the overhead of `premultiply_data' by 60%. + + * src/sfnt/pngshim.c (premultiply_data): Provide code which uses + gcc's (and clang's) `vector_byte' attribute to process 4 pixels at a + time. + +2017-08-11 Werner Lemberg <wl(a)gnu.org> + + [sfnt, truetype] Improve handling of missing sbits. + + Requested by Behdad. + + Modern bitmap-only SFNTs like `NotoColorEmoji.ttf' don't contain + entries in the bitmap strike(s) for empty glyphs. Instead, they + rely that a space glyph gets created from the font's metrics data. + This commit makes FreeType behave accordingly. + + * include/freetype/fterrdef.h (FT_Err_Missing_Bitmap): New error + code. + + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_image): Change error codes + to make a distinction between a missing bitmap in a composite and a + simple missing bitmap. + + * src/truetype/ttgload.c (TT_Load_Glyph): For a missing bitmap (in a + bitmap-only font), synthesize an empty bitmap glyph if metrics are + available. + +2017-08-10 Werner Lemberg <wl(a)gnu.org> + + [base] Minor API improvement for default variation axis setting. + + * src/base/ftmm.c (FT_Set_MM_Design_Coordinates, + FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, + FT_Set_Var_Blend_Coordinates): Allow coords==NULL if num_coords==0. + + * docs/CHANGES: Updated. + +2017-08-08 Werner Lemberg <wl(a)gnu.org> + + [psnames] Really fix issue #49949. + + We now use a separate preprocessor macro to handle both definition + and declaration of the glyph name arrays. + + * src/psnames/psmodule.c (DEFINE_PS_TABLE_DATA): New macro. + + * src/tools/glnames.py (StringTable::dump, + StringTable::dump_sublist): Use `DEFINE_PS_TABLE_DATA'. + (dump_encoding): Ditto. + (main): Use `wb' mode for writing the output file, which works on + Windows also. + + * src/psnames/pstables.h: Regenerated. + +2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [smooth] Harmony LCD rendering. + + This is a new technology for LCD-optimized rendering. It capitalizes + on the fact that each color channel grid is shifted by a third of a + pixel. Therefore it is logical to render 3 separate monochrome + bitmaps shifting the outline by 1/3 pixel, and then combine them. + Importantly, the resulting output does not require additional LCD + filtering. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic) + [!FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Implement new LCD-optimized + rendering. + + * include/freetype/ftlcdfil.h, include/freetype/freetype.h, + include/freetype/config/ftoption.h, devel/ftoption.h: Updated + documentation. + +2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Clean up. + +2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/sfnt/ttpost.c (format): Use otspec-compliant versions. + +2017-08-05 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2868 + + * src/truetype/ttinterp.c (Ins_ALIGNRP): Use NEG_LONG. + +2017-08-05 Werner Lemberg <wl(a)gnu.org> + + [base, truetype] New function `FT_Get_Var_Axis_Flags'. + + The reserved `flags' field got a value in OpenType version 1.8.2; + unfortunately, the public `FT_Var_Axis' structure misses the + corresponding element. Since we can't add a new field, we add an + access function. + + * src/base/ftmm.c (FT_Get_Var_Axis_Flags): New function. + + * include/freetype/ftmm.h (FT_VAR_AXIS_FLAG_HIDDEN): New macro. + Updated. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Increase allocated memory + of `mmvar' to hold axis flags. + Fill the axis flags array. + + * docs/CHANGES: Updated. + +2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> + + [truetype] Fix metrics of B/W hinting in v40 mode. + + Phantom points are now saved outside v40 backwards compatibility + mode. This fixes the jumping glyphs when switching between v35 and + v40 monochrome mode. + + * src/truetype/ttgload.c (TT_Hint_Glyph): Fix inversed bool logic. + +2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> + + [truetype] Do not set any ClearType flags in v40 monochrome mode. + + This fixes weird behavior of instructions that resulted in rendering + differences between v35 and v40 in monochrome mode, e.g., in + `timesbi.ttf'. + + * src/truetype/ttinterp.c (Ins_GETINFO) + [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Check + `subpixel_hinting_lean'. + +2017-08-01 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko. + +2017-08-01 Behdad Esfahbod <behdad(a)behdad.org> + + [truetype] Fix loading of named instances. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Preserve file position + while loading the `avar' table. + +2017-08-01 Werner Lemberg <wl(a)gnu.org> + + [sfnt, truetype] Minor adjustments for OpenType 1.8.2. + + * src/sfnt/sfobjs.c (sfnt_load_face): The units per EM value has now + (tighter) limits. + + * src/truetype/ttgload.c (load_truetype_glyph): The new OpenType + version explicitly allows all negative values for the number of + contours if we have a composite glyph (this is for better backwards + compatibility I guess), but it still recommends value -1. + +2017-07-26 Werner Lemberg <wl(a)gnu.org> + + [cff] Integer overflow. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2738 + + * src/cff/cf2hints.c (cf2_glyphpath_computeOffset, + cf2_glyphpath_curveTo): Use ADD_INT32. + +2017-07-13 Werner Lemberg <wl(a)gnu.org> + + [base] Fix memory leak. + + Reported as + + https://bugs.chromium.org/p/chromium/issues/detail?id=738362 + + * src/base/ftglyph.c (FT_Get_Glyph): Do proper deallocation in case + of error. + +2017-07-12 Werner Lemberg <wl(a)gnu.org> + + [base] Integer overflow. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2573 + + * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use + FT_PIX_CEIL_LONG and FT_PIX_ROUND_LONG. + +2017-07-12 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttpload.c (tt_face_get_location): Off-by-one typo. + + Also improve tracing message. + + Problem reported as + + https://bugs.chromium.org/p/chromium/issues/detail?id=738919 + +2017-07-07 Werner Lemberg <wl(a)gnu.org> + + [cff] Integer overflow. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2517 + + * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32. + +2017-07-05 Werner Lemberg <wl(a)gnu.org> + + * src/sfnt/ttcmap.c (tt_cmap_unicode_class_rec): Fix warning. + +2017-07-05 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Fix warning (#51395). + +2017-07-04 Werner Lemberg <wl(a)gnu.org> + + [truetype] Prevent address overflow (#51365). + + * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Add guard. + +2017-07-03 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/base/ftlcdfil.c (ft_lcd_filter_fir): Improve code. + +2017-07-03 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflow. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2455 + + * src/truetype/ttinterp.c (Ins_SCFS): Use SUB_LONG. + +2017-07-01 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/sfnt/sfobjs.c (sfnt_load_face): Ignore No_Unicode_Glyph_Name. + +2017-06-28 Ben Wagner <bungeman(a)google.com> + + Avoid Microsoft compiler warnings (#51331). + + While clang's sanitizer recommends a cast to unsigned for safe + negation (to handle -INT_MIN), both MSVC and Visualc emit warning + C4146 if an unsigned value gets negated. + + * include/freetype/internal/ftcalc.h (NEG_LONG, NEG_INT32), + src/base/ftcalc.c (FT_MOVE_SIGN): Replace negation with a + subtraction. + +2017-06-27 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffparse.c (do_fixed): Fix typo. + + Spotted by chris <chris(a)gcjd.org>. + +2017-06-27 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2384 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2391 + + * src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix): Use + NEG_LONG. + + * src/truetype/ttinterp.c (Ins_SxVTL): Use NEG_LONG. + +2017-06-24 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2364 + + * src/truetype/ttinterp.c (Ins_ISECT): Use NEG_LONG. + +2017-06-22 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2323 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2328 + + * src/cff/cf2blues.c (cf2_blues_capture): Use ADD_INT32 and + SUB_INT32. + + * src/truetype/ttinterp.c (Ins_SDPVTL): Use SUB_LONG and NEG_LONG. + +2017-06-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [sfnt] Synthesize a Unicode charmap if one is missing. + + * src/sfnt/ttcmap.h (tt_cmap_unicode_class_rec): Declare it. + * src/sfnt/ttcmap.c (tt_get_glyph_name, tt_cmap_unicode_init, + tt_cmap_unicode_done, tt_cmap_unicode_char_index, + tt_cmap_unicode_char_next, tt_cmap_unicode_class_rec): Implement + synthetic Unicode charmap class. + (tt_get_cmap_info): Make sure the callback is available. + + * src/sfnt/sfobjs.c (sfnt_load_face) + [FT_CONFIG_OPTION_POSTSCRIPT_NAMES]: If Unicode charmap is missing, + synthesize one. + + * include/freetype/config/ftoption.h: Document it. + * devel/ftoption.h: Ditto. + +2017-06-20 Tony Theodore <tonyt(a)logyst.com> + + Fix pkg-config in freetype-config for cross-compiling (#51274). + + * builds/unix/unix-def.in (PKG_CONFIG): New variable. + (freetype-config): Use it in sed expression. + + * builds/unix/freetype-config.in: s/pkg-config/%PKG_CONFIG%/. + +2017-06-20 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2300 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2313 + + * src/cff/cf2hints.c (cf2_hintmap_adjustHints): Use ADD_INT32. + + * src/truetype/ttinterp.c (Ins_ABS): Avoid FT_ABS. + +2017-06-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [base, smooth] LCD filtering cleanups. + + * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy): + Clean up, start filtering from the bottom-left origin. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Updated. + +2017-06-16 Werner Lemberg <wl(a)gnu.org> + + [truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2270 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2276 + + * src/truetype/ttinterp.c (Ins_MDRP, _iup_worker_interpolate): Use + ADD_LONG and SUB_LONG. + +2017-06-15 Werner Lemberg <wl(a)gnu.org> + + [bdf, cff] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2244 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2261 + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Replace calls to FT_ABS with + direct code to avoid value negation. + + * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32 and + ADD_INT32. + +2017-06-13 Werner Lemberg <wl(a)gnu.org> + + * src/winfonts/winfnt.c (FNT_Face_Init): Don't set active encoding. + + FreeType only sets a default active encoding for Unicode. + +2017-06-13 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2216 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2218 + + * src/cff/cf2fixed.h (cf2_fixedAbs): Use NEG_INT32. + + * src/truetype/ttinterp.c (Ins_IP): Use SUB_LONG. + +2017-06-11 Werner Lemberg <wl(a)gnu.org> + + [cff] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2200 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2210 + + * src/cff/cf2hints.c (cf2_hintmap_insertHint): Use SUB_INT32 and + ADD_INT32. + + * src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO>: Use + ADD_INT32. + +2017-06-10 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix TT_Set_Var_Design. + + Reported by Nikolaus Waxweiler <madigens(a)gmail.com>. + + * src/truetype/ttgxvar.c (TT_Set_Var_Design): Correctly handle the + case where we have less input coordinates than axes. + +2017-06-10 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftcalc.c (FT_DivFix): Fix embarrassing typo. + + Bug introduced 2017-05-28. + +2017-06-09 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2144 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2151 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2153 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2173 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2186 + + * src/cff/cf2blues.c (cf2_blues_init): Use SUB_INT32. + + * src/truetype/ttinterp.c (Round_None, Round_To_Grid, + Round_To_Half_Grid, Round_Down_To_Grid, Round_Up_To_Grid, + Round_To_Double_Grid, Round_Super, Round_Super_45): Use ADD_LONG, + SUB_LONG, NEG_LONG, FT_PIX_ROUND_LONG, FT_PIX_CEIL_LONG, + FT_PAD_ROUND_LONG + (Ins_SxVTL, Ins_MIRP): Use SUB_LONG. + (_iup_worker_shift): Use SUB_LONG and ADD_LONG. + +2017-06-09 Werner Lemberg <wl(a)gnu.org> + + Provide more macros for flooring, ceiling, and rounding. + + These versions don't produce run-time errors due to integer + overflow. + + * include/freetype/internal/ftobjs.h: Include FT_INTERNAL_CALC_H. + (FT_PAD_ROUND_LONG, FT_PAD_CEIL_LONG, FT_PIX_ROUND_LONG, + FT_PIX_CEIL_LONG): New macros. + (FT_PAD_ROUND_INT32, FT_PAD_CEIL_INT32, FT_PIX_ROUND_INT32, + FT_PIX_CEIL_INT32): New macros. + +2017-06-09 Werner Lemberg <wl(a)gnu.org> + + Remove unused macros. + + * include/freetype/internal/ftcalc.h (ADD_INT, SUB_INT, MUL_INT, + NEG_INT): Deleted. + +2017-06-09 Werner Lemberg <wl(a)gnu.org> + + */*: Remove `OVERFLOW_' prefix. + + This increases readability. + +2017-06-07 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2133 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2137 + + * src/cff/cf2hints.c (cf2_hint_init): Use OVERFLOW_SUB_INT32. + + * src/truetype/ttinterp.c (PROJECT, DUALPROJ): Use + OVERFLOW_SUB_LONG. + +2017-06-06 Werner Lemberg <wl(a)gnu.org> + + [cff] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2109 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2110 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2122 + + * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. + + * src/cff/cf2hints.c (cf2_hintmap_map): Synchronize if-else + branches. + +2017-06-05 Werner Lemberg <wl(a)gnu.org> + + [cff] Integer overflow. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2089 + + * src/cff/cffload.c (cff_blend_doBlend): User OVERFLOW_ADD_INT32. + +2017-06-04 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2075 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2088 + + * src/cff/cf2font.c (cf2_font_setup): Use OVERFLOW_MUL_INT32. + + * src/truetype/ttinterp.c (Ins_ISECT): Use OVERFLOW_MUL_LONG, + OVERFLOW_ADD_LONG, and OVERFLOW_SUB_LONG. + +2017-06-03 Werner Lemberg <wl(a)gnu.org> + + [base, cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2060 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2062 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2063 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2068 + + * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use + OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. + + * src/cff/cf2blues.c (cf2_blues_capture), src/cff/cf2hints.c + (cf2_hintmap_adjustHints): Use OVERFLOW_SUB_INT32. + + * src/truetype/ttgload.c (compute_glyph_metrics): User + OVERFLOW_SUB_LONG. + + * src/truetype/ttinterp.c (Direct_Move, Direct_Move_Orig, + Direct_Move_X, Direct_Move_Y, Direct_Move_Orig_X, + Direct_Move_Orig_Y, Move_Zp2_Point, Ins_MSIRP): Use + OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. + +2017-06-03 Werner Lemberg <wl(a)gnu.org> + + * builds/unix/freetype-config.in: Fix pkg-config test (#51162). + + Patch directly taken from bug report. + +2017-06-03 Werner Lemberg <wl(a)gnu.org> + + [bdf] Synchronize sanity checks with pcf driver. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2054 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2058 + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Check font ascent and descent. + Check AVERAGE_WIDTH, POINT_SIZE, PIXEL_SIZE, RESOLUTION_X, and + RESOLUTION_Y properties. + +2017-06-03 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2047 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2057 + + * src/cff/cf2hints.c (cf2_hintmap_map): Use OVERFLOW_SUB_INT32. + + * src/truetype/ttinterp.c (Ins_ADD): Use OVERFLOW_ADD_LONG. + (Ins_SUB): Use OVERFLOW_SUB_LONG. + (Ins_NEG): Use NEG_LONG. + +2017-06-03 Werner Lemberg <wl(a)gnu.org> + + ftcalc.h: Avoid left-shift of negative numbers. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2055 + + * include/freetype/internal/ftcalc.h (INT_TO_F26DOT6, + INT_TO_F2DOT14, INT_TO_FIXED, F2DOT14_TO_FIXED): Use multiplication. + +2017-06-02 Werner Lemberg <wl(a)gnu.org> + + [cff] Even more integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2046 + + * src/cff/cf2intrp.c (cf2_doStems, cf2_interpT2CharString): Use + OVERFLOW_ADD_INT32. + +2017-06-02 Werner Lemberg <wl(a)gnu.org> + + [cff] More integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2032 + + * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. + +2017-06-02 Werner Lemberg <wl(a)gnu.org> + + [bdf] Don't left-shift negative numbers. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2031 + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Use multiplication. + +2017-06-02 Werner Lemberg <wl(a)gnu.org> + + [bdf] Fix integer scanning routines. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2029 + + * src/bdf/bdflib.c (_bdf_atoul, _bdf_atol, _bdf_atous, _bdf_atos): + Stop scanning if result would overflow. + +2017-06-02 Werner Lemberg <wl(a)gnu.org> + + [cff] Fix integer overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2027 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2028 + + * src/cff/cf2hints.c (cf2_hintmap_insertHint), src/cff/cf2intrp.c + (cf2_doFlex): Use OVERFLOW_ADD_INT32 and OVERFLOW_SUB_INT32. + +2017-06-01 Werner Lemberg <wl(a)gnu.org> + + [smooth] Some 32bit integer overflow run-time errors. + + * src/smooth/ftgrays.c [STANDALONE] (OVERFLOW_ADD_LONG, + OVERFLOW_SUB_LONG, OVERFLOW_MUL_LONG, NEG_LONG): New macros. + [!STANDALONE]: Include FT_INTERNAL_CALC_H. + (gray_render_cubic): Use those macros where appropriate. + +2017-06-01 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftglyph.c (FT_Get_Glyph): Check `slot->advance'. + +2017-06-01 Werner Lemberg <wl(a)gnu.org> + + [psaux] 32bit integer overflow tun-time errors (#46149). + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Use + OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG where appropriate. + +2017-06-01 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter again. + + Problem reported by Marek KaÅ¡Ãk <mkasik(a)redhat.com>. + + The problematic font that exceeds the old limit is Padauk-Bold, + version 3.002, containing bytecode generated by a buggy version of + ttfautohint. + +2017-05-31 Werner Lemberg <wl(a)gnu.org> + + [cff] 32bit integer overflow run-time errors 2/2 (#46149). + + This commit handles the new engine. + + * include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32, + OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG, + NEG_INT32): New macros. + + * src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32. + + * src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init, + cf2_hintmap_map, cf2_glyphpath_hintPoint, + cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset, + cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use + OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and + NEG_INT32 where appropriate. + + * src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend, + cf2_interpT2CharString): Ditto. + Also add some other code where needed to avoid overflow. + +2017-05-30 Werner Lemberg <wl(a)gnu.org> + + [cff] 32bit integer overflow run-time errors 1/2 (#46149). + + This commit handles the old engine. + + * src/cff/cffgload.c: Include FT_INTERNAL_CALC_H. + (cff_decoder_parse_charstrings): Use OVERFLOW_ADD_LONG and + OVERFLOW_SUB_LONG where needed. + + * src/cff/cffparse.c: Include FT_INTERNAL_CALC_H. + (power_ten_limits): New static array. + (do_fixed): Use it to prevent multiplication overflow. + (cff_parser_run): Use OVERFLOW_ADD_LONG. + +2017-05-30 Werner Lemberg <wl(a)gnu.org> + + [psaux] Correctly handle sequences of multiple number signs. + + * src/psaux/psconv.c (PS_Conv_Strtol, PS_Conv_ToFixed): Return zero + if we encounter more than a single sign. + +2017-05-29 Werner Lemberg <wl(a)gnu.org> + + [pcf] 32bit integer overflow run-time errors (#46149). + + * src/pcf/pcfread.c (pcf_get_accel): Add sanity checks for + `fontAscent' and `fontDescent'. + (pcf_load_font): Add sanity checks for global height. + Add sanity checks for AVERAGE_WIDTH, POINT_SIZE, PIXEL_SIZE, + RESOLUTION_X, and RESOLUTION_Y properties. + +2017-05-29 Werner Lemberg <wl(a)gnu.org> + + Handle some integer overflow run-time errors (#46149, #48979). + + This commit (mainly for 32bit CPUs) is the first of a series of + similar commits to handle known integer overflows. Basically, all + of them are harmless, since they affect rendering of glyphs only, + not posing security threats. It is expected that fuzzying will show + up more overflows, to be fixed in due course. + + The idea is to mark places where overflows can occur, using macros + that simply cast to unsigned integers, because overflow arithmetic + is well defined in this case. Doing so suppresses run-time errors + of sanitizers without adding computational overhead. + + * include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT, + OVERFLOW_SUB_INT, OVERFLOW_MUL_INT, OVERFLOW_ADD_LONG, + OVERFLOW_SUB_LONG, OVERFLOW_MUL_LONG): New macros. + + * src/base/ftcalc.c (FT_RoundFix, FT_CeilFix, FT_Matrix_Multiply, + FT_Matrix_Multiply_Scaled, FT_Vector_Transform_Scaled, + ft_corner_orientation): Use new macros. + + * src/base/ftoutln.c (FT_Outline_Get_Orientation): Use new macros. + +2017-05-28 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/internal/ftcalc.h (FLOAT_TO_FIXED): Remove. + + This macro is not used. + +2017-05-28 Werner Lemberg <wl(a)gnu.org> + + [cff] s/cf2_floatToFixed/cf2_doubleToFixed/. + + The new name better describes what the macro actually does; + additionally, we don't need a trailing `f' for literals (there was + only a single such instance in the code, but this caused a clang + warning because the macro itself uses `double' literals). + + * src/cff/cf2blues.c, src/cff/cf2blues.h, src/cff/cf2fixed.h, + src/cff/cf2font.c, src/cff/cf2hints.c: Updated. + +2017-05-28 Werner Lemberg <wl(a)gnu.org> + + Fix negation of INT_MIN and LONG_MIN (#46149). + + * src/base/ftcalc.c (FT_MOVE_SIGN): Add argument to pass unsigned + value, to be used as the result. + (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix, FT_MulFix, + FT_Vector_NormLen): Updated. + +2017-05-27 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix handling of design coordinates (#51127). + + * src/truetype/ttgxvar.c (tt_set_mm_blend): Compute all design + coordinates if we have to create the `blends->coord' array. + (TT_Get_MM_Blend, TT_Get_Var_Design): Select default instance + coordinates if no instance is selected yet. + +2017-05-24 Werner Lemberg <wl(a)gnu.org> + + [bdf, pcf] Support ISO646.1991-IRV character encoding (aka ASCII). + + Problem reported by Marek KaÅ¡Ãk <mkasik(a)redhat.com>, cf. + + https://bugzilla.redhat.com/show_bug.cgi?id=1451795 + + * src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c + (PCF_Face_Init): Implement it. + +2017-05-20 Nikolaus Waxweiler <madigens(a)gmail.com> + + [truetype] Always use interpreter v35 for B/W rendering (#51051). + + * src/truetype/ttgload.c (tt_loader_init) + [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Adjust + `subpixel_hinting_lean', `grayscale_cleartype', and + `vertical_lcd_lean' accordingly. + + * src/truetype/ttinterp.c (Ins_GETINFO): Updated. + (TT_RunIns): Update `backward_compatibility' flag. + +2017-05-20 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [smooth] Implement minimal dynamic padding for LCD filtering. + + Extra bitmap padding for LCD filtering depends on the filter. The + default 5-tap filter needs 2 extra subpixels. The light 3-tap filter + needs only 1 extra subpixel. This space could be already available + due to rounding. In order to optimize the padding, we now expand + CBox for the given filter weights before rounding. + + This change breaks current Skia (and Firefox). + + * include/freetype/internal/ftobjs.h (FT_LibraryRec) + [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Remove `lcd_extra' field. + + * src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights, + FT_Library_SetLcdFilter): Remove `lcd_extra' initializations. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Implement dymanic + LCD padding. + +2017-05-15 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Return proper scaling values for SBIX bitmaps. + + Problem reported by Hin-Tak Leung <htl10(a)users.sourceforge.net>. + + * src/sfnt/ttsbit.c (tt_face_load_strike_metrics): Implement it. + +2017-05-15 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix error handling for embedded bitmaps. + + Problem reported by Hin-Tak Leung <htl10(a)users.sourceforge.net>. + + * src/truetype/ttgload.c (TT_Load_Glyph) + [TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Handle error if font is not + scalable. + +2017-05-15 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [autofit] Make autohint warping NORMAL option. + + This moves warping option from LIGHT to NORMAL mode. This makes LIGHT + truly void of hinting in x-direction, with left side bearing never + changed and right side bearing only altered by advance rounding. + Therefore, LIGHT is now ready to return fractional advance. As a + NORMAL option, warping substitutes normal hinting. + + * src/autofit/afcjk.c (af_cjk_hints_apply): Updated. + * src/autofit/aflatin.c (af_latin_hints_apply): Updated. + * src/autofit/aflatin2.c (af_latin2_hints_apply): Updated. + + * src/autofit/afloader.c (af_loader_load_glyph): Handle warping + phantom points as normal. + +2017-05-14 Werner Lemberg <wl(a)gnu.org> + + Remove remnants of raster pool. + + * include/freetype/internal/ftobjs.h (FT_LibraryRec): Remove + `raster_pool' and `raster_pool_size' fields. + + * src/base/ftobjs.c (FT_New_Library), src/raster/ftrend1.c + (ft_raster1_init), src/smooth/ftsmooth.c (ft_smooth_init): Updated. + +2017-05-13 Werner Lemberg <wl(a)gnu.org> + + * Version 2.8 released. + ======================= + + + Tag sources with `VER-2-8'. + + * docs/VERSION.TXT: Add entry for version 2.8. + * docs/CHANGES: Updated. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.7.1/2.8/, s/271/28/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 8. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 20:0:14. + * CMakeLists.txt (VERSION_MINOR): Set to 8. + (VERSION_PATCH): Set to 0. + +2017-05-12 Hin-Tak Leung <htl10(a)users.sourceforge.net> + + Fix `FT_UINT_TO_POINTER' macro for Windows. + + * builds/unix/ftconfig.in, builds/vms/ftconfig.h, + include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER) [_WIN64]: + Fix definition. + +2017-05-11 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Chakma script. + + * src/autofit/afblue.dat: Add blue zone data for Chakma. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Chakma standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Chakma data. + +2017-05-10 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Kayah Li script. + + * src/autofit/afblue.dat: Add blue zone data for Kayah Li. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Kayah Li standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Kayah Li data. + +2017-05-10 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Bamum script. + + * src/autofit/afblue.dat: Add blue zone data for Bamum. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Bamum standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Bamum data. + +2017-05-10 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Saurashtra script. + + * src/autofit/afblue.dat: Add blue zone data for Saurashtra. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Saurashtra standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Saurashtra + data. + +2017-05-10 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Buhid script. + + * src/autofit/afblue.dat: Add blue zone data for Buhid. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Buhid standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Buhid data. + +2017-05-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Shavian script. + + * src/autofit/afblue.dat: Add blue zone data for Shavian. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Shavian standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Shavian data. + +2017-05-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Vai script. + + * src/autofit/afblue.dat: Add blue zone data for Vai. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Vai standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Vai data. + +2017-05-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Osmanya script. + + * src/autofit/afblue.dat: Add blue zone data for Osmanya. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Osmanya standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Osmanya data. + +2017-05-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Coptic script. + + * src/autofit/afblue.dat: Add blue zone data for Coptic. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Coptic standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Coptic data. + +2017-05-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Carian script. + + * src/autofit/afblue.dat: Add blue zone data for Carian. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Carian standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Carian data. + +2017-05-07 Werner Lemberg <wl(a)gnu.org> + + [truetype] Add tricky font `DFGirl-W6-WIN-BF' (from Dynalab). + + Reported by Roy Tam <roytam(a)gmail.com>. + + * src/truetype/ttobjs.c (tt_check_trickyness_family): Implement it. + +2017-05-07 Roy Tam <roytam(a)gmail.com> + Werner Lemberg <wl(a)gnu.org> + + [truetype] More tricky fonts (mainly from Dynalab). + + * src/truetype/ttobjs.c (tt_check_trickyness_family, + tt_check_trickyness_sfnt_ids): Add them. + +2017-05-07 Werner Lemberg <wl(a)gnu.org> + + [truetype] Add tricky font `DLCHayMedium' (from Dynalab). + + Reported by Roy Tam <roytam(a)gmail.com>. + + * src/truetype/ttobjs.c (tt_check_trickyness_family): Implement it. + +2017-05-03 Werner Lemberg <wl(a)gnu.org> + + */*: s/backwards compatibility/backward compatibility/. + +2017-05-03 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Unified Canadian Syllabics script. + + * src/autofit/afblue.dat: Add blue zone data for Unified Canadian + Syllabics. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Unified Canadian Syllabics standard + character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Unified + Canadian Syllabics data. + +2017-05-03 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org> + + [autofit] Add blue-zone support for Sundanese script. + + This essentially moves the Sundanese script from the `Indic' hinter + to the `Latin' hinter. + + * src/autofit/afblue.dat: Add blue zone data for Sundanese. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Sundanese standard character and move + data out of AF_CONFIG_OPTION_INDIC block. + + * src/autofit/afranges.c: Move Sundanese data out of + AF_CONFIG_OPTION_INDIC block. + + * src/autofit/afstyles.h: Update Sundanese data; in particular, use + AF_WRITING_SYSTEM_LATIN. + +2017-05-03 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Avestan script. + + * src/autofit/afblue.dat: Add blue zone data for Avestan. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Avestan standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Avestan data. + +2017-05-02 Behdad Esfahbod <behdad(a)behdad.org> + + [truetype] Make `IUP' gvar deltas do the same as Apple (#50832). + + When points are not touched by gvar interpolation deltas, FreeType + gave a slightly different result than Apple's CoreText. + + The OpenType working group will update the specification to document + the following behaviour: If the two points with deltas to the `left' + and `right' of the untouched point have the same coordinate, then + the inferred delta for the untouched point should be zero. + + * src/truetype/ttgxvar.c (tt_delta_interpolate): Implement new + behaviour. + +2017-05-02 Werner Lemberg <wl(a)gnu.org> + + [autofit] Remove `slight' auto-hint mode again. + + A poll on freetype-devel favoured changes directly applied to + `light'. + + * include/freetype/freetype.h (FT_LOAD_TARGET_SLIGHT, + FT_RENDER_MODE_SLIGHT): Removed. + + * src/autofit/afcjk.c (af_cjk_hints_init), src/autofit/aflatin.c + (af_latin_hints_init), src/autofit/aflatin2.c + (af_latin2_hints_init): Revert change from 2017-04-22. + + * src/autofit/afloader.c (af_loader_load_glyph) Remove references to + FT_RENDER_MODE_SLIGHT. + [AF_CONFIG_OPTION_TT_SIZE_METRICS]: Enable TrueType-like metrics + unconditionally. + + * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Revert change from + 2017-04-22. + + * src/base/ftobjs.c (FT_Load_Glyph): Revert change from 2017-04-22. + + * src/pshinter/pshalgo.c (ps_hints_apply): Revert change from + 2017-04-22. + + * src/smooth/ftsmooth.c (ft_smooth_render): Revert change from + 2017-04-22. + + * docs/CHANGES: Updated. + +2017-04-30 Werner Lemberg <wl(a)gnu.org> + + [autofit] Fix metrics computation. + + Problem reported by Markus Trippelsdorf <markus(a)trippelsdorf.de> and + Nikolaus Waxweiler <madigens(a)gmail.com>. + + * src/base/ftobjs.c (FT_Request_Size): Trigger recomputation of + auto-hinter metrics. Without this change, multiple size changing + calls for a single face fail. + +2017-04-29 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttdriver.c (tt_size_request): Properly check `error'. + + Reported by Earnestly <zibeon(a)googlemail.com> in + + https://lists.nongnu.org/archive/html/freetype/2017-04/msg00031.html + +2017-04-27 Werner Lemberg <wl(a)gnu.org> + + Introduce AF_CONFIG_OPTION_TT_SIZE_METRICS configuration option. + + * include/freetype/config/ftoption.h + (AF_CONFIG_OPTION_TT_SIZE_METRICS): New option, commented out by + default. + + * src/autofit/afloader.c (af_loader_load_glyph): Use + AF_CONFIG_OPTION_TT_SIZE_METRICS to guard the corresponding code. + +2017-04-26 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/freetype.h (FT_Render_Mode): Fix order. + + This retains backward compatibility. + + Noted by Alexei. + +2017-04-22 Werner Lemberg <wl(a)gnu.org> + + [truetype] Do linear scaling for FT_LOAD_NO_HINTING (#50470). + + * src/truetype/ttobjs.h (TT_SizeRec): Add field `hinted_metrics' to + hold hinted metrics. + Make `metrics' a pointer so that `tt_glyph_load' can easily switch + between metrics. + + * src/truetype/ttdriver.c (tt_size_request): Updated. + (tt_glyph_load): Use top-level metrics if FT_LOAD_NO_HINTING is + used. + + * src/truetype/ttgload.c (TT_Hint_Glyph, TT_Process_Simple_Glyph, + TT_Process_Composite_Component, load_truetype_glyph, + compute_glyph_metrics, TT_Load_Glyph): Updated. + + * src/truetype/ttinterp.c (TT_Load_Context): Updated. + + * src/truetype/ttobjs.c (tt_size_reset): Updated. + + * src/truetype/ttsubpix.c (sph_set_tweaks): Updated. + +2017-04-22 Werner Lemberg <wl(a)gnu.org> + + Add new `slight' auto-hinting mode. + + This mode uses fractional advance widths and doesn't scale glyphs + horizontally, only applying vertical scaling and hinting. + + At the same time, the behaviour of the `light' auto-hinter gets + restored for backward compatibility: Both vertical and horizontal + scaling is again based on rounded metrics values (this was changed + in a commit from 2017-03-30 as a side effect). To be more precise, + the behaviour is restored for TrueType fonts only; for other font + formats like Type 1, this is a new feature of the `light' hinting + mode. + + * include/freetype/freetype.h (FT_LOAD_TARGET_SLIGHT): New macro. + (FT_RENDER_MODE_SLIGHT): New render mode. + + * include/freetype/internal/ftobjs.h (FT_Size_InternalRec): Add + `autohint_mode' and `autohint_metrics' fields. + + * src/autofit/afcjk.c (af_cjk_hints_init), src/autofit/aflatin.c + (af_latin_hints_init), src/autofit/aflatin2 (af_latin2_hints_init): + Updated. + + * src/autofit/afloader.c (af_loader_embolden_glyph_in_slot): Use + `autohint_metrics'. + (af_loader_load_glyph): s/internal/slot_internal/. + Initialize `autohint_metrics' and `autohint_mode' depending on + current auto-hint mode. + Use `autohint_metrics'. + Updated. + + * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Updated. + + * src/base/ftobjs.c (FT_Load_Glyph): Updated. + (FT_New_Size): Allocate `internal' object. + + * src/pshinter/pshalgo.c (ps_hints_apply): Updated. + + * src/smooth/ftsmooth.c (ft_smooth_render): Updated. + +2017-04-22 Werner Lemberg <wl(a)gnu.org> + + Introduce `FT_Size_InternalRec' structure. + + We are going to extend this later on. + + * include/freetype/internal/ftobjs.h (FT_Size_InternalRec): New + structure with a single field `module_data'. + + * src/base/ftobjs.c (FT_New_Size): Allocate `internal' field of + `FT_Size' structure. + + * src/cff/cffgload.c (cff_builder_init, cff_decoder_prepare): Use + `size->internal->module_data' instead of `size->internal'. + + * src/cff/cffobjs.c (cff_size_done): Deallocate `module_data'. + (cff_size_init, cff_size_select, cff_size_request): Use + `size->internal->module_data' instead of `size->internal'. + + * src/cif/cidobjs.c (cid_size_done, cid_size_init, + cid_size_request): Use `size->internal->module_data' instead of + `size->internal'. + + * src/psaux/psobjs.c (t1_builder_ini): Use + `size->internal->module_data' instead of `size->internal'. + + * src/type1/t1objs.c (T1_Size_Done, T1_Size_Init, T1_Size_Request): + Use `size->internal->module_data' instead of `size->internal'. + +2017-04-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/smooth/ftsmooth.h: Remove unused guards and declaration. + +2017-04-16 Hin-Tak Leung <htl10(a)users.sourceforge.net> + + Fix tracing messages. + + * src/base/ftobjs.c (FT_Face_GetCharVariantIndex, + FT_Face_GetCharVariantIsDefault, FT_Face_GetVariantsOfChar): Print + correct function name. + +2017-04-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Old Turkic script. + + * src/autofit/afblue.dat: Add blue zone data for Old Turkic. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Old Turkic standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Old Turkic data. + +2017-04-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Gothic script. + + * src/autofit/afblue.dat: Add blue zone data for Gothic. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Gothic standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Gothic data. + +2017-04-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Cypriot script. + + * src/autofit/afblue.dat: Add blue zone data for Cypriot. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Cypriot standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Cypriot data. + +2017-04-08 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Deseret script. + + * src/autofit/afblue.dat: Add blue zone data for Deseret. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Deseret standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Deseret data. + +2017-04-07 Werner Lemberg <wl(a)gnu.org> + + [autofit] Fix invalid character range description (#50745). + + Also reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1034 + + * src/autofit/afranges.c (af_glag_nonbase_uniranges): Fix typo in + recent commit. + +2017-04-07 Werner Lemberg <wl(a)gnu.org> + + [ftfuzzer] Fix clang warnings. + + * src/tools/ftfuzzer/ftfuzzer.cc (LLVMFuzzerTestOneInput): Add + casts. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Lisu script. + + * src/autofit/afblue.dat: Add blue zone data for Lisu. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Lisu standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Lisu data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Osage script. + + * src/autofit/afblue.dat: Add blue zone data for Osage. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Osage standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Osage data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Glagolitic script. + + * src/autofit/afblue.dat: Add blue zone data for Glagolitic. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Glagolitic standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Glagolitic data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Tai Viet script. + + * src/autofit/afblue.dat: Add blue zone data for Tai Viet. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Tai Viet standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Tai Viet data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for Tifinagh script. + + * src/autofit/afblue.dat: Add blue zone data for Tifinagh. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Tifinagh standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Tifinagh data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + Werner Lemberg <wl(a)gnu.org + + [autofit] Add support for N'Ko script. + + * src/autofit/afblue.dat: Add blue zone data for N'Ko. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add N'Ko standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add N'Ko data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + + [autofit] Add support for Adlam script. + + * src/autofit/afblue.dat: Add blue zone data for Adlam. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Adlam standard characters. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Adlam data. + +2017-04-06 Sascha Brawer <sascha(a)google.com> + + [autofit] Add support for Ol Chiki script. + + * src/autofit/afblue.dat: Add blue zone data for Ol Chiki. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Ol Chiki standard character. + + * src/autofit/afranges.c, src/autofit/afstyles.h: Add Ol Chiki data. + +2017-04-03 Werner Lemberg <wl(a)gnu.org> + + [truetype] Avoid reexecution of `fpgm' and `prep' in case of error. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=981 + + * include/freetype/fterrdef.h (FT_Err_DEF_In_Glyf_Bytecode): New + error code. + + * src/truetype/ttinterp.c (Ins_FDEF, Ins_IDEF): Prohibit execution + of these two opcodes in `glyf' bytecode. + (TT_RunIns): Don't enforce reexecution of `fpgm' and `prep' bytecode + in case of error since function tables can no longer be modified + (due to the changes in `Ins_FDEF' and `Ins_IDEF'). This change can + enormously speed up handling of broken fonts. + +2017-04-02 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [autofit] Disable metrics adjustment for `FT_LOAD_TARGET_LCD'. + + * src/autofit/aflatin.c (af_latin_hints_init): Updated. + * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto. + +2017-04-01 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgload.c: Include FT_CONFIG_CONFIG_H. + + Otherwise FT_UINT_TO_POINTER might not be defined. + + Problem reported by Alexei. + +2017-03-31 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + [autofit] Disable stem adjustment for `FT_LOAD_TARGET_LCD'. + + * include/freetype/freetype.h (FT_LOAD_TARGET_LCD): Document it. + * src/autofit/afcjk.c (af_cjk_hints_init): Updated. + * src/autofit/aflatin.c (af_latin_hints_init): Ditto. + * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto. + +2017-03-31 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffload.c (cff_font_load): Improve fix from 2017-01-04. + + Allow CFFs containing a single font to have an empty font name. + + Problem reported by åŒµä¿è <418092625(a)qq.com> in + + https://lists.nongnu.org/archive/html/freetype-devel/2017-03/msg00074.html + +2017-03-30 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also. + + Requested by Dave Arnold. + +2017-03-30 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix HVAR and VVAR handling (#50678). + + * src/truetype/ttgxvar.c (tt_hvadvance_adjust): Handle + glyph indices larger than `mapCount' as described in the + specification. + +2017-03-30 Werner Lemberg <wl(a)gnu.org> + + [truetype] Allow linear scaling for unhinted rendering (#50470). + + * src/truetype/ttdriver.c (tt_size_request): Revert change from + 2011-07-16; the intended metrics fix seems now to be implemented in + a different way, making the patch unnecessary. Note that this + change was usually patched out by all major GNU/Linux distributions + due to heavy side effects. + + * src/truetype/ttgload.c (compute_glyph_metrics, TT_Load_Glyph): + Refer to the metrics of the `TT_Size' object. + +2017-03-29 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix thinko related to PS name of default named instance. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): `strid' and `psid' are + name ID values, not indices into the array of name entries. + +2017-03-27 Werner Lemberg <wl(a)gnu.org> + + [cid, truetype] Don't use `index' as a variable name. + + At least on FreeBSD there is a global declaration of `index' in file + `/usr/include/strings.h'. + + * src/cff/cf2intrp.c, src/truetype/ttgload.c: s/index/idx/ where + appropriate. + +2017-03-27 Wojciech Mamrak <wmamrak(a)gmail.com> + + [sfnt] Minor improvement for handling kern tables. + + * src/sfnt/ttkern.c (tt_face_load_kern): Don't check for + cross-stream kerning tables since we reject format 2 tables later + on anyways. + Modify code for limit test... + (tt_face_get_kerning): ... to avoid a limit test here. + +2017-03-27 Werner Lemberg <wl(a)gnu.org> + + [pcf] Fix compiler warnings. + + Reported by Alexander Hedges <ahedges(a)student.ethz.ch>. + + * src/pcf/pcfdrivr.c (pcf_property_set, pcf_property_get): Tag + `property_name' with `FT_UNUSED' where necessary. + +2017-03-26 Werner Lemberg <wl(a)gnu.org> + + * src/psaux/psobjs.c (t1_builder_close_contour): Add safety guard. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941 + +2017-03-23 Werner Lemberg <wl(a)gnu.org> + + [psaux] Better protect `flex' handling. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935 + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings) + <callothersubr>: Since there is not a single flex operator but a + series of subroutine calls, malformed fonts can call arbitrary other + operators after the start of a flex, possibly adding points. For + this reason we have to check the available number of points before + inserting a point. + +2017-03-23 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Fix check for default named instance. + + * src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four + bytes, not two... + +2017-03-23 Werner Lemberg <wl(a)gnu.org> + + Make MM fonts work (again). + + * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, + FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore + return value of `ft_face_get_mvar_service'; instead, check whether a + service is actually returned. + +2017-03-20 Werner Lemberg <wl(a)gnu.org> + + [truetype] Some variable renamings. + + Too much local variables holding different structures were called + `metrics'. + + * src/truetype/ttdriver.c (tt_size_select): s/metrics/size_metrics/. + + * src/truetype/ttgload.c (tt_get_metrics_incr_overrides, + compute_glyph_metrics): s/metrics/incr_metrics/. + (load_sbit_image): s/metrics/sbit_metrics/. + + * src/truetype/ttobjs.c (tt_size_run_fpgm): s/metrics/size_metrics/. + (tt_size_init_bytecode): s/metrics/tt_metrics/. + (tt_size_reset): s/metrics/size_metrics/. + +2017-03-20 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Don't add instances to non-variation fonts. + + * src/sfnt/sfobjs.c (sfnt_init_face): Fix it. + +2017-03-20 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffgload.c (cff_builder_init): Add safety guard (#50578). + +2017-03-18 Werner Lemberg <wl(a)gnu.org> + + Introduce FT_UINT_TO_POINTER macro (#50560). + + We have to make a separate case for Windows 64's LLP64 data model. + + * builds/unix/ftconfig.in, builds/vms/ftconfig.h, + include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER): New macro. + + * src/truetype/ttgload.c (load_truetype_glyph): Use it. + +2017-03-18 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter (#50573). + + The problematic font that exceeds the old limit is Lato-Regular, + version 2.007, containing bytecode generated by a buggy version of + ttfautohint. + +2017-03-18 Werner Lemberg <wl(a)gnu.org> + + [truetype] Another limitation for bytecode loop count maximum. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=900 + + * src/truetype/ttinterp.c (TT_RunIns): Limit `loopcall_counter_max' + by number of glyphs also. + +2017-03-18 Werner Lemberg <wl(a)gnu.org> + + [ftfuzzer] Minor improvement. + + * src/tools/ftfuzzer/ftfuzzer.cc: Don't set intermediate axis if + bitmap strikes are active. + +2017-03-18 Werner Lemberg <wl(a)gnu.org> + + Improve `make multi'. + + * src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2. + + * src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH. + + * src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM. + + * src/sfnt/pngshim.c: Guard file with + TT_CONFIG_OPTION_EMBEDDED_BITMAPS also. + + * src/sfnt/ttbdf.c: Avoid empty source file. + * src/sfnt/ttpost.c: Guard file with + TT_CONFIG_OPTION_POSTSCRIPT_NAMES. + * src/sfnt/ttsbit.c: Guard file with + TT_CONFIG_OPTION_EMBEDDED_BITMAPS. + + * src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty + source file. + + * src/truetype/ttsubpix.c: Guard file with + TT_USE_BYTECODE_INTERPRETER also. + + * src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM. + + * src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c, + src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c, + src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c, + src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c, + src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c, + src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort + entries. + +2017-03-17 Werner Lemberg <wl(a)gnu.org> + + Fixes for conditional compilation. + + * src/autofit/afcjk.c, src/autofit/afindic.c: Include `afcjk.h' + earlier. + + * src/sfnt/sfobjs.c (sfnt_init_face): Put `memory' variable into + TT_CONFIG_OPTION_GX_VAR_SUPPORT block. + (sfnt_done_face): Protect some code with + TT_CONFIG_OPTION_GX_VAR_SUPPORT. + + * src/sfnt/ttsbit.c (tt_face_load_sbix_image): Remove compiler + warning. + + * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Put `tmp' variable + into TT_USE_BYTECODE_INTERPRETER block. + + (tt_loader_init): Put `error' variable into + TT_USE_BYTECODE_INTERPRETER block. + +2017-03-17 Werner Lemberg <wl(a)gnu.org> + + Fix preprocessor warning. + + * devel/ftoption.h, include/freetype/config/ftoption.h: Test whether + TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined before checking its + value. + +2017-03-17 Werner Lemberg <wl(a)gnu.org> + + `make multi' fixes; compiler warnings. + + * src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H. + + * src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include + FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H. + + * src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include + FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H. + (get_win_string, get_apple_string): Initialize `result'. + +2017-03-17 Dave Arnold <darnold(a)adobe.com> + + [cff] Fix potential bugs in default NDV for CFF2. + + * src/cff/cffload.c (cff_blend_build_vector): Explicitly build blend + vector when `lenNDV' is zero; don't rely on zero-init. + Save `lenNDV' as part of cache key even when `lenNDV' is zero. + +2017-03-17 Dave Arnold <darnold(a)adobe.com> + + [cff] Fix CFF2 stack allocation. + + * src/cff/cffparse.c (cff_parser_init) add 1 for operator. + +2017-03-16 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgxvar.c (tt_done_blend): Free `vvar_table'. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=883 + +2017-03-15 Werner Lemberg <wl(a)gnu.org> + + Remove clang compiler warnings (#50548). + + * include/freetype/internal/tttypes.h (TT_FaceRec): Make + `var_postscript_prefix_len' unsigned. + + * src/autofit/afwarp.c (af_warper_compute_line_best): Remove + redundant assignment. + + * src/cff/cffload.c (cff_subfont_load): Add casts. + + * src/cff/cffparse.c (cff_parse_blend): Remove redundant assignment. + + * src/sfnt/sfdriver.c (fmix32, murmur_hash_3_128): Add `static' + keyword. + Add casts. + (fixed2float): Add cast. + (sfnt_get_var_ps_name): Make `p' always initialized. + Add casts. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Add casts. + +2017-03-15 Werner Lemberg <wl(a)gnu.org> + + [ftfuzzer] Limit number of tested faces and instances. + + This is inspired by the discussion in and analysis of + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=859 + + * src/tools/ftfuzzer/ftfuzzer.cc (LLVMFuzzerTestOneInput): Use only + up to 20 face indices. + Use only up to 20 instance indices. + +2017-03-15 Werner Lemberg <wl(a)gnu.org> + + * src/tools/ftfuzzer/ftfuzzer.cc: Improve readability; formatting. + +2017-03-14 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Implement PS names for font instances [3/3]. + + Everything is guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT. + + * include/freetype/internal/tttypes.h (TT_FaceRec): New fields + `var_postscript_prefix' and `var_postscript_prefix_len'. + + * src/sfnt/sfdriver.c: Include FT_TRUETYPE_IDS_H. + (sfnt_is_alphanumeric): New wrapperfunction for `ft_isalnum'. + (get_win_string, get_apple_string): Remove `const' from return + value. + (MAX_VALUE_DESCRIPTOR_LEN, MAX_PS_NAME_LEN): New macros. + (hexdigits): New array. + (sfnt_get_var_ps_name): New function, implementing Adobe TechNote + 5902 to construct a PS name for a variation font instance. + (sfnt_get_ps_name): Call `sfnt_get_var_ps_name' for font instances. + + * src/sfnt/sfobjs.c (sfnt_done_face): Updated. + + * src/truetype/ttgxvar.c (tt_set_mm_blend): Reset + `face->postscript_name' to trigger recalculation for new instance + parameters. + +2017-03-14 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Implement PS names for font instances [2/3]. + + * src/sfnt/sfdriver.c (fix2float) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: + New function to find the shortest representation of a 16.16 + fractional number. + +2017-03-14 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Implement PS names for font instances [1/3]. + + Add 128bit MurmurHash 3 function. + + Everything is guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT. + + * src/sfnt/sfdriver.c (ROTL32): New macro. + (fmix32, murmur_hash_3_128): New functions. + +2017-03-13 Werner Lemberg <wl(a)gnu.org> + + [truetype] Ignore invalid MVAR tags. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=838 + + * src/truetype/ttgxvar.c (ft_var_load_mvar): Ignore value and emit + warning for invalid tags. + (tt_apply_mvar): Ignore invalid tags. + +2017-03-12 Werner Lemberg <wl(a)gnu.org> + + [truetype] Store and use design coordinates also. + + * include/freetype/internal/services/svmm.h (FT_Get_Var_Blend_Func): + Add `normalizedcoords' argument. + + * src/truetype/ttgxvar.h (GX_BlendRec): Add `coords' field to store + the design coordinates of the current instance. + Updated. + + * src/truetype/ttgxvar.c (TT_Set_MM_Blend): Move functionality to... + (tt_set_mm_blend): ... New function. + Convert data in `normalizedcoords' array to `coords' array on + demand. + (TT_Set_Var_Design): Store argument data in `coords' array. + (TT_Get_Var_Design): Get data from `coords' array. + (tt_get_var_blend): Updated. + (tt_done_blend): Updated. + + * src/cff/cffload.c, src/cff/cffload.h (cff_get_var_blend): Updated. + + * src/cff/cf2ft.c (cf2_getNormalizedVector): Updated. + + * src/cff/cffobjs.c (cff_face_init): Updated. + +2017-03-12 Werner Lemberg <wl(a)gnu.org> + + src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/. + +2017-03-08 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Another fix for buggy variation fonts. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=759 + + * src/sfnt/sfobjs.c (sfnt_init_face): While setting number of + instances to zero for `CFF' fonts table, ensure that there is no + `CFF2' present also (which gets priority). + +2017-03-07 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Improve handling for buggy variation fonts. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=738 + + * src/sfnt/sfobjs.c (sfnt_init_face): While setting number of + instances to zero for `CFF' fonts table, ensure that there is no + `glyf' table present also (which gets priority). + +2017-03-06 Werner Lemberg <wl(a)gnu.org> + + [sfnt, truetype] Always provide default instance. + + As documented in the OpenType specification, an entry for the + default instance may be omitted in the named instance table. In + particular this means that even if there is no named instance table + in the font we actually do have a named instance, namely the default + instance. + + For consistency, we always want the default instance in our list of + named instances. If it is missing, we try to synthesize it. + + * src/sfnt/sfobjs.c (sfnt_init_face): Check whether the default + instance is in the table of named instances. Otherwise adjust + number of instances. + + * src/truetype/ttgxvar.c: Include FT_TRUETYPE_IDS_H. + (TT_Get_MM_Var): Use `face->root.style_flags' as the number of named + instances. + Sythesize a named instance entry if necessary. + (tt_done_blend): Free `normalized_stylecoords'. + +2017-03-05 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Remove redundant code. + + * src/sfnt/sfobjs.c (sfnt_init_face): Remove second test for + `num_instances', which will always succeed. + +2017-03-04 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Add `get_name_id' service. + + * include/freetype/internal/sfnt.h (TT_Get_Name_ID_Func): New + typedef. + (SFNT_Interface): Add `get_name_id' field. + (FT_DEFINE_SFNT_INTERFACE): Updated. + + * src/sfnt/sfdriver.c (search_name_id): Rename to... + (sfnt_get_name_id): ... this. + (sfnt_get_ps_name, sfnt_interface): Updated. + +2017-03-04 Werner Lemberg <wl(a)gnu.org> + + [truetype] Make `TT_Set_MM_Blend' set named instance index. + + * src/truetype/ttgxvar.h (GX_Blend): New array + `normalized_stylecoords'. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Allocate and fill + `normalized_stylecoords'. + (TT_Set_MM_Blend): Check instance tuple and adjust `face_index' + accordingly. + +2017-03-02 Werner Lemberg <wl(a)gnu.org> + + [truetype] Split off designer/normalized conversion routines. + + * src/truetype/ttgxvar.c (TT_Set_Var_Design): Split off conversion + code designer->normalized coordinates to... + (ft_var_to_normalized): ... New function. + (TT_Get_Var_Design): Split off conversion code normalized->designer + coordinates to... + (ft_var_to_design): ... New function. + +2017-02-28 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Further generalize `sfnt_get_ps_name'; report invalid data. + + * src/sfnt/sfdriver.c (sfnt_ps_map): New array. + (sfnt_is_postscript): New function. + (char_type_func): New typedef. + (get_win_string, get_apple_string): Add argument to specify + character checking function. + Add argument whether argument checking failures should be reported. + Update callers. + (search_name_id): Fix return value. + +2017-02-23 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Split off another bit of `sfnt_get_ps_name'. + + * src/sfnt/sfdriver.c (sfnt_get_ps_name): Split off some + functionality into... + (search_name_id): ... New function. + +2017-02-23 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Modularize `sfnt_get_ps_name'. + + * src/sfnt/sfdriver.c (sfnt_get_ps_name): Split off some + functionality into... + (IS_WIN, IS_APPLE): ... New macros. + (get_win_string, get_apple_string): ... New functions. + +2017-02-23 Werner Lemberg <wl(a)gnu.org> + + [truetype] Minor improvement. + + * src/truetype/ttgload.c (TT_Process_Simple_Glyph, + load_truetype_glyph): Remove unnecessary tests. + +2017-02-23 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/. + + For orthogonality with other structure field names. + + Update all users. + +2017-02-22 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/smooth/ftgrays.c (gray_hline): Improve code. + +2017-02-20 Dominik RÃ¶ttsches <drott(a)google.com> + + Fix some `ttnameid.h' entries (#50313). + + * include/freetype/ttnameid.h: + s/TT_MS_LANGID_SPANISH_INTERNATIONAL_SORT/TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT/, + s/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIA/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN/. + +2017-02-20 Werner Lemberg <wl(a)gnu.org> + + [cff] Finish support for `random' operator. + + * src/cff/cfftypes.h (CFF_SubFontRec): Add `random' field. + + * src/cff/cffobjs.c: Updated. + (cff_driver_init): Initialize random seed value. + + * src/cff/cffload.c (cff_random): New function. + (cff_subfont_load): Add `face' argument. + Update all callers. + Initialize random number generator with a proper seed value. + (cff_font_load): Add `face' argument. + Update all callers. + + * src/cff/cffload.h: Updated. + + * src/cff/cf2intrp.c (CF2_FIXME): Removed. + (cf2_interpT2CharString) <cf2_escRANDOM>: Implement opcode. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Don't + initialize random seed value. + <cff_op_random>: Use new random seed framework. + +2017-02-20 Werner Lemberg <wl(a)gnu.org> + + [cff] Sanitize `initialRandomSeed'. + + * src/cff/cffload.c (cff_load_private_dict): Make + `initial_random_seed' value always positive. + +2017-02-20 Werner Lemberg <wl(a)gnu.org> + + [cff] Introduce `random-seed' property (2/2). + + * src/base/ftobjs.c: Include `FT_CFF_DRIVER_H'. + (open_face): Initialize `face->internal->random_seed'. + (FT_Face_Properties): Handle `FT_PARAM_TAG_RANDOM_SEED'. + + * src/cff/cffdrivr.c (cff_property_set): Handle `random-seed' + property. + +2017-02-20 Werner Lemberg <wl(a)gnu.org> + + [cff] Introduce `random-seed' property (1/2). + + We need this for support of the `random' operator. + + * include/freetype/ftcffdrv.h (FT_PARAM_TAG_RANDOM_SEED): New macro. + + * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): New + field `random_seed'. + + * src/cff/cffobjs.h (CFF_DriverRec): New field `random_seed'. + +2017-02-17 Werner Lemberg <wl(a)gnu.org> + + Remove clang warnings. + + * src/autofit/aflatin.c (af_latin_sort_blue): Add missing `static' + keyword. + + * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, + FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): + Initialize some variables. + +2017-02-16 Nikolaus Waxweiler <madigens(a)gmail.com> + Werner Lemberg <wl(a)gnu.org> + + Add face property for stem darkening. + + * include/freetype/ftautoh.h (FT_PARAM_TAG_STEM_DARKENING): New + macro. + + * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): Add + `no_stem_darkening' field. + + * src/autofit/afloader.c (af_loader_load_glyph), + src/autofit/afmodule.c (af_property_set): Updated. + + * src/base/ftobjs.c: Include FT_AUTOHINTER_H. + (ft_open_face_internal): Updated. + (FT_Face_Properties): Handle FT_PARAM_TAG_STEM_DARKENING. + + * src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Updated. + + * src/cff/cffdrivr.c (cff_property_set): Updated. + +2017-02-16 Nikolaus Waxweiler <madigens(a)gmail.com> + Werner Lemberg <wl(a)gnu.org> + + Add face property for LCD filter weights. + + * include/freetype/ftlcdfil.h (FT_PARAM_TAG_LCD_FILTER_WEIGHTS, + FT_LCD_FILTER_FIVE_TAPS): New macros. + (FT_LcdFiveTapFilter): New typedef. + + * include/freetype/ftobjs.h (FT_Face_InternalRec) + [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Add `lcd_weights' field. + (FT_Bitmap_LcdFilterFunc): Change third argument to weights array. + (ft_lcd_filter_fir): New prototype. + (FT_LibraryRec): Updated. + + * src/base/ftlcdfil.c (_ft_lcd_filter_fir): Renamed to... + (ft_lcd_filter_fir): ... this base function. + Updated. + (_ft_lcd_filter_legacy): Updated. + (FT_Library_SetLcdFilterWeights, FT_Library_SetLcdFilter): Updated. + + * src/base/ftobjs.c (ft_open_face_internal): Updated. + (FT_Face_Properties): Handle FT_PARAM_TAG_LCD_FILTER_WEIGHTS. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic) + [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Handle LCD weights from + `FT_Face_Internal'. + +2017-02-14 Nikolaus Waxweiler <madigens(a)gmail.com> + Werner Lemberg <wl(a)gnu.org> + + Add new function `FT_Face_Properties'. + + This commit provides the framework, to be filled with something + useful in the next commits. + + * include/freetype/freetype.h (FT_Face_Properties): Declare. + + * src/base/ftobjs.c (FT_Face_Properties): New function. + +2017-02-13 Werner Lemberg <wl(a)gnu.org> + + [autofit] Prevent overlapping blue zones. + + Problem reported as + + https://github.com/google/fonts/issues/632 + + The font in question (Nunito) has values 705 and 713 for the + reference and overshoot values, respectively, of the first blue + zone. Blue zone 2, however, has value 710 for both the reference + and overshoot. At 12ppem, reference and overshoot of blue zone 0 + becomes 8px, while blue zone 2 becomes 9px. + + A peculiarity of this font is that the tops of isolated vertical + stems like `N' have a slight overshoot also. The auto-hinter tries + to find the nearest blue zone using the *original* coordinates. For + vertical stems, this is value 713. For normal horizontal tops like + in character `E', this is value 710. Since value 713 is mapped to + 8px but value 710 to 9px, `N' and similar characters are one pixel + higher than `E', which looks very bad. + + This commit sanitizes blue zones to avoid such a behaviour. + + * src/autofit/aflatin.c (af_latin_sort_blue): New function. + (af_latin_metrics_init_blues): Sort blue values and remove overlaps. + +2017-02-12 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/smooth/ftgrays.c (gray_sweep): Improve code. + +2017-02-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] Implement `VVAR' table support. + + * src/truetype/ttgxvar.h (GX_HVarTable): Renamed to... + (GX_HVVarTable): ...This. + (GX_Blend): Add fields for `VVAR' table handling. + Other minor updates. + + * src/truetype/ttgxvar.c (ft_var_load_hvar): Renamed to... + (ft_var_load_hvvar): ...This. + Handle VVAR loading also (controlled by an additional parameter). + (tt_hadvance_adjust): Renamed to... + (tt_hvadvance_adjust): ...This. + Handle application of advance height also (controlled by an + additional parameter). + (tt_hadvance_adjust, tt_vadvance_adjust): Wrappers for + `tt_hvadvance_adjust'. + + * src/truetype/ttdriver.c (tt_service_metrics_variations): Updated. + +2017-02-05 Werner Lemberg <wl(a)gnu.org> + + [autofit] Use better blue zone characters for lowercase latin. + + The number of lowercase characters for computing the top flat blue + zone value was too small (in most cases only `x' and `z'). If one + of the two characters has a large serif, say, it can happen that + FreeType must select between two different values, having a 50% + chance to use the wrong one. As a result, rendering at larger PPEM + values could yield uneven lowercase glyph heights. + + Problem reported by Christoph Koeberlin <christoph(a)koe.berlin>. + + * src/autofit/afblue.dat (AF_BLUE_STRING_LATIN_SMALL): Replaced + with... + (AF_BLUE_STRING_LATIN_SMALL_TOP, AF_BLUE_STRING_LATIN_SMALL_BOTTOM): + ... New, extended sets. + (AF_BLUE_STRINGSET_LATN): Updated. + + * src/autofit/afblue.c, scr/autofit/afblue.h: Regenerated. + +2017-02-04 Werner Lemberg <wl(a)gnu.org> + + Make `freetype-config' a wrapper of `pkg-config' if possible. + + Based on ideas taken from + + http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/tree/freetype-multilib… + http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/tree/freetype-2.5.3-fr… + + * builds/unix/freetype-config.in: Rewritten. Use `pkg-config' to + set output variables if program is available. + + * docs/CHANGES, docs/freetype-config.1: Updated. + +2017-02-04 Werner Lemberg <wl(a)gnu.org> + + * builds/unix/unix-def.in (freetype-config): Fix permissions. + +2017-02-03 Werner Lemberg <wl(a)gnu.org> + + * src/autofit/afglobal.c (af_face_globals_free): Erase useless code. + +2017-02-03 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/ftgasp.h (FT_GASP_SYMMETRIC_GRIDFIT): Fix value. + + Reported by Behdad. + +2017-02-02 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix MVAR post-action handling. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=509 + + * src/truetype/ttobjs.c (tt_size_reset): Do nothing for CFF2. This + is important to make `tt_size_reset_iterator' (called in + `tt_apply_mvar') always work. + +2017-02-02 Werner Lemberg <wl(a)gnu.org> + + Make compilation with FT_CONFIG_OPTION_PIC work again. + + All code committed here is guarded with `FT_CONFIG_OPTION_PIC'. + + * include/freetype/internal/services/svmetric.h + (FT_DEFINE_SERVICE_METRICSVARIATIONSREC): Remove trailing semicolon. + + * src/autofit/aflatin.c (af_latin_hints_compute_edges, + af_latin_hint_edges): Provide `globals' variable. + + * src/autofit/afloader.c (af_loader_load_glyph): Remove shadowing + variable. + + * src/autofit/afmodule.c (AF_SCRIPT_CLASSES_GET, + AF_STYLE_CLASSES_GET): Redefine. + + * src/autofit/aftypes.h (AF_DEFINE_WRITING_SYSTEM_CLASS): Fix typo. + + * src/cff/cffparse.c (CFF_FIELD_BLEND): Provide it. + + * src/cff/cffpic.h (CffModulePIC): Fix typo. + +2017-01-31 Alexei Podtelezhnikov <apodtele(a)gmail.com> + + * src/smooth/ftgrays.c (gray_render_scanline): Improve code. + +2017-01-31 Werner Lemberg <wl(a)gnu.org> + + [cff] Provide metrics variation service interface (#50196). + + Only now I've got an OTF with an HVAR table for testing... + + The code in `ftmm.c' uses `FT_FACE_LOOKUP_SERVICE' to get the + metrics variations interface. However, this didn't work with + `FT_FACE_FIND_GLOBAL_SERVICE' used in `sfnt_init_face'. + + * src/cff/cffdrivr.c: Include FT_SERVICE_METRICS_VARIATIONS_H. + (cff_hadvance_adjust, cff_metrics_adjust): Wrapper functions for + metric service functions from the `truetype' module. + (cff_service_metrics_variations): New service. + (cff_services): Updated. + + * src/cff/cffpic.h (CFF_SERVICE_METRICS_VAR_GET): New macro. + [FT_CONFIG_OPTION_PIC]: Synchronize code. + + * src/sfnt/sfobjs.c (sfnt_init_face): Replace call to + FT_FACE_FIND_GLOBAL_SERVICE with `ft_module_get_service' to always + load the service from the `truetype' module. + +2017-01-31 Werner Lemberg <wl(a)gnu.org> + + Add framework to support services with 9 functions. + + * include/freetype/internal/ftserv.h (FT_DEFINE_SERVICEDESCREC9): + New macro. + +2017-01-31 Werner Lemberg <wl(a)gnu.org> + + [base] Fix error handing in MM functions. + + * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, + FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): + Implement it. + +2017-01-31 Werner Lemberg <wl(a)gnu.org> + + [truetype] Fix sanity check for `gvar' table (#50184). + + * src/truetype/ttgxvar.c (ft_var_load_gvar): There might be missing + variation data for some glyphs. + +2017-01-31 Werner Lemberg <wl(a)gnu.org> + + [autofit] Avoid uninitialized jumps (#50191). + + * src/autofit/afcjk.c (af_cjk_metrics_check_digits), + src/autofit/aflatin.c (af_latin_metrics_check_digits): Initialize + `advance'. + +2017-01-27 Werner Lemberg <wl(a)gnu.org> + + s/GB2312/PRC/. + + * include/freetype/freetype.h (FT_ENCODING_PRC): New enum value. + (FT_ENCODING_GB2312): Deprecated. + + * include/freetype/ttnameid.h (TT_MS_ID_PRC): New macro. + (TT_MS_ID_GB2312): Deprecated. + + * src/sfnt/sfobjs.c (sfnt_find_encoding): Updated. + + * docs/CHANGES: Updated. + +2017-01-26 Werner Lemberg <wl(a)gnu.org> + + [base] Add `FT_Get_Sfnt_LangTag' function. + + * include/freetype/ftsnames.h (FT_SfntLangTag): New structure. + (FT_Get_Sfnt_LangTag): New declaration. + + * src/base/ftsnames.c (FT_Get_Sfnt_LangTag): New function. + + * docs/CHANGES: Updated. + +2017-01-26 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Support `name' table format 1. + + * include/freetype/internal/tttypes.h (TT_LangTagRec): New + structure. + (TT_NameTableRec): Add fields `numLangTagRecords' and `langTags'. + + * src/sfnt/ttload.c (tt_face_load_name): Add support for language + tags. + Reduce array size of name strings in case of invalid entries. + (tt_face_free_name): Updated. + + * docs/CHANGES: Updated. + +2017-01-25 Werner Lemberg <wl(a)gnu.org> + + [sfnt] s/TT_NameEntry/TT_Name/. + + * include/freetype/internal/tttypes.h (TT_NameEntryRec): Renamed + to... + (TT_NameRec): This. + (TT_NameTableRec): Updated. + + * src/base/ftsnames.c (FT_Get_Sfnt_Name): Updated. + + * src/sfnt/sfdriver.c (sfnt_get_ps_name): Updated. + + * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, + tt_name_entry_ascii_from_other): Renamed to... + (tt_name_ascii_from_utf16, tt_name_entry_ascii_from_other): This, + respectively. + (TT_NameEntry_ConvertFunc): Renamed to... + (TT_Name_ConvertFunc): This. + (tt_face_get_name): Updated. + + * src/sfnt/ttload.c (tt_face_load_name, tt_face_free_name): + Updated. + +2017-01-24 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Fix Postscript name service for symbol fonts. + + * src/sfnt/sfdriver.c (sfnt_get_ps_name): Accept PID/EID=3/0 + entries also. + +2017-01-24 Werner Lemberg <wl(a)gnu.org> + + [truetype] For OpenType 1.7: s/preferred/typographic/ (sub)family. + + * include/freetype/ftsnames.h + (FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY, + FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY): New macros. + (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY, + FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Deprecated. + + * include/freetype/ttnameid.h (TT_NAME_ID_TYPOGRAPHIC_FAMILY, + TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY): New macros. + (TT_NAME_ID_PREFERRED_FAMILY, TT_NAME_ID_PREFERRED_SUBFAMILY): + Deprecated. + + * src/sfnt/sfobjs.c (sfnt_load_face): Updated. + + * docs/CHANGES: Updated. + +2017-01-23 Werner Lemberg <wl(a)gnu.org> + + [base] Add `FT_Set_Default_Properties' (#49187). + + * include/freetype/ftmodapi.h: Add declaration. + + * src/base/ftinit.c (ft_set_default_properties): Renamed to... + (FT_Set_Default_Properties): ... this. + (FT_Init_FreeType): Updated. + + * docs/CHANGES: Updated. + +2017-01-23 Werner Lemberg <wl(a)gnu.org> + + [truetype] Minor updates for OpenType 1.8.1. + + * src/truetype/ttgxvar.h (GX_MVarTable): `axisCount' has been + removed from the specification; it is now reserved. + + * src/truetype/ttgxvar.c (ft_var_load_mvar): Updated. + (GX_FVar_Head): Remove `countSizePairs'; the corresponding data + field in the `MVAR' table is now reserved. + (fvar_fields): Updated. + +2017-01-23 Werner Lemberg <wl(a)gnu.org> + + [truetype] Avoid segfault for invalid variation data. + + * src/truetype/ttgxvar.c (ft_var_load_item_variation_store): Assure + `itemCount' is not zero. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=441 + +2017-01-20 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttinterp.c (TT_RunIns): Adjust loop detector limits. + +2017-01-17 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/ttnameid.h: Updated to OpenType 1.8.1. + + (TT_APPLE_ID_FULL_UNICODE): New macro. + + (TT_MS_LANGID_BOSNIAN_BOSNIA_HERZ_CYRILLIC, + TT_MS_LANGID_UPPER_SORBIAN_GERMANY, + TT_MS_LANGID_LOWER_SORBIAN_GERMANY, TT_MS_LANGID_IRISH_IRELAND, + TT_MS_LANGID_INUKTITUT_CANADA_LATIN, TT_MS_LANGID_BASHKIR_RUSSIA, + TT_MS_LANGID_LUXEMBOURGISH_LUXEMBOURG, + TT_MS_LANGID_GREENLANDIC_GREENLAND, TT_MS_LANGID_MAPUDUNGUN_CHILE, + TT_MS_LANGID_MOHAWK_MOHAWK, TT_MS_LANGID_BRETON_FRANCE, + TT_MS_LANGID_OCCITAN_FRANCE, TT_MS_LANGID_CORSICAN_FRANCE, + TT_MS_LANGID_ALSATIAN_FRANCE, TT_MS_LANGID_YAKUT_RUSSIA, + TT_MS_LANGID_KICHE_GUATEMALA, TT_MS_LANGID_KINYARWANDA_RWANDA, + TT_MS_LANGID_WOLOF_SENEGAL, TT_MS_LANGID_DARI_AFGHANISTAN): New + macros. + + (TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC): Fix value. + + (TT_MS_LANGID_GERMAN_LIECHTENSTEIN, TT_MS_LANGID_CATALAN_CATALAN, + TT_MS_LANGID_CHINESE_MACAO, TT_MS_LANGID_SPANISH_SPAIN_MODERN_SORT, + TT_MS_LANGID_KOREAN_KOREA, TT_MS_LANGID_ROMANSH_SWITZERLAND, + TT_MS_LANGID_SLOVENIAN_SLOVENIA, TT_MS_LANGID_BASQUE_BASQUE, + TT_MS_LANGID_SETSWANA_SOUTH_AFRICA, + TT_MS_LANGID_ISIXHOSA_SOUTH_AFRICA, + TT_MS_LANGID_ISIZULU_SOUTH_AFRICA, TT_MS_LANGID_KAZAKH_KAZAKHSTAN, + TT_MS_LANGID_KYRGYZ_KYRGYZSTAN, TT_MS_LANGID_KISWAHILI_KENYA, + TT_MS_LANGID_TATAR_RUSSIA, TT_MS_LANGID_ODIA_INDIA, + TT_MS_LANGID_MONGOLIAN_PRC, TT_MS_LANGID_TIBETAN_PRC, + TT_MS_LANGID_WELSH_UNITED_KINGDOM, TT_MS_LANGID_GALICIAN_GALICIAN, + TT_MS_LANGID_SINHALA_SRI_LANKA, TT_MS_LANGID_TAMAZIGHT_ALGERIA, + TT_MS_LANGID_SESOTHO_SA_LEBOA_SOUTH_AFRICA, TT_MS_LANGID_YI_PRC, + TT_MS_LANGID_UIGHUR_PRC): New aliases. + + Remove commented out code. + + (TT_NAME_ID_LIGHT_BACKGROUND, TT_NAME_ID_DARK_BACKGROUND, + TT_NAME_ID_VARIATIONS_PREFIX): New macros. + + (HAVE_LIMIT_ON_IDENTS): Remove macro (which was useless since many + years), use guarded long macros by default and define short versions + as aliases for the long ones. + +2017-01-15 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgxvar.c (tt_apply_var): Handle underline parameters + also. + +2017-01-11 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftobjs.c (ft_open_face_internal): Improve tracing. + +2017-01-11 Werner Lemberg <wl(a)gnu.org> + + [truetype] Actually use metrics variation service. + + * src/base/ftmm.c: Include FT_SERVICE_METRICS_VARIATIONS_H. + (ft_face_get_mvar_service): New auxiliary function to look up + metrics variation service. + (FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, + FT_Set_Var_Blend_Coordinates): Call metrics variation service. + + * src/truetype/ttobjs.c (tt_face_init): Use metrics variations for + named instances. + +2017-01-11 Werner Lemberg <wl(a)gnu.org> + + [truetype] Provide metrics variation service. + + * include/freetype/internal/services/svmetric.h + (FT_Metrics_Adjust_Func): Reduce number of necessary parameters. + + * src/truetype/ttgxvar.c: Include FT_LIST_H. + (tt_size_reset_iterator): New auxiliary function for... + (tt_apply_var): New function. + + * src/truetype/ttgxvar.h: Updated. + + * src/truetype/ttdriver.c (tt_service_metrics_variations): Add + `tt_apply_mvar'. + + * include/freetype/internal/ftserv.h (FT_ServiceCache): Add metrics + variation service. + +2017-01-11 Werner Lemberg <wl(a)gnu.org> + + [truetype] Parse `MVAR' table. + + * src/truetype/ttgxvar.h (MVAR_TAG_XXX): New macros for MVAR tags. + (GX_Value, GX_MVarTable): New structures. + (GX_Blend): Add it. + + * src/truetype/ttgxvar.c (GX_VALUE_SIZE, GX_VALUE_CASE, + GX_GASP_CASE): New macros. + (ft_var_get_value_pointer): New auxiliary function to get a pointer + to a value from various SFNT tables already stored in `TT_Face'. + (ft_var_load_mvar): New function. + (TT_Get_MM_Var): Call it. + (tt_done_blend): Updated. + +2017-01-11 Werner Lemberg <wl(a)gnu.org> + + [truetype] More preparations for MVAR support. + + * src/truetype/ttobjs.c (tt_size_reset): Add argument to make + function only recompute ascender, descender, and height. + + * src/truetype/ttobjs.h: Updated. + + * src/truetype/ttdriver.c (tt_size_select, tt_size_request): + Updated. + +2017-01-09 Werner Lemberg <wl(a)gnu.org> + + [pcf] Disable long family names by default. + + * include/freetype/config/ftoption.h + (PCF_CONFIG_OPTION_LONG_FAMILY_NAMES): Comment out. + +2017-01-09 Werner Lemberg <wl(a)gnu.org> + + [pcf] Make long family names configurable. + + The change from 2016-09-29 was too radical (except for people using + the openSuSE GNU/Linux distribution). To ameliorate the situation, + PCF_CONFIG_OPTION_LONG_FAMILY_NAMES gets introduced which controls + the feature; if set, a new PCF property option + `no-long-family-names' can be used to switch this feature off. + + * include/freetype/config/ftoption.h, devel/ftoption.h + (PCF_CONFIG_OPTION_LONG_FAMILY_NAMES): New option. + + * include/freetype/ftpcfdrv.h: New header file (only containing + comments currently, used for building the documentation). + + * include/freetype/config/ftheader.h (FT_PCF_DRIVER_H): New macro. + + * src/pcf/pcf.h (PCF_Driver): Add `no_long_family_names' field. + + * src/pcf/pcfdrivr.c: Include FT_SERVICE_PROPERTIES_H and + FT_PCF_DRIVER_H. + (pcf_property_set, pcf_property_get): New functions. + (pcf_service_properties): New service. + (pcf_services): Updated. + (pcf_driver_init) [PCF_CONFIG_OPTION_LONG_FAMILY_NAMES]: Handle + `no_long_family_names'. + + * src/pcf/pcfread.c (pcf_load_font): Handle `no_long_family_names' + and PCF_CONFIG_OPTION_LONG_FAMILY_NAMES. + + * docs/CHANGES: Updated. + +2017-01-09 Werner Lemberg <wl(a)gnu.org> + + [pcf] Introduce a driver structure. + + To be filled later on with something useful. + + * src/pcf/pcf.h (PCF_Driver): New structure. + + * src/pcf/pcfdrivr.c (pcf_driver_init, pcf_driver_done): New dummy + functions. + (pcf_driver_class): Updated. + +2017-01-08 Werner Lemberg <wl(a)gnu.org> + + [truetype] Again some GX code shuffling. + + We need this later on for MVAR also. + + * src/truetype/ttgxvar.c (tt_hadvance_adjust): Split off computing + an item store variation delta into... + (ft_var_get_item_delta): ...new function. + +2017-01-08 Werner Lemberg <wl(a)gnu.org> + + [truetype] Adjust font variation flags for MVAR. + + * include/freetype/internal/tttypes.h (TT_FACE_FLAG_VAR_XXX): + Remove all flags related to MVAR; replace it with... + (TT_FACE_FLAG_VAR_MVAR): ...this new macro. + (TT_Face): Remove `mvar_support' field (which was still unused). + +2017-01-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] More GX code shuffling. + + We need this later on for MVAR also. + + * src/truetype/ttgxvar.c (tt_done_blend): Split off handling of item + variation store into... + (ft_var_done_item_variation_store): ...new function. + +2017-01-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] More generalization of GX stuff. + + We need this later on for MVAR also. + + * src/truetype/ttgxvar.c (ft_var_load_delta_set_index_mapping): Add + parameters for delta-set index mapping and item variation store. + (ft_var_load_item_variation_store): Add parameter for item variation + store. + s/hvarData/varData/. + Move allocation of `hvar_table' to... + (ft_var_load_hvar): ...this function. + Updated. + +2017-01-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] Some GX structure renames for generalization. + + We need this later on for MVAR also. + + * src/truetype/ttgxvar.h (GX_HVarData): Renamed to... + (GX_ItemVarData): ...this. + (GX_HVarRegion): Renamed to... + (GX_VarRegion): ...this. + (GX_HVStore): Renamed to... + (GX_ItemVarStore): ...this. + (GX_WidthMap): Renamed to... + (GX_DeltaSetIdxMap): ...this. + + (GX_HVarTable): Updated. + + * src/truetype/ttgxvar.c: Updated. + +2017-01-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] Code shuffling. + + * src/truetype/ttgxvar.c (ft_var_load_hvar): Split off loading of + item variation store and delta set index mapping into... + (ft_var_load_item_variation_store, + ft_var_load_delta_set_index_mapping): ...new functions. + +2017-01-06 Werner Lemberg <wl(a)gnu.org> + + [truetype] Add HVAR access without advance width map. + + * src/truetype/ttgxvar.c (ft_var_load_hvar): Handle case where + `offsetToAdvanceWidthMapping' is zero. + (tt_hadvance_adjust): Implement direct deltaSet access by glyph + index. + +2017-01-06 Werner Lemberg <wl(a)gnu.org> + + [pcf] Revise driver. + + This commit improves tracing and handling of malformed fonts. In + particular, the changes to `pcf_get_properties' fix + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=379 + + * src/pcf/pcfread.c (tableNames): Use long names for better + readability. + (pcf_read_TOC): Allow at most 9 tables. + (pcf_get_properties): Allow at most 256 properties. + Limit strings array length to 256 * (65536 + 1) bytes. + Better tracing. + (pcf_get_metric): Trace metric data. + (pcf_get_metrics): Allow at most 65536 metrics. + Fix comparison of `metrics->ascent' and `metrics->descent' to avoid + potential overflow. + Better tracing. + (pcf_get_bitmaps): Allow at most 65536 bitmaps. + Better tracing. + (pcf_get_encodings, pcf_get_accel): Better tracing. + + * src/pcf/pcfdrivr.c (PCF_Glyph_Load): Don't trace `format' details. + These are now shown by `pcf_get_bitmaps'. + +2017-01-04 Werner Lemberg <wl(a)gnu.org> + + * src/pcf/pcfdrivr.c (PCF_Face_Init): Trace compression format. + +2017-01-04 Werner Lemberg <wl(a)gnu.org> + + [cff] More consistency checks for pure CFFs. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=378 + + * src/cff/cffload.c (cff_font_load): Check element number and size + of Name and Top DICT indices. + +2017-01-04 Werner Lemberg <wl(a)gnu.org> + + [cff, truetype] Minor tracing improvement. + + * src/cff/cffobjs.c (cff_face_init), src/truetype/ttobjs.c + (tt_face_init): Indent first tracing message from SFNT driver. + +2017-01-03 Werner Lemberg <wl(a)gnu.org> + + [truetype] Various minor fixes. + + * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check instruction + size only if we do native hinting. + (TT_Load_Glyph): Trace returned error code. + + * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep): Trace + returned error code. + (tt_size_ready_bytecode): Don't run `prep' table if `fpgm' table is + invalid. + +2017-01-03 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Don't fail if PCLT, EBLC (and similar tables) are invalid. + + These tables are optional. + + * src/sfnt/sfobjs.c (sfnt_load_face): Implement it. + +2017-01-03 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffparse.c (cff_parse_num): Simplify. + +2017-01-03 Werner Lemberg <wl(a)gnu.org> + + Various fixes for clang's undefined behaviour sanitizer. + + * src/cff/cffload.c (FT_fdot14ToFixed): Fix casting. + (cff_blend_doBlend): Don't left-shift negative numbers. + Handle 5-byte numbers byte by byte to avoid alignment issues. + + * src/cff/cffparse.c (cff_parse_num): Handle 5-byte numbers byte by + byte to avoid alignment issues. + + * src/cid/cidload (cid_read_subrs): Do nothing if we don't have any + subrs. + + * src/psaux/t1decode.c (t1_decode_parse_charstring): Fix tracing. + + * src/tools/glnames.py (main): Put `DEFINE_PSTABLES' guard around + definition of `ft_get_adobe_glyph_index'. + + * src/psnames/pstables.h: Regenerated. + + * src/psnames/psmodule.c: Include `pstables.h' twice to get both + declaration and definition. + + * src/truetype/ttgxvar.c (FT_fdot14ToFixed, FT_intToFixed): Fix + casting. + +2017-01-01 Werner Lemberg <wl(a)gnu.org> + + [cff] Handle multiple `blend' operators in a row correctly. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=368 + + * src/cff/cffload.c (cff_blend_doBlend): Adjust `parser->stack' + pointers into `subFont->blend_stack' after reallocation. + +2017-01-01 Werner Lemberg <wl(a)gnu.org> + + [sfnt] Return correct number of named instances for TTCs. + + Without this patch, requesting information for face index N returned + the data for face index N+1 (or index 0). + + * src/sfnt/sfobjs.c (sfnt_init_face): Correctly adjust `face_index' + for negative `face_instance_index' values. + +2016-12-31 Werner Lemberg <wl(a)gnu.org> + + */*: Use hex numbers for errors in tracing messages. + +2016-12-31 Werner Lemberg <wl(a)gnu.org> + + [truetype] Check axis count in HVAR table. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=362 + + * src/truetype/ttgxvar.c (ft_var_load_hvar): Check axis count. + (ft_var_load_avar): Fix tracing message. + + +---------------------------------------------------------------------------- + +Copyright 2016-2018 by +David Turner, Robert Wilhelm, and Werner Lemberg. + +This file is part of the FreeType project, and may only be used, modified, +and distributed under the terms of the FreeType project license, +LICENSE.TXT. By continuing to use, modify, or distribute this file you +indicate that you have read the license and understand and accept it +fully. + + +Local Variables: +version-control: never +coding: utf-8 +End: diff --git a/modules/freetype2/Jamfile b/modules/freetype2/Jamfile index a9eb39632826..9078a5fe3309 100644 --- a/modules/freetype2/Jamfile +++ b/modules/freetype2/Jamfile @@ -210,7 +210,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.9 + --title=FreeType-2.9.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/modules/freetype2/README b/modules/freetype2/README index 1e7ea97d4180..c23b99e18a83 100644 --- a/modules/freetype2/README +++ b/modules/freetype2/README @@ -1,5 +1,5 @@ - FreeType 2.9 - ============ + FreeType 2.9.1 + ============== Homepage: https://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.9.tar.bz2 - freetype-doc-2.9.tar.gz - ftdoc29.zip + freetype-doc-2.9.1.tar.bz2 + freetype-doc-2.9.1.tar.gz + ftdoc291.zip To view the documentation online, go to diff --git a/modules/freetype2/README.moz-patches b/modules/freetype2/README.moz-patches index 405cda1d2eda..f56acf8d9c60 100644 --- a/modules/freetype2/README.moz-patches +++ b/modules/freetype2/README.moz-patches @@ -1,16 +1,5 @@ -This directory contains FreeType v2.9 downloaded from +This directory contains FreeType v2.9.1 downloaded from https://download.savannah.gnu.org/releases/freetype/ -The following post-2.9 commits have been cherry-picked from -the upstream FreeType repository (see bug 1434697, bug 1438522, bug 1453653, bug 1454359): - -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=994eb2b34934bc5face9f83b2d3b12cf7a9262ab -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=cc2f3cdecff5a351e7e8961b9f2e389ab740231a -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=4a03f17449ae45f0dacf4de4694ccd6e5e1b24d1 -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=68dddcdcbe18a08d778026efc01b1369e35cbf6a -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=bd9400bd464f6cd7c74f52ece1c1065fe2a87aab -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=827ca3bcf25b9e4dc2edf31381c0774e1d227285 -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=235b1e2fe6ca325f449c5a73c75432d62d73f524 -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=70ac167c47f5ca966fb578b1f215430f46915a49 -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=2a1597826a84275660e7410368200b37f85ffdaf +No post-2.9.1 commits have been cherry-picked from the upstream FreeType +repository at this time. diff --git a/modules/freetype2/builds/amiga/makefile b/modules/freetype2/builds/amiga/makefile index 636743860227..6a7700af2ce5 100644 --- a/modules/freetype2/builds/amiga/makefile +++ b/modules/freetype2/builds/amiga/makefile @@ -96,9 +96,6 @@ ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c ftcid.ppc.o: $(FTSRC)/base/ftcid.c $(CC) -c $(CFLAGS) -o $@ $< -ftfntfmt.ppc.o: $(FTSRC)/base/ftfntfmt.c - $(CC) -c $(CFLAGS) -o $@ $< - ftfstype.ppc.o: $(FTSRC)/base/ftfstype.c $(CC) -c $(CFLAGS) -o $@ $< @@ -111,9 +108,6 @@ ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c ftgxval.ppc.o: $(FTSRC)/base/ftgxval.c $(CC) -c $(CFLAGS) -o $@ $< -ftlcdfil.ppc.o: $(FTSRC)/base/ftlcdfil.c - $(CC) -c $(CFLAGS) -o $@ $< - ftmm.ppc.o: $(FTSRC)/base/ftmm.c $(CC) -c $(CFLAGS) -o $@ $< @@ -270,8 +264,8 @@ otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c $(CC) -c $(CFLAGS) -o $@ $< BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \ - ftfntfmt.ppc.oftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o \ - ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o \ + oftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o \ + ftgxval.ppc.o ftmm.ppc.o ftotval.ppc.o \ ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o \ fttype1.ppc.o ftwinfnt.ppc.o diff --git a/modules/freetype2/builds/amiga/makefile.os4 b/modules/freetype2/builds/amiga/makefile.os4 index c07e18149d65..0d340cf19035 100644 --- a/modules/freetype2/builds/amiga/makefile.os4 +++ b/modules/freetype2/builds/amiga/makefile.os4 @@ -99,9 +99,6 @@ ftdebug.ppc.o: FT:src/base/ftdebug.c ftdebugpure.ppc.o: src/base/ftdebug.c $(CC) -c $(CFLAGS) -o $@ src/base/ftdebug.c -ftfntfmt.ppc.o: FT:src/base/ftfntfmt.c - $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfntfmt.c - ftfstype.ppc.o: FT:src/base/ftfstype.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfstype.c @@ -114,9 +111,6 @@ ftglyph.ppc.o: FT:src/base/ftglyph.c ftgxval.ppc.o: FT:src/base/ftgxval.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftgxval.c -ftlcdfil.ppc.o: FT:src/base/ftlcdfil.c - $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftlcdfil.c - ftmm.ppc.o: FT:src/base/ftmm.c $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftmm.c @@ -274,8 +268,8 @@ otvalid.ppc.o: FT:src/otvalid/otvalid.c $(CC) -c $(CFLAGS) -o $@ /FT/src/otvalid/otvalid.c BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \ - ftfntfmt.ppc.o ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o \ - ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o \ + ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o \ + ftgxval.ppc.o ftmm.ppc.o ftotval.ppc.o \ ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o \ fttype1.ppc.o ftwinfnt.ppc.o diff --git a/modules/freetype2/builds/amiga/smakefile b/modules/freetype2/builds/amiga/smakefile index 29a31e47b450..f5de3089abee 100644 --- a/modules/freetype2/builds/amiga/smakefile +++ b/modules/freetype2/builds/amiga/smakefile @@ -42,8 +42,8 @@ # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or # FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h). -OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \ - ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o \ +OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o \ + ftgasp.o ftglyph.o ftgxval.o ftmm.o ftotval.o \ ftpatent.o ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o OBJSYSTEM = ftsystem.o ftsystempure.o @@ -133,8 +133,6 @@ ftbitmap.o: $(CORE)base/ftbitmap.c sc $(SCFLAGS) objname=$@ $< ftcid.o: $(CORE)base/ftcid.c sc $(SCFLAGS) objname=$@ $< -ftfntfmt.o: $(CORE)base/ftfntfmt.c - sc $(SCFLAGS) objname=$@ $< ftfstype.o: $(CORE)base/ftfstype.c sc $(SCFLAGS) objname=$@ $< ftgasp.o: $(CORE)base/ftgasp.c @@ -143,8 +141,6 @@ ftglyph.o: $(CORE)base/ftglyph.c sc $(SCFLAGS) objname=$@ $< ftgxval.o: $(CORE)base/ftgxval.c sc $(SCFLAGS) objname=$@ $< -ftlcdfil.o: $(CORE)base/ftlcdfil.c - sc $(SCFLAGS) objname=$@ $< ftmm.o: $(CORE)base/ftmm.c sc $(SCFLAGS) objname=$@ $< ftotval.o: $(CORE)base/ftotval.c diff --git a/modules/freetype2/builds/cmake/FindHarfBuzz.cmake b/modules/freetype2/builds/cmake/FindHarfBuzz.cmake index f394b82bf975..ee0d52e367e4 100644 --- a/modules/freetype2/builds/cmake/FindHarfBuzz.cmake +++ b/modules/freetype2/builds/cmake/FindHarfBuzz.cmake @@ -31,42 +31,51 @@ # HARFBUZZ_LIBRARIES - containg the HarfBuzz library include(FindPkgConfig) +pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz) -pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7) - -find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h - HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} +find_path(HARFBUZZ_INCLUDE_DIRS + NAMES hb.h + HINTS ${PC_HARFBUZZ_INCLUDEDIR} + ${PC_HARFBUZZ_INCLUDE_DIRS} + PATH_SUFFIXES harfbuzz ) find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz - HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} + HINTS ${PC_HARFBUZZ_LIBDIR} + ${PC_HARFBUZZ_LIBRARY_DIRS} ) -# HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library. -if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17") - if (HarfBuzz_FIND_REQUIRED) - set(_HARFBUZZ_REQUIRED REQUIRED) - else () - set(_HARFBUZZ_REQUIRED "") - endif () - pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 ${_HARFBUZZ_REQUIRED}) - find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu - HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR} - ) - if (HARFBUZZ_ICU_LIBRARIES) - list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}") +if (HARFBUZZ_INCLUDE_DIRS) + if (EXISTS "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h") + file(READ "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h" _harfbuzz_version_content) + + string(REGEX MATCH "#define +HB_VERSION_STRING +\"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _dummy "${_harfbuzz_version_content}") + set(HARFBUZZ_VERSION "${CMAKE_MATCH_1}") endif () - set(_HARFBUZZ_EXTRA_REQUIRED_VAR "HARFBUZZ_ICU_LIBRARIES") -else () - set(_HARFBUZZ_EXTRA_REQUIRED_VAR "") +endif () + +if ("${harfbuzz_FIND_VERSION}" VERSION_GREATER "${HARFBUZZ_VERSION}") + message(FATAL_ERROR "Required version (" ${harfbuzz_FIND_VERSION} ") is higher than found version (" ${HARFBUZZ_VERSION} ")") endif () include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS - HARFBUZZ_LIBRARIES ${_HARFBUZZ_EXTRA_REQUIRED_VAR}) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + harfbuzz + REQUIRED_VARS HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES + VERSION_VAR HARFBUZZ_VERSION) mark_as_advanced( - HARFBUZZ_ICU_LIBRARIES HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES ) + +# Allows easy linking as in +# target_link_libraries(freetype PRIVATE Harfbuzz::Harfbuzz) +if (NOT CMAKE_VERSION VERSION_LESS 3.1) + if (HARFBUZZ_FOUND AND NOT TARGET Harfbuzz::Harfbuzz) + add_library(Harfbuzz::Harfbuzz INTERFACE IMPORTED) + set_target_properties( + Harfbuzz::Harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}") + endif () +endif () diff --git a/modules/freetype2/builds/detect.mk b/modules/freetype2/builds/detect.mk index 771fc31a80bf..eb7f79749936 100644 --- a/modules/freetype2/builds/detect.mk +++ b/modules/freetype2/builds/detect.mk @@ -101,57 +101,28 @@ ifndef CONFIG_FILE .PHONY: setup endif -# The following targets are equivalent, with the exception that they use -# a slightly different syntax for the `echo' command. +# Flash out and copy rules. # -# std_setup: defined for most (i.e. Unix-like) platforms -# dos_setup: defined for Dos-ish platforms like Dos, Windows & OS/2 -# -.PHONY: std_setup dos_setup +.PHONY: std_setup std_setup: - @echo "" - @echo "$(PROJECT_TITLE) build system -- automatic system detection" - @echo "" - @echo "The following settings are used:" - @echo "" - @echo " platform $(PLATFORM)" - @echo " compiler $(CC)" - @echo " configuration directory $(BUILD_DIR)" - @echo " configuration rules $(CONFIG_RULES)" - @echo "" - @echo "If this does not correspond to your system or settings please remove the file" - @echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help." - @echo "" - @echo "Otherwise, simply type \`$(MAKE)' again to build the library," - @echo "or \`$(MAKE) refdoc' to build the API reference (this needs python >= 2.6)." - @echo "" - @$(COPY) $(CONFIG_RULES) $(CONFIG_MK) - - -# Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly! -# -# For `cmd.exe', we use 0xFF as a replacement character for a protected -# space. -# -dos_setup: - @type builds$(SEP)newline - @echo $(PROJECT_TITLE) build system -- automatic system detection - @type builds$(SEP)newline - @echo The following settings are used: - @type builds$(SEP)newline - @echo platformÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(PLATFORM) - @echo compilerÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(CC) - @echo configuration directoryÿÿÿÿÿÿ$(subst /,$(SEP),$(BUILD_DIR)) - @echo configuration rulesÿÿÿÿÿÿÿÿÿÿ$(subst /,$(SEP),$(CONFIG_RULES)) - @type builds$(SEP)newline - @echo If this does not correspond to your system or settings please remove the file - @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. - @type builds$(SEP)newline - @echo Otherwise, simply type 'make' again to build the library. - @echo or 'make refdoc' to build the API reference (this needs at least python 2.6). - @type builds$(SEP)newline - @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul + $(info ) + $(info $(PROJECT_TITLE) build system -- automatic system detection) + $(info ) + $(info The following settings are used:) + $(info ) + $(info $(empty) platform $(PLATFORM)) + $(info $(empty) compiler $(CC)) + $(info $(empty) configuration directory $(subst /,$(SEP),$(BUILD_DIR))) + $(info $(empty) configuration rules $(subst /,$(SEP),$(CONFIG_RULES))) + $(info ) + $(info If this does not correspond to your system or settings please remove the file) + $(info `$(CONFIG_MK)' from this directory then read the INSTALL file for help.) + $(info ) + $(info Otherwise, simply type `$(MAKE)' again to build the library,) + $(info or `$(MAKE) refdoc' to build the API reference (this needs python >= 2.6).) + $(info ) + @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) # EOF diff --git a/modules/freetype2/builds/dos/detect.mk b/modules/freetype2/builds/dos/detect.mk index 55b0e76eca85..0201f7b46ba8 100644 --- a/modules/freetype2/builds/dos/detect.mk +++ b/modules/freetype2/builds/dos/detect.mk @@ -133,7 +133,7 @@ ifeq ($(PLATFORM),dos) COPY := copy endif # test NT - setup: dos_setup + setup: std_setup endif endif # test PLATFORM dos diff --git a/modules/freetype2/builds/freetype.mk b/modules/freetype2/builds/freetype.mk index f2e7e608e35f..6f68a0f65fcd 100644 --- a/modules/freetype2/builds/freetype.mk +++ b/modules/freetype2/builds/freetype.mk @@ -248,6 +248,22 @@ $(FTINIT_OBJ): $(FTINIT_SRC) $(FREETYPE_H) $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) +# ftver component +# +# The VERSIONINFO resource `ftver.rc' contains version and copyright +# to be compiled by windres and tagged into DLL usually. +# +ifneq ($(RC),) + FTVER_SRC := $(BASE_DIR)/ftver.rc + FTVER_OBJ := $(OBJ_DIR)/ftver.$O + + OBJECTS_LIST += $(FTVER_OBJ) + + $(FTVER_OBJ): $(FTVER_SRC) + $(RC) -o $@ $< +endif + + # All FreeType library objects. # OBJ_M := $(BASE_OBJ_M) $(BASE_EXT_OBJ) $(DRV_OBJS_M) @@ -329,10 +345,9 @@ remove_ftmodule_h: .PHONY: clean distclean -# The `config.mk' file must define `clean_freetype' and -# `distclean_freetype'. Implementations may use to relay these to either -# the `std' or `dos' versions from above, or simply provide their own -# implementation. +# The `config.mk' file must define `clean_project' and `distclean_project'. +# Implementations may use to relay these to either the `std' or `dos' +# versions from above, or simply provide their own implementation. # clean: clean_project distclean: distclean_project remove_config_mk remove_ftmodule_h diff --git a/modules/freetype2/builds/mac/FreeType.m68k_cfm.make.txt b/modules/freetype2/builds/mac/FreeType.m68k_cfm.make.txt index c0a55f510de6..b74565f10796 100644 --- a/modules/freetype2/builds/mac/FreeType.m68k_cfm.make.txt +++ b/modules/freetype2/builds/mac/FreeType.m68k_cfm.make.txt @@ -38,7 +38,6 @@ SrcFiles = \xB6 :src:base:ftbdf.c \xB6 :src:base:ftbitmap.c \xB6 :src:base:ftdebug.c \xB6 - :src:base:ftfntfmt.c \xB6 :src:base:ftfstype.c \xB6 :src:base:ftglyph.c \xB6 :src:base:ftgxval.c \xB6 @@ -83,7 +82,6 @@ ObjFiles-68K = \xB6 "{ObjDir}ftbdf.c.o" \xB6 "{ObjDir}ftbitmap.c.o" \xB6 "{ObjDir}ftdebug.c.o" \xB6 - "{ObjDir}ftfntfmt.c.o" \xB6 "{ObjDir}ftfstype.c.o" \xB6 "{ObjDir}ftglyph.c.o" \xB6 "{ObjDir}ftgxval.c.o" \xB6 @@ -161,7 +159,6 @@ FreeType.m68k_cfm.o \xC4\xC4 {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5 "{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c -"{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c diff --git a/modules/freetype2/builds/mac/FreeType.m68k_far.make.txt b/modules/freetype2/builds/mac/FreeType.m68k_far.make.txt index e9b7f6f5f00a..d880ddbb7c6c 100644 --- a/modules/freetype2/builds/mac/FreeType.m68k_far.make.txt +++ b/modules/freetype2/builds/mac/FreeType.m68k_far.make.txt @@ -37,7 +37,6 @@ SrcFiles = \xB6 :src:base:ftbdf.c \xB6 :src:base:ftbitmap.c \xB6 :src:base:ftdebug.c \xB6 - :src:base:ftfntfmt.c \xB6 :src:base:ftfstype.c \xB6 :src:base:ftglyph.c \xB6 :src:base:ftgxval.c \xB6 @@ -82,7 +81,6 @@ ObjFiles-68K = \xB6 "{ObjDir}ftbdf.c.o" \xB6 "{ObjDir}ftbitmap.c.o" \xB6 "{ObjDir}ftdebug.c.o" \xB6 - "{ObjDir}ftfntfmt.c.o" \xB6 "{ObjDir}ftfstype.c.o" \xB6 "{ObjDir}ftglyph.c.o" \xB6 "{ObjDir}ftgxval.c.o" \xB6 @@ -160,7 +158,6 @@ FreeType.m68k_far.o \xC4\xC4 {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5 "{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c -"{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c diff --git a/modules/freetype2/builds/mac/FreeType.ppc_carbon.make.txt b/modules/freetype2/builds/mac/FreeType.ppc_carbon.make.txt index 9eb1dac4e78f..1fa8c307608e 100644 --- a/modules/freetype2/builds/mac/FreeType.ppc_carbon.make.txt +++ b/modules/freetype2/builds/mac/FreeType.ppc_carbon.make.txt @@ -38,7 +38,6 @@ SrcFiles = \xB6 :src:base:ftbdf.c \xB6 :src:base:ftbitmap.c \xB6 :src:base:ftdebug.c \xB6 - :src:base:ftfntfmt.c \xB6 :src:base:ftfstype.c \xB6 :src:base:ftglyph.c \xB6 :src:base:ftgxval.c \xB6 @@ -83,7 +82,6 @@ ObjFiles-PPC = \xB6 "{ObjDir}ftbdf.c.x" \xB6 "{ObjDir}ftbitmap.c.x" \xB6 "{ObjDir}ftdebug.c.x" \xB6 - "{ObjDir}ftfntfmt.c.x" \xB6 "{ObjDir}ftfstype.c.x" \xB6 "{ObjDir}ftglyph.c.x" \xB6 "{ObjDir}ftgxval.c.x" \xB6 @@ -164,7 +162,6 @@ FreeType.ppc_carbon.o \xC4\xC4 {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\x "{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c -"{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c diff --git a/modules/freetype2/builds/mac/FreeType.ppc_classic.make.txt b/modules/freetype2/builds/mac/FreeType.ppc_classic.make.txt index 0627eeaa9f86..2550190cbf4a 100644 --- a/modules/freetype2/builds/mac/FreeType.ppc_classic.make.txt +++ b/modules/freetype2/builds/mac/FreeType.ppc_classic.make.txt @@ -38,7 +38,6 @@ SrcFiles = \xB6 :src:base:ftbdf.c \xB6 :src:base:ftbitmap.c \xB6 :src:base:ftdebug.c \xB6 - :src:base:ftfntfmt.c \xB6 :src:base:ftfstype.c \xB6 :src:base:ftglyph.c \xB6 :src:base:ftgxval.c \xB6 @@ -83,7 +82,6 @@ ObjFiles-PPC = \xB6 "{ObjDir}ftbdf.c.x" \xB6 "{ObjDir}ftbitmap.c.x" \xB6 "{ObjDir}ftdebug.c.x" \xB6 - "{ObjDir}ftfntfmt.c.x" \xB6 "{ObjDir}ftfstype.c.x" \xB6 "{ObjDir}ftglyph.c.x" \xB6 "{ObjDir}ftgxval.c.x" \xB6 @@ -164,7 +162,6 @@ FreeType.ppc_classic.o \xC4\xC4 {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\ "{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c -"{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c diff --git a/modules/freetype2/builds/modules.mk b/modules/freetype2/builds/modules.mk index e1edb17b8def..9a7a4a0aa54c 100644 --- a/modules/freetype2/builds/modules.mk +++ b/modules/freetype2/builds/modules.mk @@ -41,7 +41,7 @@ endif define FTMODULE_H_INIT $(REMOVE_MODULE) -@-echo Generating modules list in $(FTMODULE_H)... +$(info Generating modules list in $(FTMODULE_H)...) $(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE) endef @@ -56,7 +56,7 @@ endef define FTMODULE_H_DONE $(OPEN_MODULE)/* EOF */$(CLOSE_MODULE) -@echo done. +$(info done.) endef diff --git a/modules/freetype2/builds/newline b/modules/freetype2/builds/newline deleted file mode 100644 index 8b137891791f..000000000000 --- a/modules/freetype2/builds/newline +++ /dev/null @@ -1 +0,0 @@ - diff --git a/modules/freetype2/builds/os2/detect.mk b/modules/freetype2/builds/os2/detect.mk index 2edb8d4c1c1d..aaf78488b238 100644 --- a/modules/freetype2/builds/os2/detect.mk +++ b/modules/freetype2/builds/os2/detect.mk @@ -65,7 +65,7 @@ ifeq ($(PLATFORM),os2) .PHONY: devel endif - setup: dos_setup + setup: std_setup endif # test PLATFORM os2 diff --git a/modules/freetype2/builds/symbian/freetype.mmp b/modules/freetype2/builds/symbian/freetype.mmp index d3b95efbb74f..4e4a041eb67b 100644 --- a/modules/freetype2/builds/symbian/freetype.mmp +++ b/modules/freetype2/builds/symbian/freetype.mmp @@ -28,13 +28,11 @@ source ftbbox.c source ftbdf.c source ftbitmap.c source ftcid.c -source ftfntfmt.c source ftfstype.c source ftgasp.c source ftglyph.c source ftgxval.c source ftinit.c -source ftlcdfil.c source ftmm.c source ftotval.c source ftpatent.c diff --git a/modules/freetype2/builds/toplevel.mk b/modules/freetype2/builds/toplevel.mk index f51ad16b9b63..7ce0ed8db27d 100644 --- a/modules/freetype2/builds/toplevel.mk +++ b/modules/freetype2/builds/toplevel.mk @@ -172,7 +172,8 @@ include $(TOP_DIR)/builds/modules.mk # get FreeType version string, using a # poor man's `sed' emulation with make's built-in string functions # -work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h)) +work := $(strip $(shell $(CAT) \ + $(subst /,$(SEP),$(TOP_DIR)/include/freetype/freetype.h))) work := $(subst |,x,$(work)) work := $(subst $(space),|,$(work)) work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work)) diff --git a/modules/freetype2/builds/unix/config.guess b/modules/freetype2/builds/unix/config.guess index 588fe82a42aa..256083a70d35 100755 --- a/modules/freetype2/builds/unix/config.guess +++ b/modules/freetype2/builds/unix/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-01' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include <features.h> #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv[0-9]$.*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv[0-9]$.*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,51 +226,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) - echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) - echo ${UNAME_MACHINE}-unknown-redox + echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) echo mips-dec-osf1 @@ -319,7 +326,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -328,10 +335,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -343,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -370,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. @@ -395,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -410,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -439,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include <stdio.h> /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -497,11 +504,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$[0-9]*$.*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -527,17 +534,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -554,7 +561,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -566,14 +573,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include <sys/systemcfg.h> main() @@ -584,7 +591,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -598,7 +605,7 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -607,9 +614,9 @@ EOF IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix @@ -618,7 +625,7 @@ EOF echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -633,28 +640,28 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include <stdlib.h> @@ -687,13 +694,13 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -712,15 +719,15 @@ EOF HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include <unistd.h> int main () @@ -745,7 +752,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -766,9 +773,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -793,109 +800,109 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in @@ -909,63 +916,63 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -979,70 +986,70 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1056,34 +1063,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1093,12 +1100,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL + echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" elif /bin/uname -X 2>/dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1108,9 +1115,9 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1130,9 +1137,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1152,9 +1159,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1163,28 +1170,28 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1195,7 +1202,7 @@ EOF *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1215,23 +1222,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green(a)stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green(a)stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1250,39 +1257,39 @@ EOF echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ @@ -1310,7 +1317,7 @@ EOF # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1318,22 +1325,25 @@ EOF UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1342,7 +1352,7 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 @@ -1353,7 +1363,7 @@ EOF else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1374,14 +1384,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1390,16 +1400,16 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs @@ -1408,7 +1418,7 @@ esac echo "$0: unable to guess system type" >&2 -case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <<EOF @@ -1450,16 +1460,16 @@ hostinfo = `(hostinfo) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/modules/freetype2/builds/unix/config.sub b/modules/freetype2/builds/unix/config.sub index f2632cd8a2be..ba37cf99e26b 100755 --- a/modules/freetype2/builds/unix/config.sub +++ b/modules/freetype2/builds/unix/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-01' +timestamp='2018-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -94,7 +94,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -112,7 +112,7 @@ esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'` +maybe_os=`echo "$1" | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ @@ -120,16 +120,16 @@ case $maybe_os in kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` + basic_machine=`echo "$1" | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` ;; android-linux) os=-linux-android - basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown + basic_machine=`echo "$1" | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -178,44 +178,44 @@ case $os in ;; -sco6) os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 @@ -227,7 +227,7 @@ case $os in os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -249,12 +249,12 @@ case $basic_machine in | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \ | avr | avr32 \ | ba \ | be32 | be64 \ | bfin \ - | c4x | c8051 | clipper \ + | c4x | c8051 | clipper | csky \ | d10v | d30v | dlx | dsp16xx \ | e2k | epiphany \ | fido | fr30 | frv | ft32 \ @@ -296,7 +296,7 @@ case $basic_machine in | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ + | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pru \ | pyramid \ @@ -333,7 +333,11 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + m9s12z | m68hcs12z | hcs12z | s12z) + basic_machine=s12z-unknown + os=-none ;; ms1) basic_machine=mt-unknown @@ -362,7 +366,7 @@ case $basic_machine in ;; # Object if more than one company name word. *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -378,7 +382,7 @@ case $basic_machine in | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -457,7 +461,7 @@ case $basic_machine in # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -491,7 +495,7 @@ case $basic_machine in basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -536,7 +540,7 @@ case $basic_machine in os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -544,13 +548,13 @@ case $basic_machine in os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -648,7 +652,7 @@ case $basic_machine in os=$os"spe" ;; e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) @@ -740,9 +744,6 @@ case $basic_machine in hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -755,26 +756,26 @@ case $basic_machine in basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -793,19 +794,16 @@ case $basic_machine in os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -837,10 +835,10 @@ case $basic_machine in os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -859,7 +857,7 @@ case $basic_machine in os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -946,6 +944,9 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; nsx-tandem) basic_machine=nsx-tandem ;; @@ -981,7 +982,7 @@ case $basic_machine in os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -997,7 +998,7 @@ case $basic_machine in basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1012,16 +1013,16 @@ case $basic_machine in basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1031,23 +1032,23 @@ case $basic_machine in ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1101,17 +1102,10 @@ case $basic_machine in sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1130,7 +1124,7 @@ case $basic_machine in os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1244,9 +1238,6 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; - wasm32) - basic_machine=wasm32-unknown - ;; w65*) basic_machine=w65-wdc os=-none @@ -1266,20 +1257,12 @@ case $basic_machine in basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1308,10 +1291,6 @@ case $basic_machine in vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1321,9 +1300,6 @@ case $basic_machine in sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1343,7 +1319,7 @@ case $basic_machine in # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1351,10 +1327,10 @@ esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1377,15 +1353,16 @@ case $os in -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. @@ -1398,25 +1375,26 @@ case $os in | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1433,12 +1411,12 @@ case $os in -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1447,10 +1425,10 @@ case $os in os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1461,12 +1439,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1513,7 +1485,7 @@ case $os in -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1528,18 +1500,9 @@ case $os in -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; @@ -1568,7 +1531,7 @@ case $os in *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1664,9 +1627,6 @@ case $basic_machine in *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1721,9 +1681,6 @@ case $basic_machine in i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1833,15 +1790,15 @@ case $basic_machine in vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/modules/freetype2/builds/unix/configure b/modules/freetype2/builds/unix/configure index 97a01e57f298..2d05de2aad2e 100755 --- a/modules/freetype2/builds/unix/configure +++ b/modules/freetype2/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FreeType 2.9. +# Generated by GNU Autoconf 2.69 for FreeType 2.9.1. # # Report bugs to <freetype(a)nongnu.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.9' -PACKAGE_STRING='FreeType 2.9' +PACKAGE_VERSION='2.9.1' +PACKAGE_STRING='FreeType 2.9.1' PACKAGE_BUGREPORT='freetype(a)nongnu.org' PACKAGE_URL='' @@ -654,12 +654,14 @@ ZLIB_CFLAGS XX_ANSIFLAGS XX_CFLAGS FTSYS_SRC +INSTALL_FT2_CONFIG MKDIR_P INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM EXEEXT_BUILD CC_BUILD +RC LT_SYS_LIBRARY_PATH OTOOL64 OTOOL @@ -756,6 +758,7 @@ with_gnu_ld with_sysroot enable_libtool_lock enable_biarch_config +enable_freetype_config enable_largefile enable_mmap with_zlib @@ -1330,7 +1333,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeType 2.9 to adapt to many kinds of systems. +\`configure' configures FreeType 2.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1398,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.9:";; + short | recursive ) echo "Configuration of FreeType 2.9.1:";; esac cat <<\_ACEOF @@ -1410,6 +1413,8 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-biarch-config install biarch ftconfig.h to support multiple architectures by single file + --enable-freetype-config + install freetype-config --disable-largefile omit support for large files --disable-mmap do not check mmap() and do not use @@ -1542,7 +1547,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.9 +FreeType configure 2.9.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2140,7 +2145,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.9, which was +It was created by FreeType $as_me 2.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2496,7 +2501,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update `docs/VERSIONS.TXT'! -version_info='22:0:16' +version_info='22:1:16' ft_version=`echo $version_info | tr : .` @@ -11848,6 +11853,175 @@ CC=$lt_save_CC # Only expand once: +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +set dummy ${ac_tool_prefix}windres; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RC"; then + ac_cv_prog_RC="$RC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RC="${ac_tool_prefix}windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RC=$ac_cv_prog_RC +if test -n "$RC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5 +$as_echo "$RC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RC"; then + ac_ct_RC=$RC + # Extract the first word of "windres", so it can be a program name with args. +set dummy windres; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RC"; then + ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RC="windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RC=$ac_cv_prog_ac_ct_RC +if test -n "$ac_ct_RC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5 +$as_echo "$ac_ct_RC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RC" = x; then + RC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RC=$ac_ct_RC + fi +else + RC="$ac_cv_prog_RC" +fi + + + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +objext_RC=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code=$lt_simple_compile_test_code + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +compiler_RC=$CC +func_cc_basename $compiler +cc_basename=$func_cc_basename_result + +lt_cv_prog_compiler_c_o_RC=yes + +if test -n "$compiler"; then + : + + + +fi + +GCC=$lt_save_GCC +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS + # checks for native programs to generate building tool @@ -12638,6 +12812,20 @@ fi CPPFLAGS="${orig_CPPFLAGS}" +# Check whether --enable-freetype-config was given. +if test "${enable_freetype_config+set}" = set; then : + enableval=$enable_freetype_config; case "${enableval}" in + yes) enable_freetype_config="TRUE" ;; + no) enable_freetype_config="FALSE" ;; + *) as_fn_error $? "unknown value '${enableval}' passed with --enable-freetype-config" "$LINENO" 5 ;; + esac +else + enable_freetype_config="FALSE" +fi + + +INSTALL_FT2_CONFIG=$enable_freetype_config + # checks for library functions @@ -13222,6 +13410,35 @@ fi +# It is recommended that shared libraries hide symbols except those with +# explicit __attribute__((visibility("default"))). +# +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5 +$as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; } +orig_CFLAGS="${CFLAGS}" +CFLAGS="${CFLAGS} -fvisibility=hidden" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + CFLAGS="${orig_CFLAGS}" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # All library tests below try `pkg-config' first. If that fails, a function # from the library is tested in the traditional autoconf way (zlib, bzip2), # or a config script is called (libpng). @@ -13727,7 +13944,7 @@ fi have_harfbuzz=no if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then - harfbuzz_pkg="harfbuzz >= 0.9.21" + harfbuzz_pkg="harfbuzz >= 1.3.0" have_harfbuzz_pkg=no if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then @@ -15117,7 +15334,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeType $as_me 2.9, which was +This file was extended by FreeType $as_me 2.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15183,7 +15400,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FreeType config.status 2.9 +FreeType config.status 2.9.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15447,6 +15664,48 @@ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_sub enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`' +reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`' +reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`' +compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`' +GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`' +archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`' +module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`' +hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`' +inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`' +always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`' +include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`' +prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`' +postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`' +file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`' +hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' @@ -15529,7 +15788,26 @@ soname_spec \ install_override_mode \ finish_eval \ old_striplib \ -striplib; do +striplib \ +LD_RC \ +reload_flag_RC \ +compiler_RC \ +lt_prog_compiler_no_builtin_flag_RC \ +lt_prog_compiler_pic_RC \ +lt_prog_compiler_wl_RC \ +lt_prog_compiler_static_RC \ +lt_cv_prog_compiler_c_o_RC \ +export_dynamic_flag_spec_RC \ +whole_archive_flag_spec_RC \ +compiler_needs_object_RC \ +with_gnu_ld_RC \ +allow_undefined_flag_RC \ +no_undefined_flag_RC \ +hardcode_libdir_flag_spec_RC \ +hardcode_libdir_separator_RC \ +exclude_expsyms_RC \ +include_expsyms_RC \ +file_list_spec_RC; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes @@ -15560,7 +15838,18 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ configure_time_dlsearch_path \ -configure_time_lt_sys_library_path; do +configure_time_lt_sys_library_path \ +reload_cmds_RC \ +old_archive_cmds_RC \ +old_archive_from_new_cmds_RC \ +old_archive_from_expsyms_cmds_RC \ +archive_cmds_RC \ +archive_expsym_cmds_RC \ +module_cmds_RC \ +module_expsym_cmds_RC \ +export_symbols_cmds_RC \ +prelink_cmds_RC \ +postlink_cmds_RC; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes @@ -15587,6 +15876,8 @@ fi + + FTOPTION_H_SED="$FTOPTION_H_SED" _ACEOF @@ -16208,7 +16499,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # The names of the tagged configurations supported by this script. -available_tags='' +available_tags='RC ' # Configured defaults for sys_lib_dlsearch_path munging. : \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} @@ -16708,6 +16999,145 @@ ltmain=$ac_aux_dir/ltmain.sh (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" + + cat <<_LT_EOF >> "$ofile" + +# ### BEGIN LIBTOOL TAG CONFIG: RC + +# The linker used to build libraries. +LD=$lt_LD_RC + +# How to create reloadable object files. +reload_flag=$lt_reload_flag_RC +reload_cmds=$lt_reload_cmds_RC + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_RC + +# A language specific compiler. +CC=$lt_compiler_RC + +# Is the compiler the GNU compiler? +with_gcc=$GCC_RC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_RC + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_RC + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_RC + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_RC + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_RC + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_RC +archive_expsym_cmds=$lt_archive_expsym_cmds_RC + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_RC +module_expsym_cmds=$lt_module_expsym_cmds_RC + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_RC + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_RC + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_RC + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC + +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct_RC + +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \$shlibpath_var if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute_RC + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L_RC + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_RC + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_RC + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_RC + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_RC + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_RC + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_RC + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_RC + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_RC + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_RC + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_RC + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_RC + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_RC + +# ### END LIBTOOL TAG CONFIG: RC +_LT_EOF + ;; "ftoption.h":F) mv ftoption.h ftoption.tmp eval "sed $FTOPTION_H_SED < ftoption.tmp > ftoption.h" diff --git a/modules/freetype2/builds/unix/configure.ac b/modules/freetype2/builds/unix/configure.ac index b98027871b9e..b306821f42ff 100644 --- a/modules/freetype2/builds/unix/configure.ac +++ b/modules/freetype2/builds/unix/configure.ac @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.9], [freetype(a)nongnu.org] [freetype]) +AC_INIT([FreeType], [2.9.1], [freetype(a)nongnu.org] [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='22:0:16' +version_info='22:1:16' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -37,6 +37,7 @@ AC_SUBST(EXEEXT) PKG_PROG_PKG_CONFIG([0.24]) LT_INIT(win32-dll) +LT_PROG_RC # checks for native programs to generate building tool @@ -176,6 +177,15 @@ fi CPPFLAGS="${orig_CPPFLAGS}" +AC_ARG_ENABLE([freetype-config], + AS_HELP_STRING([--enable-freetype-config], [install freetype-config]), + [case "${enableval}" in + yes) enable_freetype_config="TRUE" ;; + no) enable_freetype_config="FALSE" ;; + *) AC_MSG_ERROR([unknown value '${enableval}' passed with --enable-freetype-config]) ;; + esac], [enable_freetype_config="FALSE"]) + +AC_SUBST(INSTALL_FT2_CONFIG, [$enable_freetype_config]) # checks for library functions @@ -298,6 +308,18 @@ AC_SUBST([XX_CFLAGS]) AC_SUBST([XX_ANSIFLAGS]) +# It is recommended that shared libraries hide symbols except those with +# explicit __attribute__((visibility("default"))). +# +AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) +orig_CFLAGS="${CFLAGS}" +CFLAGS="${CFLAGS} -fvisibility=hidden" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + AC_MSG_RESULT(yes), + CFLAGS="${orig_CFLAGS}" + AC_MSG_RESULT(no)) + + # All library tests below try `pkg-config' first. If that fails, a function # from the library is tested in the traditional autoconf way (zlib, bzip2), # or a config script is called (libpng). @@ -474,7 +496,7 @@ AC_ARG_WITH([harfbuzz], have_harfbuzz=no if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then - harfbuzz_pkg="harfbuzz >= 0.9.21" + harfbuzz_pkg="harfbuzz >= 1.3.0" have_harfbuzz_pkg=no if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then diff --git a/modules/freetype2/builds/unix/configure.raw b/modules/freetype2/builds/unix/configure.raw index 20157b9be536..baab79dc52dc 100644 --- a/modules/freetype2/builds/unix/configure.raw +++ b/modules/freetype2/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='22:0:16' +version_info='22:1:16' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -37,6 +37,7 @@ AC_SUBST(EXEEXT) PKG_PROG_PKG_CONFIG([0.24]) LT_INIT(win32-dll) +LT_PROG_RC # checks for native programs to generate building tool @@ -176,6 +177,15 @@ fi CPPFLAGS="${orig_CPPFLAGS}" +AC_ARG_ENABLE([freetype-config], + AS_HELP_STRING([--enable-freetype-config], [install freetype-config]), + [case "${enableval}" in + yes) enable_freetype_config="TRUE" ;; + no) enable_freetype_config="FALSE" ;; + *) AC_MSG_ERROR([unknown value '${enableval}' passed with --enable-freetype-config]) ;; + esac], [enable_freetype_config="FALSE"]) + +AC_SUBST(INSTALL_FT2_CONFIG, [$enable_freetype_config]) # checks for library functions @@ -298,6 +308,18 @@ AC_SUBST([XX_CFLAGS]) AC_SUBST([XX_ANSIFLAGS]) +# It is recommended that shared libraries hide symbols except those with +# explicit __attribute__((visibility("default"))). +# +AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) +orig_CFLAGS="${CFLAGS}" +CFLAGS="${CFLAGS} -fvisibility=hidden" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + AC_MSG_RESULT(yes), + CFLAGS="${orig_CFLAGS}" + AC_MSG_RESULT(no)) + + # All library tests below try `pkg-config' first. If that fails, a function # from the library is tested in the traditional autoconf way (zlib, bzip2), # or a config script is called (libpng). @@ -474,7 +496,7 @@ AC_ARG_WITH([harfbuzz], have_harfbuzz=no if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then - harfbuzz_pkg="harfbuzz >= 0.9.21" + harfbuzz_pkg="harfbuzz >= 1.3.0" have_harfbuzz_pkg=no if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then diff --git a/modules/freetype2/builds/unix/ftconfig.in b/modules/freetype2/builds/unix/ftconfig.in index 5159693e7057..b9c21da2c283 100644 --- a/modules/freetype2/builds/unix/ftconfig.in +++ b/modules/freetype2/builds/unix/ftconfig.in @@ -454,9 +454,9 @@ FT_BEGIN_HEADER #endif /* !FT_BASE_DEF */ - /* When compiling FreeType as a DLL, some systems/compilers need a */ - /* special attribute in front OR after the return type of function */ - /* declarations. */ + /* When compiling FreeType as a DLL or DSO with hidden visibility */ + /* some systems/compilers need a special attribute in front OR after */ + /* the return type of function declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ @@ -487,12 +487,30 @@ FT_BEGIN_HEADER /* */ #ifndef FT_EXPORT -#ifdef __cplusplus +#ifdef FT2_BUILD_LIBRARY + +#if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) ) +#define FT_EXPORT( x ) __declspec( dllexport ) x +#elif defined( __GNUC__ ) && __GNUC__ >= 4 +#define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x +#elif defined( __cplusplus ) #define FT_EXPORT( x ) extern "C" x #else #define FT_EXPORT( x ) extern x #endif +#else + +#if defined( FT2_DLLIMPORT ) +#define FT_EXPORT( x ) __declspec( dllimport ) x +#elif defined( __cplusplus ) +#define FT_EXPORT( x ) extern "C" x +#else +#define FT_EXPORT( x ) extern x +#endif + +#endif + #endif /* !FT_EXPORT */ diff --git a/modules/freetype2/builds/unix/install.mk b/modules/freetype2/builds/unix/install.mk index 50325ca5ae46..c08c3b75640e 100644 --- a/modules/freetype2/builds/unix/install.mk +++ b/modules/freetype2/builds/unix/install.mk @@ -39,9 +39,11 @@ install: $(PROJECT_LIBRARY) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ $(DESTDIR)$(libdir)/pkgconfig \ $(DESTDIR)$(includedir)/freetype2/freetype/config \ - $(DESTDIR)$(bindir) \ - $(DESTDIR)$(datadir)/aclocal \ + $(DESTDIR)$(datadir)/aclocal +ifeq ($(INSTALL_FT2_CONFIG),TRUE) + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ $(DESTDIR)$(mandir)/man1 +endif $(LIBTOOL) --mode=install $(INSTALL) \ $(PROJECT_LIBRARY) $(DESTDIR)$(libdir) -for P in $(PUBLIC_H) ; do \ @@ -52,7 +54,7 @@ install: $(PROJECT_LIBRARY) $(INSTALL_DATA) \ $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \ done - $(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \ + $(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \ $(DESTDIR)$(includedir)/freetype2/ft2build.h $(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \ $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h @@ -60,14 +62,16 @@ install: $(PROJECT_LIBRARY) $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h $(INSTALL_DATA) $(OBJ_BUILD)/ftoption.h \ $(DESTDIR)$(includedir)/freetype2/freetype/config/ftoption.h - $(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ - $(DESTDIR)$(bindir)/freetype-config - $(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \ + $(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \ $(DESTDIR)$(datadir)/aclocal/freetype2.m4 - $(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \ + $(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \ $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc - $(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1 \ +ifeq ($(INSTALL_FT2_CONFIG),TRUE) + $(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ + $(DESTDIR)$(bindir)/freetype-config + $(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1 \ $(DESTDIR)$(mandir)/man1/freetype-config.1 +endif uninstall: @@ -80,7 +84,7 @@ uninstall: check: - @echo There is no validation suite for this package. + $(info There is no validation suite for this package.) .PHONY: clean_project_unix distclean_project_unix @@ -88,13 +92,11 @@ check: # Unix cleaning and distclean rules. # clean_project_unix: - -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S) - -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \ - $(CLEAN) + -$(LIBTOOL) --mode=clean $(RM) $(OBJECTS_LIST) + -$(DELETE) $(CLEAN) distclean_project_unix: clean_project_unix - -$(DELETE) $(PROJECT_LIBRARY) - -$(DELDIR) $(OBJ_DIR)/.libs + -$(LIBTOOL) --mode=clean $(RM) $(PROJECT_LIBRARY) -$(DELETE) *.orig *~ core *.core $(DISTCLEAN) # EOF diff --git a/modules/freetype2/builds/unix/unix-cc.in b/modules/freetype2/builds/unix/unix-cc.in index a06246d63188..5675866ea58e 100644 --- a/modules/freetype2/builds/unix/unix-cc.in +++ b/modules/freetype2/builds/unix/unix-cc.in @@ -87,10 +87,16 @@ ANSIFLAGS := @XX_ANSIFLAGS@ # C compiler to use -- we use libtool! # -# CCraw := $(CC) CC := $(LIBTOOL) --mode=compile $(CCraw) +# Resource compiler to use on Cygwin/MinGW, usually windres. +# +RCraw := @RC@ +ifneq ($(RCraw),) + RC := $(LIBTOOL) --tag=RC --mode=compile $(RCraw) +endif + # Linker flags. # LDFLAGS := @LDFLAGS@ diff --git a/modules/freetype2/builds/unix/unix-def.in b/modules/freetype2/builds/unix/unix-def.in index 059a0615902d..6957053abe2a 100644 --- a/modules/freetype2/builds/unix/unix-def.in +++ b/modules/freetype2/builds/unix/unix-def.in @@ -145,6 +145,9 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in chmod a-w $@.tmp mv $@.tmp $@ +# defines whether we should install `freetype-config' or not +INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@ + all install: $(OBJ_BUILD)/freetype-config \ $(OBJ_BUILD)/freetype2.pc diff --git a/modules/freetype2/builds/vms/ftconfig.h b/modules/freetype2/builds/vms/ftconfig.h index fa4aa119889e..021e2c651a13 100644 --- a/modules/freetype2/builds/vms/ftconfig.h +++ b/modules/freetype2/builds/vms/ftconfig.h @@ -406,9 +406,9 @@ FT_BEGIN_HEADER #endif /* !FT_BASE_DEF */ - /* When compiling FreeType as a DLL, some systems/compilers need a */ - /* special attribute in front OR after the return type of function */ - /* declarations. */ + /* When compiling FreeType as a DLL or DSO with hidden visibility */ + /* some systems/compilers need a special attribute in front OR after */ + /* the return type of function declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ @@ -439,12 +439,30 @@ FT_BEGIN_HEADER /* */ #ifndef FT_EXPORT -#ifdef __cplusplus +#ifdef FT2_BUILD_LIBRARY + +#if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) ) +#define FT_EXPORT( x ) __declspec( dllexport ) x +#elif defined( __GNUC__ ) && __GNUC__ >= 4 +#define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x +#elif defined( __cplusplus ) #define FT_EXPORT( x ) extern "C" x #else #define FT_EXPORT( x ) extern x #endif +#else + +#if defined( FT2_DLLIMPORT ) +#define FT_EXPORT( x ) __declspec( dllimport ) x +#elif defined( __cplusplus ) +#define FT_EXPORT( x ) extern "C" x +#else +#define FT_EXPORT( x ) extern x +#endif + +#endif + #endif /* !FT_EXPORT */ diff --git a/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj b/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj index 215028a68df5..1ca45a80f75e 100644 --- a/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj +++ b/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -41,7 +41,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -61,7 +61,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -81,7 +81,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -101,7 +101,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -121,7 +121,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -141,7 +141,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -161,7 +161,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -181,7 +181,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -201,7 +201,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -221,7 +221,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -241,7 +241,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -261,7 +261,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -281,7 +281,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -301,7 +301,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -321,7 +321,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -341,7 +341,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -361,7 +361,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -381,7 +381,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -401,7 +401,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -421,7 +421,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -441,7 +441,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -461,7 +461,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -481,7 +481,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -501,7 +501,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -521,7 +521,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -541,7 +541,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -561,7 +561,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -581,7 +581,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -601,7 +601,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -621,7 +621,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -641,7 +641,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -661,7 +661,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -681,7 +681,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -701,7 +701,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -721,7 +721,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -741,7 +741,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -758,7 +758,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -773,585 +773,18 @@ <File RelativePath="..\..\..\src\autofit\autofit.c"> </File> <File RelativePath="..\..\..\src\bdf\bdf.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cff\cff.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbase.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbitmap.c"> </File> <File RelativePath="..\..\..\src\cache\ftcache.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\ftdebug.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> + <FileConfiguration> + <Tool Name="VCCLCompilerTool" DisableLanguageExtensions="false" /> </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftfstype.c"> @@ -1359,774 +792,18 @@ <File RelativePath="..\..\..\src\base\ftgasp.c"> </File> <File RelativePath="..\..\..\src\base\ftglyph.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\gzip\ftgzip.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftinit.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\lzw\ftlzw.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftstroke.c"> </File> <File RelativePath="..\..\..\src\base\ftsystem.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\smooth\smooth.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <Filter Name="FT_MODULES"> <File RelativePath="..\..\..\src\base\ftbbox.c"> @@ -2135,139 +812,9 @@ </File> <File RelativePath="..\..\..\src\base\ftcid.c"> </File> - <File RelativePath="..\..\..\src\base\ftfntfmt.c"> - </File> <File RelativePath="..\..\..\src\base\ftgxval.c"> </File> - <File RelativePath="..\..\..\src\base\ftlcdfil.c"> - </File> <File RelativePath="..\..\..\src\base\ftmm.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftotval.c"> </File> @@ -2282,1540 +829,28 @@ <File RelativePath="..\..\..\src\base\ftwinfnt.c"> </File> <File RelativePath="..\..\..\src\pcf\pcf.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pfr\pfr.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psaux\psaux.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pshinter\pshinter.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psnames\psmodule.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\raster\raster.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\sfnt\sfnt.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\truetype\truetype.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type1\type1.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cid\type1cid.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type42\type42.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\winfonts\winfnt.c"> - <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Smartphone 2003 (ARMV4)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> </Filter> </Filter> @@ -3836,4 +871,4 @@ </Files> <Globals> </Globals> -</VisualStudioProject> \ No newline at end of file +</VisualStudioProject> diff --git a/modules/freetype2/builds/wince/vc2005-ce/index.html b/modules/freetype2/builds/wince/vc2005-ce/index.html index 267241528349..02a1caf8b55d 100644 --- a/modules/freetype2/builds/wince/vc2005-ce/index.html +++ b/modules/freetype2/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.9 sources:</p> +It compiles the following libraries from the FreeType 2.9.1 sources:</p> <ul> <pre> - freetype29.lib - release build; single threaded - freetype29_D.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MT_D.lib - debug build; multi-threaded</pre> + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj b/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj index 9be85885af57..7a5445e9c29a 100644 --- a/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj +++ b/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -177,7 +177,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -266,7 +266,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -355,7 +355,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -444,7 +444,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -533,7 +533,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -621,7 +621,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -709,7 +709,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -797,7 +797,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -885,7 +885,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -973,7 +973,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -1061,7 +1061,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -1149,7 +1149,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1236,7 +1236,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1323,7 +1323,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1410,7 +1410,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1497,7 +1497,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1584,7 +1584,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1668,7 +1668,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1753,7 +1753,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1838,7 +1838,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1923,7 +1923,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2008,7 +2008,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2093,7 +2093,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2178,7 +2178,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2263,7 +2263,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2348,7 +2348,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2433,7 +2433,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2518,7 +2518,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2603,7 +2603,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29ST_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2689,7 +2689,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2775,7 +2775,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2861,7 +2861,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2947,7 +2947,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3033,7 +3033,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3119,7 +3119,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3205,7 +3205,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -3279,7 +3279,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\wince\vc2008-ce\freetype29MT_D.lib" + OutputFile="..\..\..\objs\wince\vc2008-ce\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3313,4548 +3313,68 @@ <File RelativePath="..\..\..\src\bdf\bdf.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\cff\cff.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftbase.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftbitmap.c" - > - </File> - <File - RelativePath="..\..\..\src\cache\ftcache.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\ftdebug.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftfstype.c" - > - </File> - <File - RelativePath="..\..\..\src\base\ftgasp.c" - > - </File> - <File - RelativePath="..\..\..\src\base\ftglyph.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\gzip\ftgzip.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftinit.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\lzw\ftlzw.c" - > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File - RelativePath="..\..\..\src\base\ftstroke.c" + RelativePath="..\..\..\src\cff\cff.c" > </File> <File - RelativePath="..\..\..\src\base\ftsystem.c" + RelativePath="..\..\..\src\base\ftbase.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > + </File> + <File + RelativePath="..\..\..\src\base\ftbitmap.c" + > + </File> + <File + RelativePath="..\..\..\src\cache\ftcache.c" + > + </File> + <File + RelativePath="..\ftdebug.c" + > + <FileConfiguration> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" + DisableLanguageExtensions="false" /> </FileConfiguration> </File> <File + RelativePath="..\..\..\src\base\ftfstype.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftgasp.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftglyph.c" + > + </File> + <File + RelativePath="..\..\..\src\gzip\ftgzip.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftinit.c" + > + </File> + <File + RelativePath="..\..\..\src\lzw\ftlzw.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftstroke.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftsystem.c" + > + </File> + <File RelativePath="..\..\..\src\smooth\smooth.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <Filter Name="FT_MODULES" @@ -7872,443 +3392,12 @@ > </File> <File - RelativePath="..\..\..\src\base\ftfntfmt.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftgxval.c" > </File> <File - RelativePath="..\..\..\src\base\ftlcdfil.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftmm.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftotval.c" @@ -8337,5126 +3426,50 @@ <File RelativePath="..\..\..\src\pcf\pcf.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pfr\pfr.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psaux\psaux.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pshinter\pshinter.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psnames\psmodule.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\raster\raster.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\sfnt\sfnt.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\truetype\truetype.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type1\type1.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cid\type1cid.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type42\type42.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\winfonts\winfnt.c" > - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> </Filter> </Filter> diff --git a/modules/freetype2/builds/wince/vc2008-ce/index.html b/modules/freetype2/builds/wince/vc2008-ce/index.html index 18f2a481b103..f7a3583789a0 100644 --- a/modules/freetype2/builds/wince/vc2008-ce/index.html +++ b/modules/freetype2/builds/wince/vc2008-ce/index.html @@ -21,14 +21,14 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.9 sources:</p> +It compiles the following libraries from the FreeType 2.9.1 sources:</p> <ul> <pre> - freetype29.lib - release build; single threaded - freetype29_D.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MT_D.lib - debug build; multi-threaded</pre> + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/windows/detect.mk b/modules/freetype2/builds/windows/detect.mk index b047e0215d46..dd5669ca5441 100644 --- a/modules/freetype2/builds/windows/detect.mk +++ b/modules/freetype2/builds/windows/detect.mk @@ -95,22 +95,22 @@ ifeq ($(PLATFORM),windows) ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target dump_target_list: - @echo ÿ - @echo $(PROJECT_TITLE) build system -- supported compilers - @echo ÿ - @echo Several command-line compilers are supported on Win32: - @echo ÿ - @echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw) - @echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++ - @echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++ - @echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC - @echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++ - @echo ÿ + $(info ) + $(info $(PROJECT_TITLE) build system -- supported compilers) + $(info ) + $(info Several command-line compilers are supported on Win32:) + $(info ) + $(info $(empty) make setup gcc (with Mingw)) + $(info $(empty) make setup visualc Microsoft Visual C++) + $(info $(empty) make setup bcc32 Borland C/C++) + $(info $(empty) make setup lcc Win32-LCC) + $(info $(empty) make setup intelc Intel C/C++) + $(info ) setup: dump_target_list .PHONY: dump_target_list list else - setup: dos_setup + setup: std_setup endif # additionally, we provide hooks for various other compilers diff --git a/modules/freetype2/builds/windows/ftver.rc b/modules/freetype2/builds/windows/ftver.rc deleted file mode 100644 index 109310901f04..000000000000 --- a/modules/freetype2/builds/windows/ftver.rc +++ /dev/null @@ -1,43 +0,0 @@ -#include<Windows.h> - -#define FT_VERSION 2,9,0,0 -#define FT_VERSION_STR "2.9.0" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION FT_VERSION -PRODUCTVERSION FT_VERSION -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#endif -#ifdef _DLL -FILETYPE VFT_DLL -#define FT_FILENAME "freetype.dll" -#else -FILETYPE VFT_STATIC_LIB -#define FT_FILENAME "freetype.lib" -#endif -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "CompanyName", "The FreeType Project" - VALUE "FileDescription", "Font Rendering Library" - VALUE "FileVersion", FT_VERSION_STR - VALUE "ProductName", "FreeType" - VALUE "ProductVersion", FT_VERSION_STR - VALUE "LegalCopyright", "© 2017 The FreeType Project www.freetype.org. All rights reserved." - VALUE "InternalName", "freetype" - VALUE "OriginalFilename", FT_FILENAME - END - END - - BLOCK "VarFileInfo" - BEGIN - /* The following line should only be modified for localized versions. */ - /* It consists of any number of WORD,WORD pairs, with each pair */ - /* describing a "language,codepage" combination supported by the file. */ - VALUE "Translation", 0x409, 1252 - END -END diff --git a/modules/freetype2/builds/windows/vc2005/freetype.vcproj b/modules/freetype2/builds/windows/vc2005/freetype.vcproj index 386d79d071fb..b1e2ae68100d 100644 --- a/modules/freetype2/builds/windows/vc2005/freetype.vcproj +++ b/modules/freetype2/builds/windows/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype29.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -33,7 +33,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype29MT.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -50,7 +50,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype29ST.lib" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291ST.lib" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -67,7 +67,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype29_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -84,7 +84,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype29ST_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -101,7 +101,7 @@ <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> - <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype29MT_D.lib" SuppressStartupBanner="true" /> + <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> @@ -116,105 +116,18 @@ <File RelativePath="..\..\..\src\autofit\autofit.c"> </File> <File RelativePath="..\..\..\src\bdf\bdf.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cff\cff.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbase.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbitmap.c"> </File> <File RelativePath="..\..\..\src\cache\ftcache.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\ftdebug.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> + <FileConfiguration> + <Tool Name="VCCLCompilerTool" DisableLanguageExtensions="false" /> </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftfstype.c"> @@ -222,126 +135,18 @@ <File RelativePath="..\..\..\src\base\ftgasp.c"> </File> <File RelativePath="..\..\..\src\base\ftglyph.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\gzip\ftgzip.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftinit.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\lzw\ftlzw.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftstroke.c"> </File> <File RelativePath="..\..\..\src\base\ftsystem.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\smooth\smooth.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <Filter Name="FT_MODULES"> <File RelativePath="..\..\..\src\base\ftbdf.c"> @@ -350,27 +155,7 @@ </File> <File RelativePath="..\..\..\src\base\ftcid.c"> </File> - <File RelativePath="..\..\..\src\base\ftfntfmt.c"> - </File> <File RelativePath="..\..\..\src\base\ftmm.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftpfr.c"> </File> @@ -380,8 +165,6 @@ </File> <File RelativePath="..\..\..\src\base\ftwinfnt.c"> </File> - <File RelativePath="..\..\..\src\base\ftlcdfil.c"> - </File> <File RelativePath="..\..\..\src\base\ftgxval.c"> </File> <File RelativePath="..\..\..\src\base\ftotval.c"> @@ -389,244 +172,28 @@ <File RelativePath="..\..\..\src\base\ftpatent.c"> </File> <File RelativePath="..\..\..\src\pcf\pcf.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pfr\pfr.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psaux\psaux.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pshinter\pshinter.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psnames\psmodule.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\raster\raster.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\sfnt\sfnt.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\truetype\truetype.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type1\type1.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cid\type1cid.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type42\type42.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\winfonts\winfnt.c"> - <FileConfiguration Name="Release|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Release Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" /> - </FileConfiguration> - <FileConfiguration Name="Debug|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Singlethreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> - <FileConfiguration Name="Debug Multithreaded|Win32"> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> - </FileConfiguration> </File> </Filter> </Filter> @@ -647,4 +214,4 @@ </Files> <Globals> </Globals> -</VisualStudioProject> \ No newline at end of file +</VisualStudioProject> diff --git a/modules/freetype2/builds/windows/vc2005/index.html b/modules/freetype2/builds/windows/vc2005/index.html index a25e674268bc..c5e182ef0f54 100644 --- a/modules/freetype2/builds/windows/vc2005/index.html +++ b/modules/freetype2/builds/windows/vc2005/index.html @@ -11,14 +11,14 @@ <p>This directory contains project files for Visual C++, named <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It -compiles the following libraries from the FreeType 2.9 sources:</p> +compiles the following libraries from the FreeType 2.9.1 sources:</p> <ul> <pre> - freetype29.lib - release build; single threaded - freetype29_D.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MT_D.lib - debug build; multi-threaded</pre> + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/windows/vc2008/freetype.vcproj b/modules/freetype2/builds/windows/vc2008/freetype.vcproj index f2d1fe7bb946..f526cd2f6d11 100644 --- a/modules/freetype2/builds/windows/vc2008/freetype.vcproj +++ b/modules/freetype2/builds/windows/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\win32\vc2008\freetype29.lib" + OutputFile="..\..\..\objs\win32\vc2008\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -145,7 +145,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\win32\vc2008\freetype29MT.lib" + OutputFile="..\..\..\objs\win32\vc2008\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -220,7 +220,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\win32\vc2008\freetype29ST.lib" + OutputFile="..\..\..\objs\win32\vc2008\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -292,7 +292,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\win32\vc2008\freetype29_D.lib" + OutputFile="..\..\..\objs\win32\vc2008\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -365,7 +365,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\win32\vc2008\freetype29ST_D.lib" + OutputFile="..\..\..\objs\win32\vc2008\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -439,7 +439,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\win32\vc2008\freetype29MT_D.lib" + OutputFile="..\..\..\objs\win32\vc2008\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -473,203 +473,14 @@ <File RelativePath="..\..\..\src\bdf\bdf.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cff\cff.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbase.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbitmap.c" @@ -678,139 +489,13 @@ <File RelativePath="..\..\..\src\cache\ftcache.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\ftdebug.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > + <FileConfiguration> <Tool Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> </FileConfiguration> @@ -826,270 +511,18 @@ <File RelativePath="..\..\..\src\base\ftglyph.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\gzip\ftgzip.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftinit.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\lzw\ftlzw.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftstroke.c" @@ -1098,136 +531,10 @@ <File RelativePath="..\..\..\src\base\ftsystem.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\smooth\smooth.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <Filter Name="FT_MODULES" @@ -1245,75 +552,8 @@ > </File> <File - RelativePath="..\..\..\src\base\ftfntfmt.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftmm.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftpfr.c" @@ -1332,10 +572,6 @@ > </File> <File - RelativePath="..\..\..\src\base\ftlcdfil.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftgxval.c" > </File> @@ -1350,806 +586,50 @@ <File RelativePath="..\..\..\src\pcf\pcf.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pfr\pfr.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psaux\psaux.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pshinter\pshinter.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psnames\psmodule.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\raster\raster.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\sfnt\sfnt.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\truetype\truetype.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type1\type1.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cid\type1cid.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type42\type42.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\winfonts\winfnt.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> </Filter> </Filter> diff --git a/modules/freetype2/builds/windows/vc2008/index.html b/modules/freetype2/builds/windows/vc2008/index.html index e0fdf2dc4265..25c6f9b1313d 100644 --- a/modules/freetype2/builds/windows/vc2008/index.html +++ b/modules/freetype2/builds/windows/vc2008/index.html @@ -11,14 +11,14 @@ <p>This directory contains project files for Visual C++, named <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It -compiles the following libraries from the FreeType 2.9 sources:</p> +compiles the following libraries from the FreeType 2.9.1 sources:</p> <ul> <pre> - freetype29.lib - release build; single threaded - freetype29_D.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MT_D.lib - debug build; multi-threaded</pre> + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/windows/vc2010/freetype.sln b/modules/freetype2/builds/windows/vc2010/freetype.sln index b209eddd2c49..8698207a9245 100644 --- a/modules/freetype2/builds/windows/vc2010/freetype.sln +++ b/modules/freetype2/builds/windows/vc2010/freetype.sln @@ -6,42 +6,30 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug Multithreaded|Win32 = Debug Multithreaded|Win32 - Debug Multithreaded|x64 = Debug Multithreaded|x64 - Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32 - Debug Singlethreaded|x64 = Debug Singlethreaded|x64 + Debug Static|Win32 = Debug Static|Win32 + Debug Static|x64 = Debug Static|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release Multithreaded|Win32 = Release Multithreaded|Win32 - Release Multithreaded|x64 = Release Multithreaded|x64 - Release Singlethreaded|Win32 = Release Singlethreaded|Win32 - Release Singlethreaded|x64 = Release Singlethreaded|x64 + Release Static|Win32 = Release Static|Win32 + Release Static|x64 = Release Static|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Multithreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.Build.0 = Debug Static|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.ActiveCfg = Debug Static|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.Build.0 = Debug Static|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Multithreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.Build.0 = Release Static|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.ActiveCfg = Release Static|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.Build.0 = Release Static|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/freetype2/builds/windows/vc2010/freetype.vcxproj b/modules/freetype2/builds/windows/vc2010/freetype.vcxproj index 8eb5b9a83021..521e84722411 100644 --- a/modules/freetype2/builds/windows/vc2010/freetype.vcxproj +++ b/modules/freetype2/builds/windows/vc2010/freetype.vcxproj @@ -398,13 +398,11 @@ <ClCompile Include="..\..\..\src\base\ftbdf.c" /> <ClCompile Include="..\..\..\src\base\ftbitmap.c" /> <ClCompile Include="..\..\..\src\base\ftcid.c" /> - <ClCompile Include="..\..\..\src\base\ftfntfmt.c" /> <ClCompile Include="..\..\..\src\base\ftfstype.c" /> <ClCompile Include="..\..\..\src\base\ftgasp.c" /> <ClCompile Include="..\..\..\src\base\ftglyph.c" /> <ClCompile Include="..\..\..\src\base\ftgxval.c" /> <ClCompile Include="..\..\..\src\base\ftinit.c" /> - <ClCompile Include="..\..\..\src\base\ftlcdfil.c" /> <ClCompile Include="..\..\..\src\base\ftmm.c" /> <ClCompile Include="..\..\..\src\base\ftotval.c" /> <ClCompile Include="..\..\..\src\base\ftpatent.c" /> @@ -435,7 +433,7 @@ <ClCompile Include="..\ftdebug.c"> <DisableLanguageExtensions>false</DisableLanguageExtensions> </ClCompile> - <ResourceCompile Include="..\ftver.rc" /> + <ResourceCompile Include="..\..\..\src\base\ftver.rc" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/modules/freetype2/builds/windows/vc2010/freetype.vcxproj.filters b/modules/freetype2/builds/windows/vc2010/freetype.vcxproj.filters index 0be176b57e3a..8ba3673e6bcf 100644 --- a/modules/freetype2/builds/windows/vc2010/freetype.vcxproj.filters +++ b/modules/freetype2/builds/windows/vc2010/freetype.vcxproj.filters @@ -95,9 +95,6 @@ <ClCompile Include="..\..\..\src\base\ftcid.c"> <Filter>Source Files\FT_MODULES</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\base\ftfntfmt.c"> - <Filter>Source Files\FT_MODULES</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\base\ftfstype.c"> <Filter>Source Files\FT_MODULES</Filter> </ClCompile> @@ -110,9 +107,6 @@ <ClCompile Include="..\..\..\src\base\ftgxval.c"> <Filter>Source Files\FT_MODULES</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\base\ftlcdfil.c"> - <Filter>Source Files\FT_MODULES</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\base\ftmm.c"> <Filter>Source Files\FT_MODULES</Filter> </ClCompile> diff --git a/modules/freetype2/builds/windows/vc2010/index.html b/modules/freetype2/builds/windows/vc2010/index.html index 7433ce8355b3..c3e604034217 100644 --- a/modules/freetype2/builds/windows/vc2010/index.html +++ b/modules/freetype2/builds/windows/vc2010/index.html @@ -1,42 +1,26 @@ <html> <header> <title> - FreeType 2 Project Files for VS.NET 2010 or newer + FreeType 2 Project Files for Visual C++ 2010 or newer </title> <body> <h1> - FreeType 2 Project Files for VS.NET 2010 or newer + FreeType 2 Project Files for Visual C++ 2010 or newer </h1> -<p>This directory contains a project file for Visual C++ (VS.NET 2010 -or newer), named <tt>freetype.vcxproj</tt>, and Visual Studio, called -<tt>freetype.sln</tt>. It compiles the following libraries from the -FreeType 2.9 sources:</p> +<p>This directory contains solution and project files for +Visual C++ 2010 or newer, named <tt>freetype.sln</tt>, +and <tt>freetype.vcxproj</tt>. It compiles the following libraries +from the FreeType 2.9.1 sources:</p> <ul> - <pre> - freetype29.lib - release build - freetype29d.lib - debug build - freetype29ST.lib - release build; single threaded - freetype29STd.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MTd.lib - debug build; multi-threaded</pre> + <li>freetype.dll using 'Release' or 'Debug' configurations</li> + <li>freetype.lib using 'Release Static' or 'Debug Static' configurations</li> </ul> -<p>Both Win32 and x64 builds are supported.</p> - -<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP -archives are already stored this way, so no further action is required. If -you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting -tool to convert the line endings. For example, with <a -href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR -file smart CR/LF Conversion</em> option. Alternatively, you may consider -using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating -around, which specifically deal with this particular problem. - -<p>Build directories are placed in the top-level <tt>objs\vc2010</tt> -directory.</p> +<p>Both Win32 and x64 builds are supported. Build directories and target +files are placed in the top-level <tt>objs</tt> directory.</p> <p>Customization of the FreeType library is done by editing the <tt>ftoption.h</tt> header file in the top-level <tt>devel</tt> path. @@ -48,5 +32,9 @@ edit the <tt>freetype.users.props</tt> file in this directory. It also simplifies automated (command-line) builds using <a href="http://msdn.microsoft.com/library/dd393574%28v=vs.100%29.aspx">msbuild</a>.</p> +<p>To link your executable with FreeType DLL, you may want to define +FT2_DLLIMPORT so that the imported functions are appropriately +attributed with <tt>dllimport<tt>.</p> + </body> </html> diff --git a/modules/freetype2/builds/windows/visualc/freetype.dsp b/modules/freetype2/builds/windows/visualc/freetype.dsp index 76d6e9125cf3..dac3d25c4de4 100644 --- a/modules/freetype2/builds/windows/visualc/freetype.dsp +++ b/modules/freetype2/builds/windows/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype29.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype29.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype29ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype291ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291ST_D.lib" !ENDIF @@ -200,17 +200,14 @@ SOURCE=..\..\..\src\autofit\autofit.c # Begin Source File SOURCE=..\..\..\src\bdf\bdf.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\cff\cff.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\base\ftbase.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -230,14 +227,6 @@ SOURCE=..\..\..\src\base\ftcid.c # End Source File # Begin Source File -SOURCE=..\..\..\src\base\ftfntfmt.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\base\ftlcdfil.c -# End Source File -# Begin Source File - SOURCE=..\..\..\src\base\ftpatent.c # End Source File # Begin Source File @@ -251,18 +240,15 @@ SOURCE=..\..\..\src\base\ftgasp.c # Begin Source File SOURCE=..\..\..\src\cache\ftcache.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\ftdebug.c # ADD CPP /Ze -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\base\ftglyph.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -275,7 +261,6 @@ SOURCE=..\..\..\src\gzip\ftgzip.c # Begin Source File SOURCE=..\..\..\src\base\ftinit.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -284,7 +269,6 @@ SOURCE=..\..\..\src\lzw\ftlzw.c # Begin Source File SOURCE=..\..\..\src\base\ftmm.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -305,7 +289,6 @@ SOURCE=..\..\..\src\base\ftsynth.c # Begin Source File SOURCE=..\..\..\src\base\ftsystem.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -318,7 +301,6 @@ SOURCE=..\..\..\src\base\ftwinfnt.c # Begin Source File SOURCE=..\..\..\src\pcf\pcf.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -327,57 +309,46 @@ SOURCE=..\..\..\src\pfr\pfr.c # Begin Source File SOURCE=..\..\..\src\psaux\psaux.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\pshinter\pshinter.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\psnames\psmodule.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\raster\raster.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\sfnt\sfnt.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\smooth\smooth.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\truetype\truetype.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\type1\type1.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\cid\type1cid.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\type42\type42.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\winfonts\winfnt.c -# SUBTRACT CPP /Fr # End Source File # End Group # Begin Group "Header Files" diff --git a/modules/freetype2/builds/windows/visualc/freetype.vcproj b/modules/freetype2/builds/windows/visualc/freetype.vcproj index 6c0b7617dc3b..dd0c41801056 100644 --- a/modules/freetype2/builds/windows/visualc/freetype.vcproj +++ b/modules/freetype2/builds/windows/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -144,7 +144,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -219,7 +219,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -291,7 +291,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -364,7 +364,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -438,7 +438,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -472,203 +472,14 @@ <File RelativePath="..\..\..\src\bdf\bdf.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cff\cff.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbase.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftbitmap.c" @@ -685,139 +496,13 @@ <File RelativePath="..\..\..\src\cache\ftcache.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\ftdebug.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > + <FileConfiguration> <Tool Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" DisableLanguageExtensions="false" /> </FileConfiguration> @@ -825,270 +510,18 @@ <File RelativePath="..\..\..\src\base\ftglyph.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\gzip\ftgzip.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftinit.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\lzw\ftlzw.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftstroke.c" @@ -1097,136 +530,10 @@ <File RelativePath="..\..\..\src\base\ftsystem.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\smooth\smooth.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <Filter Name="FT_MODULES" @@ -1244,75 +551,8 @@ > </File> <File - RelativePath="..\..\..\src\base\ftfntfmt.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftmm.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftpfr.c" @@ -1331,10 +571,6 @@ > </File> <File - RelativePath="..\..\..\src\base\ftlcdfil.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftgxval.c" > </File> @@ -1349,806 +585,50 @@ <File RelativePath="..\..\..\src\pcf\pcf.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pfr\pfr.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psaux\psaux.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pshinter\pshinter.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psnames\psmodule.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\raster\raster.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\sfnt\sfnt.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\truetype\truetype.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type1\type1.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cid\type1cid.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type42\type42.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\winfonts\winfnt.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> </File> </Filter> </Filter> diff --git a/modules/freetype2/builds/windows/visualc/index.html b/modules/freetype2/builds/windows/visualc/index.html index 32cebc6ddbde..c0611d2f8d6b 100644 --- a/modules/freetype2/builds/windows/visualc/index.html +++ b/modules/freetype2/builds/windows/visualc/index.html @@ -11,14 +11,14 @@ <p>This directory contains project files for Visual C++, named <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It -compiles the following libraries from the FreeType 2.9 sources:</p> +compiles the following libraries from the FreeType 2.9.1 sources:</p> <ul> <pre> - freetype29.lib - release build; single threaded - freetype29_D.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MT_D.lib - debug build; multi-threaded</pre> + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/windows/visualce/freetype.dsp b/modules/freetype2/builds/windows/visualce/freetype.dsp index 19d7c454f661..5fe2b5a97a6d 100644 --- a/modules/freetype2/builds/windows/visualce/freetype.dsp +++ b/modules/freetype2/builds/windows/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype29.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype29.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype29ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype291ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291ST_D.lib" !ENDIF @@ -200,17 +200,14 @@ SOURCE=..\..\..\src\autofit\autofit.c # Begin Source File SOURCE=..\..\..\src\bdf\bdf.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\cff\cff.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\base\ftbase.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -230,10 +227,6 @@ SOURCE=..\..\..\src\base\ftcid.c # End Source File # Begin Source File -SOURCE=..\..\..\src\base\ftfntfmt.c -# End Source File -# Begin Source File - SOURCE=..\..\..\src\base\ftfstype.c # End Source File # Begin Source File @@ -243,18 +236,15 @@ SOURCE=..\..\..\src\base\ftgasp.c # Begin Source File SOURCE=..\..\..\src\cache\ftcache.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\ftdebug.c # ADD CPP /Ze -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\base\ftglyph.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -267,11 +257,6 @@ SOURCE=..\..\..\src\gzip\ftgzip.c # Begin Source File SOURCE=..\..\..\src\base\ftinit.c -# SUBTRACT CPP /Fr -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\base\ftlcdfil.c # End Source File # Begin Source File @@ -280,7 +265,6 @@ SOURCE=..\..\..\src\lzw\ftlzw.c # Begin Source File SOURCE=..\..\..\src\base\ftmm.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -305,7 +289,6 @@ SOURCE=..\..\..\src\base\ftsynth.c # Begin Source File SOURCE=..\..\..\src\base\ftsystem.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -318,7 +301,6 @@ SOURCE=..\..\..\src\base\ftwinfnt.c # Begin Source File SOURCE=..\..\..\src\pcf\pcf.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File @@ -327,57 +309,46 @@ SOURCE=..\..\..\src\pfr\pfr.c # Begin Source File SOURCE=..\..\..\src\psaux\psaux.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\pshinter\pshinter.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\psnames\psmodule.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\raster\raster.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\sfnt\sfnt.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\smooth\smooth.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\truetype\truetype.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\type1\type1.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\cid\type1cid.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\type42\type42.c -# SUBTRACT CPP /Fr # End Source File # Begin Source File SOURCE=..\..\..\src\winfonts\winfnt.c -# SUBTRACT CPP /Fr # End Source File # End Group # Begin Group "Header Files" diff --git a/modules/freetype2/builds/windows/visualce/freetype.vcproj b/modules/freetype2/builds/windows/visualce/freetype.vcproj index d08cd8e443ec..b79731175a1e 100644 --- a/modules/freetype2/builds/windows/visualce/freetype.vcproj +++ b/modules/freetype2/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -162,7 +162,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -237,7 +237,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -309,7 +309,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -382,7 +382,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -456,7 +456,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -534,7 +534,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -619,7 +619,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -704,7 +704,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -785,7 +785,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -867,7 +867,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -950,7 +950,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1036,7 +1036,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -1121,7 +1121,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -1206,7 +1206,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1287,7 +1287,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1369,7 +1369,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1452,7 +1452,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1538,7 +1538,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -1623,7 +1623,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -1708,7 +1708,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -1789,7 +1789,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1871,7 +1871,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -1954,7 +1954,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2040,7 +2040,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -2125,7 +2125,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -2210,7 +2210,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -2291,7 +2291,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2373,7 +2373,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2456,7 +2456,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2542,7 +2542,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -2627,7 +2627,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -2712,7 +2712,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -2793,7 +2793,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2875,7 +2875,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -2958,7 +2958,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3044,7 +3044,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29.lib" + OutputFile="..\..\..\objs\freetype291.lib" SuppressStartupBanner="true" /> <Tool @@ -3129,7 +3129,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT.lib" + OutputFile="..\..\..\objs\freetype291MT.lib" SuppressStartupBanner="true" /> <Tool @@ -3214,7 +3214,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST.lib" + OutputFile="..\..\..\objs\freetype291ST.lib" /> <Tool Name="VCALinkTool" @@ -3295,7 +3295,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29_D.lib" + OutputFile="..\..\..\objs\freetype291_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3377,7 +3377,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29ST_D.lib" + OutputFile="..\..\..\objs\freetype291ST_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3460,7 +3460,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\objs\freetype29MT_D.lib" + OutputFile="..\..\..\objs\freetype291MT_D.lib" SuppressStartupBanner="true" /> <Tool @@ -3502,4757 +3502,68 @@ <File RelativePath="..\..\..\src\bdf\bdf.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\cff\cff.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftbase.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftbitmap.c" - > - </File> - <File - RelativePath="..\..\..\src\base\ftfstype.c" - > - </File> - <File - RelativePath="..\..\..\src\cache\ftcache.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\ftdebug.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - DisableLanguageExtensions="false" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftgasp.c" - > - </File> - <File - RelativePath="..\..\..\src\base\ftglyph.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\gzip\ftgzip.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\base\ftinit.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\src\lzw\ftlzw.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File - RelativePath="..\..\..\src\base\ftstroke.c" + RelativePath="..\..\..\src\cff\cff.c" > </File> <File - RelativePath="..\..\..\src\base\ftsystem.c" + RelativePath="..\..\..\src\base\ftbase.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > + </File> + <File + RelativePath="..\..\..\src\base\ftbitmap.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftfstype.c" + > + </File> + <File + RelativePath="..\..\..\src\cache\ftcache.c" + > + </File> + <File + RelativePath="..\ftdebug.c" + > + <FileConfiguration> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + DisableLanguageExtensions="false" /> </FileConfiguration> </File> <File + RelativePath="..\..\..\src\base\ftgasp.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftglyph.c" + > + </File> + <File + RelativePath="..\..\..\src\gzip\ftgzip.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftinit.c" + > + </File> + <File + RelativePath="..\..\..\src\lzw\ftlzw.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftstroke.c" + > + </File> + <File + RelativePath="..\..\..\src\base\ftsystem.c" + > + </File> + <File RelativePath="..\..\..\src\smooth\smooth.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <Filter Name="FT_MODULES" @@ -8270,435 +3581,8 @@ > </File> <File - RelativePath="..\..\..\src\base\ftfntfmt.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftmm.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\base\ftpfr.c" @@ -8717,10 +3601,6 @@ > </File> <File - RelativePath="..\..\..\src\base\ftlcdfil.c" - > - </File> - <File RelativePath="..\..\..\src\base\ftgxval.c" > </File> @@ -8735,5126 +3615,50 @@ <File RelativePath="..\..\..\src\pcf\pcf.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pfr\pfr.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psaux\psaux.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\pshinter\pshinter.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\psnames\psmodule.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\raster\raster.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\sfnt\sfnt.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\truetype\truetype.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type1\type1.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\cid\type1cid.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\type42\type42.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\src\winfonts\winfnt.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Pocket PC 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Smartphone 2003 (ARMV4)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Professional SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Singlethreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug Multithreaded|Windows Mobile 6 Standard SDK (ARMV4I)" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> </Filter> </Filter> diff --git a/modules/freetype2/builds/windows/visualce/index.html b/modules/freetype2/builds/windows/visualce/index.html index 3b3390af295f..d5a3ca3e3bf3 100644 --- a/modules/freetype2/builds/windows/visualce/index.html +++ b/modules/freetype2/builds/windows/visualce/index.html @@ -21,14 +21,14 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.9 sources:</p> +It compiles the following libraries from the FreeType 2.9.1 sources:</p> <ul> <pre> - freetype29.lib - release build; single threaded - freetype29_D.lib - debug build; single threaded - freetype29MT.lib - release build; multi-threaded - freetype29MT_D.lib - debug build; multi-threaded</pre> + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/configure b/modules/freetype2/configure index 8ee0d4029571..f9d218667b9c 100755 --- a/modules/freetype2/configure +++ b/modules/freetype2/configure @@ -29,7 +29,7 @@ else fi if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then - echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2 + echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2 echo "Please try" >&2 echo >&2 echo " MAKE=<GNU make command name> $0" >&2 diff --git a/modules/freetype2/docs/CHANGES b/modules/freetype2/docs/CHANGES index 9901e1094742..a6d088af4937 100644 --- a/modules/freetype2/docs/CHANGES +++ b/modules/freetype2/docs/CHANGES @@ -1,3 +1,50 @@ +CHANGES BETWEEN 2.9 and 2.9.1 + + I. IMPORTANT BUG FIXES + + - Type 1 fonts containing flex features were not rendered + correctly (bug introduced in version 2.9). + + - CVE-2018-6942: Older FreeType versions can crash with certain + malformed variation fonts. + + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6942 + + + II. MISCELLANEOUS + + - Bug fix: Multiple calls to `FT_Get_MM_Var' returned garbage. + + - The base extensions `ftlcdfil' and `ftfntfmt' are now part of + the base module (and thus no longer configurable in file + `modules.cfg'). + + - Emboldening of bitmaps didn't work correctly sometimes, showing + various artifacts (bug introduced in version 2.8.1). + + - Use of the `freetype-config' script to get compilation and + linking options is deprecated since it doesn't support + cross-compiling, among other deficiencies. Instead, you should + use the `pkg-config' interface. + + The `configure' script no longer installs `freetype-config' by + default. For backwards compatibility, a new configure option + `--enable-freetype-config' is provided that reverts this + decision. + + - The auto-hinter script ranges have been updated for Unicode 11. + No support for new scripts have been added, however, with the + exception of Georgian Mtavruli. + + - Support for cmake has been improved. + + - The next release will remove support for Position Independent + Code as needed by systems that prohibit automatic address + fixups, such as BREW. [Compilation with modern compilers that + use flags like `-fPIC' or `-fPIE' is not affected.] + + +====================================================================== CHANGES BETWEEN 2.8.1 and 2.9 @@ -86,6 +133,7 @@ CHANGES BETWEEN 2.8.1 and 2.9 and switch between hexadecimal and decimal display of integers (key `I'). + ====================================================================== CHANGES BETWEEN 2.8 and 2.8.1 @@ -286,7 +334,7 @@ CHANGES BETWEEN 2.7.1 and 2.8 - FT_LOAD_TARGET_LCD is now a variant of FT_LOAD_TARGET_LIGHT; this should provide better rendering results. - - A mode to display light auto-hinting with sub-pixel positioning + - A mode to display light auto-hinting with subpixel positioning has been added to `ftdiff'. @@ -616,8 +664,8 @@ CHANGES BETWEEN 2.6.1 and 2.6.2 - The smooth renderer has been made faster. - - The `ftstring' demo program now supports sub-pixel rendering; - use key `l' to cycle through the LCD modes. + - The `ftstring' demo program now supports subpixel rendering; use + key `l' to cycle through the LCD modes. - The `ftstring' demo program now supports colour rendering; use the `space' key to cycle through various colour combinations. @@ -3055,12 +3103,12 @@ CHANGES BETWEEN 2.1.3 and 2.1.2 FT_LOAD_TARGET_MONO :: Hint and render for 1-bit displays. FT_LOAD_TARGET_LCD :: Hint and render for horizontal RGB or - BGR sub-pixel displays (like LCD + BGR subpixel displays (like LCD screens). THIS IS STILL EXPERIMENTAL! FT_LOAD_TARGET_LCD_V :: Same as FT_LOAD_TARGET_LCD, for - vertical sub-pixel displays (like + vertical subpixel displays (like rotated LCD screens). THIS IS STILL EXPERIMENTAL! diff --git a/modules/freetype2/docs/INSTALL b/modules/freetype2/docs/INSTALL index fc24ea1aa569..71d4a055367b 100644 --- a/modules/freetype2/docs/INSTALL +++ b/modules/freetype2/docs/INSTALL @@ -14,7 +14,7 @@ I. Normal installation and upgrades compilation, since other make tools won't work (this includes BSD Make). - GNU Make VERSION 3.80 OR NEWER IS NEEDED! + GNU Make VERSION 3.81 OR NEWER IS NEEDED! [For `cmake' see below.] @@ -72,7 +72,7 @@ II. Custom builds of the library http://makepp.sourceforge.net - for more information; you need version 1.19 or newer, and you must + for more information; you need version 2.0 or newer, and you must pass option `--norc-substitution'. ---------------------------------------------------------------------- diff --git a/modules/freetype2/docs/INSTALL.ANY b/modules/freetype2/docs/INSTALL.ANY index 47d080f28fe2..fddac9ad2e43 100644 --- a/modules/freetype2/docs/INSTALL.ANY +++ b/modules/freetype2/docs/INSTALL.ANY @@ -39,11 +39,9 @@ I. Standard procedure src/base/ftbdf.c -- optional, see <ftbdf.h> src/base/ftbitmap.c -- optional, see <ftbitmap.h> src/base/ftcid.c -- optional, see <ftcid.h> - src/base/ftfntfmt.c -- optional, see <ftfntfmt.h> src/base/ftfstype.c -- optional src/base/ftgasp.c -- optional, see <ftgasp.h> src/base/ftgxval.c -- optional, see <ftgxval.h> - src/base/ftlcdfil.c -- optional, see <ftlcdfil.h> src/base/ftmm.c -- optional, see <ftmm.h> src/base/ftotval.c -- optional, see <ftotval.h> src/base/ftpatent.c -- optional diff --git a/modules/freetype2/docs/INSTALL.CROSS b/modules/freetype2/docs/INSTALL.CROSS index e8977a12ab8f..239e1a9b6aad 100644 --- a/modules/freetype2/docs/INSTALL.CROSS +++ b/modules/freetype2/docs/INSTALL.CROSS @@ -9,7 +9,7 @@ procedure. ----------------- For self-building the FreeType library on a Unix system, GNU Make - 3.80 or newer is required. `INSTALL.UNIX' contains hints how to + 3.81 or newer is required. `INSTALL.UNIX' contains hints how to check the installed `make'. The GNU C compiler to cross-build the target system is required. diff --git a/modules/freetype2/docs/INSTALL.GNU b/modules/freetype2/docs/INSTALL.GNU index 52645f1f7b36..e314ecfdd17f 100644 --- a/modules/freetype2/docs/INSTALL.GNU +++ b/modules/freetype2/docs/INSTALL.GNU @@ -25,7 +25,7 @@ instructions in the file `INSTALL.UNIX' instead. http://makepp.sourceforge.net - for more information; you need version 1.19 or newer, and you must + for more information; you need version 2.0 or newer, and you must pass option `--norc-substitution'. Make sure that you are invoking GNU Make from the command line, by @@ -35,7 +35,7 @@ instructions in the file `INSTALL.UNIX' instead. to display its version number. - VERSION 3.80 OR NEWER IS NEEDED! + VERSION 3.81 OR NEWER IS NEEDED! 2. Invoke `make' diff --git a/modules/freetype2/docs/INSTALL.UNIX b/modules/freetype2/docs/INSTALL.UNIX index bb57836a6ce2..f92d828e61e0 100644 --- a/modules/freetype2/docs/INSTALL.UNIX +++ b/modules/freetype2/docs/INSTALL.UNIX @@ -19,7 +19,7 @@ or MSys on Win32: GNU Make <version number> Copyright (C) <year> Free Software Foundation Inc. - Note that version 3.80 or higher is *required* or the build will + Note that version 3.81 or higher is *required* or the build will fail. It is also fine to have GNU Make under another name (e.g. 'gmake') diff --git a/modules/freetype2/docs/MAKEPP b/modules/freetype2/docs/MAKEPP index 58eaf551df89..a4d44b78e57f 100644 --- a/modules/freetype2/docs/MAKEPP +++ b/modules/freetype2/docs/MAKEPP @@ -1,5 +1,5 @@ As a special exception, FreeType can also be built with the 'makepp' build tool, available from http://makepp.sourceforge.net. -Note, however. that you will need at least version 1.19 and pass the +Note, however, that you will need at least version 2.0 and pass the option --norc-substitution to have it work correctly. diff --git a/modules/freetype2/docs/VERSIONS.TXT b/modules/freetype2/docs/VERSIONS.TXT index b0d25b54f64f..377415702115 100644 --- a/modules/freetype2/docs/VERSIONS.TXT +++ b/modules/freetype2/docs/VERSIONS.TXT @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.9.1 22.1.16 6.16.1 2.9.0 22.0.16 6.16.0 2.8.1 21.0.15 6.15.0 2.8.0 20.0.14 6.14.0 diff --git a/modules/freetype2/docs/freetype-config.1 b/modules/freetype2/docs/freetype-config.1 index e060dcbd191e..164b8ffa09af 100644 --- a/modules/freetype2/docs/freetype-config.1 +++ b/modules/freetype2/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "January 2018" "FreeType 2.9" +.TH FREETYPE-CONFIG 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff --git a/modules/freetype2/docs/reference/ft2-auto_hinter.html b/modules/freetype2/docs/reference/ft2-auto_hinter.html index 5e0eada7913c..884d87ad6a54 100644 --- a/modules/freetype2/docs/reference/ft2-auto_hinter.html +++ b/modules/freetype2/docs/reference/ft2-auto_hinter.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="auto_hinter">The auto-hinter</h1> diff --git a/modules/freetype2/docs/reference/ft2-base_interface.html b/modules/freetype2/docs/reference/ft2-base_interface.html index 936a9c4df5a6..3cedbcc944c9 100644 --- a/modules/freetype2/docs/reference/ft2-base_interface.html +++ b/modules/freetype2/docs/reference/ft2-base_interface.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="base_interface">Base Interface</h1> <h2>Synopsis</h2> @@ -379,7 +379,7 @@ </table> <h4>note</h4> -<p>By default, FreeType automatically synthesizes a Unicode charmap for PostScript fonts, using their glyph name dictionaries. However, it also reports the encodings defined explicitly in the font file, for the cases when they are needed, with the Adobe values as well.</p> +<p>By default, FreeType enables a Unicode charmap and tags it with FT_ENCODING_UNICODE when it is either provided or can be generated from PostScript glyph name dictionaries in the font file. All other encodings are considered legacy and tagged only if explicitly defined in the font file. Otherwise, FT_ENCODING_NONE is used.</p> <p>FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap is neither Unicode nor ISO-8859-1 (otherwise it is set to FT_ENCODING_UNICODE). Use <a href="ft2-bdf_fonts.html#FT_Get_BDF_Charset_ID">FT_Get_BDF_Charset_ID</a> to find out which encoding is really present. If, for example, the ‘cs_registry’ field is ‘KOI8’ and the ‘cs_encoding’ field is ‘R’, the font is encoded in KOI8-R.</p> <p>FT_ENCODING_NONE is always set (with a single exception) by the winfonts driver. Use <a href="ft2-winfnt_fonts.html#FT_Get_WinFNT_Header">FT_Get_WinFNT_Header</a> and examine the ‘charset’ field of the <a href="ft2-winfnt_fonts.html#FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a> structure to find out which encoding is really present. For example, <a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1251</a> (204) means Windows code page 1251 (for Russian).</p> <p>FT_ENCODING_NONE is set if ‘platform_id’ is <a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MACINTOSH</a> and ‘encoding_id’ is not ‘TT_MAC_ID_ROMAN’ (otherwise it is set to FT_ENCODING_APPLE_ROMAN).</p> @@ -1647,7 +1647,7 @@ </table> <h4>note</h4> -<p>The ID and function of parameters are driver-specific. See the various FT_PARAM_TAG_XXX flags for more information.</p> +<p>The ID and function of parameters are driver-specific. See section ‘<a href="ft2-parameter_tags.html#parameter_tags">Parameter Tags</a>’ for more information.</p> <hr> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="middle">[<a href="#">Top</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table></div> @@ -2237,6 +2237,7 @@ <h4>note</h4> <p>This function simply calls <a href="ft2-base_interface.html#FT_Get_Char_Index">FT_Get_Char_Index</a> and <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a>.</p> <p>Many fonts contain glyphs that can't be loaded by this function since its glyph indices are not listed in any of the font's charmaps.</p> +<p>If no active cmap is set up (i.e., ‘face->charmap’ is zero), the call to <a href="ft2-base_interface.html#FT_Get_Char_Index">FT_Get_Char_Index</a> is omitted, and the function behaves identically to <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a>.</p> <hr> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="middle">[<a href="#">Top</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table></div> @@ -2341,10 +2342,10 @@ <p>This mode corresponds to 1-bit bitmaps (with 2 levels of opacity).</p> </td></tr> <tr><td class="val" id="FT_RENDER_MODE_LCD">FT_RENDER_MODE_LCD</td><td class="desc"> -<p>This mode corresponds to horizontal RGB and BGR sub-pixel displays like LCD screens. It produces 8-bit bitmaps that are 3 times the width of the original glyph outline in pixels, and which use the <a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD</a> mode.</p> +<p>This mode corresponds to horizontal RGB and BGR subpixel displays like LCD screens. It produces 8-bit bitmaps that are 3 times the width of the original glyph outline in pixels, and which use the <a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD</a> mode.</p> </td></tr> <tr><td class="val" id="FT_RENDER_MODE_LCD_V">FT_RENDER_MODE_LCD_V</td><td class="desc"> -<p>This mode corresponds to vertical RGB and BGR sub-pixel displays (like PDA screens, rotated LCD displays, etc.). It produces 8-bit bitmaps that are 3 times the height of the original glyph outline in pixels and use the <a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD_V</a> mode.</p> +<p>This mode corresponds to vertical RGB and BGR subpixel displays (like PDA screens, rotated LCD displays, etc.). It produces 8-bit bitmaps that are 3 times the height of the original glyph outline in pixels and use the <a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD_V</a> mode.</p> </td></tr> </table> @@ -2861,7 +2862,7 @@ </td></tr> <tr><td class="val" id="FT_FACE_FLAG_MULTIPLE_MASTERS">FT_FACE_FLAG_MULTIPLE_MASTERS</td><td class="desc"> <p>The face contains multiple masters and is capable of interpolating between them. Supported formats are Adobe MM, TrueType GX, and OpenType variation fonts.</p> -<p>See the multiple-masters specific API for details.</p> +<p>See section ‘<a href="ft2-multiple_masters.html#multiple_masters">Multiple Masters</a>’ for API details.</p> </td></tr> <tr><td class="val" id="FT_FACE_FLAG_GLYPH_NAMES">FT_FACE_FLAG_GLYPH_NAMES</td><td class="desc"> <p>The face contains glyph names, which can be retrieved using <a href="ft2-base_interface.html#FT_Get_Glyph_Name">FT_Get_Glyph_Name</a>. Note that some TrueType fonts contain broken glyph name tables. Use the function <a href="ft2-type1_tables.html#FT_Has_PS_Glyph_Names">FT_Has_PS_Glyph_Names</a> when needed.</p> @@ -3096,7 +3097,7 @@ </td></tr> <tr><td class="val" id="FT_LOAD_TARGET_LIGHT">FT_LOAD_TARGET_LIGHT</td><td class="desc"> <p>A lighter hinting algorithm for gray-level modes. Many generated glyphs are fuzzier but better resemble their original shape. This is achieved by snapping glyphs to the pixel grid only vertically (Y-axis), as is done by FreeType's new CFF engine or Microsoft's ClearType font renderer. This preserves inter-glyph spacing in horizontal text. The snapping is done either by the native font driver, if the driver itself and the font support it, or by the auto-hinter.</p> -<p>Advance widths are rounded to integer values; however, using the ‘lsb_delta’ and ‘rsb_delta’ fields of <a href="ft2-base_interface.html#FT_GlyphSlotRec">FT_GlyphSlotRec</a>, it is possible to get fractional advance widths for sub-pixel positioning (which is recommended to use).</p> +<p>Advance widths are rounded to integer values; however, using the ‘lsb_delta’ and ‘rsb_delta’ fields of <a href="ft2-base_interface.html#FT_GlyphSlotRec">FT_GlyphSlotRec</a>, it is possible to get fractional advance widths for subpixel positioning (which is recommended to use).</p> <p>If configuration option AF_CONFIG_OPTION_TT_SIZE_METRICS is active, TrueType-like metrics are used to make this mode behave similarly as in unpatched FreeType versions between 2.4.6 and 2.7.1 (inclusive).</p> </td></tr> <tr><td class="val" id="FT_LOAD_TARGET_MONO">FT_LOAD_TARGET_MONO</td><td class="desc"> diff --git a/modules/freetype2/docs/reference/ft2-basic_types.html b/modules/freetype2/docs/reference/ft2-basic_types.html index 17bb0aaf9afb..0e622397c089 100644 --- a/modules/freetype2/docs/reference/ft2-basic_types.html +++ b/modules/freetype2/docs/reference/ft2-basic_types.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="basic_types">Basic Data Types</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-bdf_fonts.html b/modules/freetype2/docs/reference/ft2-bdf_fonts.html index eef42aa11ef8..f11cb21c8a04 100644 --- a/modules/freetype2/docs/reference/ft2-bdf_fonts.html +++ b/modules/freetype2/docs/reference/ft2-bdf_fonts.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="bdf_fonts">BDF and PCF Files</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-bitmap_handling.html b/modules/freetype2/docs/reference/ft2-bitmap_handling.html index bf0bc93e2dee..d80acc473d8e 100644 --- a/modules/freetype2/docs/reference/ft2-bitmap_handling.html +++ b/modules/freetype2/docs/reference/ft2-bitmap_handling.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="bitmap_handling">Bitmap Handling</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-bzip2.html b/modules/freetype2/docs/reference/ft2-bzip2.html index b11b484058a9..bb787cffc5ec 100644 --- a/modules/freetype2/docs/reference/ft2-bzip2.html +++ b/modules/freetype2/docs/reference/ft2-bzip2.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="bzip2">BZIP2 Streams</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-cache_subsystem.html b/modules/freetype2/docs/reference/ft2-cache_subsystem.html index 4cc074af7b20..d2d60697aea5 100644 --- a/modules/freetype2/docs/reference/ft2-cache_subsystem.html +++ b/modules/freetype2/docs/reference/ft2-cache_subsystem.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="cache_subsystem">Cache Sub-System</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-cff_driver.html b/modules/freetype2/docs/reference/ft2-cff_driver.html index 70c60eeb3694..6e7c1d9675e7 100644 --- a/modules/freetype2/docs/reference/ft2-cff_driver.html +++ b/modules/freetype2/docs/reference/ft2-cff_driver.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="cff_driver">The CFF driver</h1> @@ -111,7 +111,7 @@ <p>The rasterizer is positioning horizontal features (e.g., ascender height & x-height, or crossbars) on the pixel grid and minimizing the amount of antialiasing applied to them, while placing vertical features (vertical stems) on the pixel grid without hinting, thus representing the stem position and weight accurately. Sometimes the vertical stems may be only partially black. In this context, ‘antialiasing’ means that stems are not positioned exactly on pixel borders, causing a fuzzy appearance.</p> <p>There are two principles behind this approach.</p> <p>1) No hinting in the horizontal direction: Unlike ‘superhinted’ TrueType, which changes glyph widths to accommodate regular inter-glyph spacing, Adobe's approach is ‘faithful to the design’ in representing both the glyph width and the inter-glyph spacing designed for the font. This makes the screen display as close as it can be to the result one would get with infinite resolution, while preserving what is considered the key characteristics of each glyph. Note that the distances between unhinted and grid-fitted positions at small sizes are comparable to kerning values and thus would be noticeable (and distracting) while reading if hinting were applied.</p> -<p>One of the reasons to not hint horizontally is antialiasing for LCD screens: The pixel geometry of modern displays supplies three vertical sub-pixels as the eye moves horizontally across each visible pixel. On devices where we can be certain this characteristic is present a rasterizer can take advantage of the sub-pixels to add increments of weight. In Western writing systems this turns out to be the more critical direction anyway; the weights and spacing of vertical stems (see above) are central to Armenian, Cyrillic, Greek, and Latin type designs. Even when the rasterizer uses greyscale antialiasing instead of color (a necessary compromise when one doesn't know the screen characteristics), the unhinted vertical features preserve the design's weight and spacing much better than aliased type would.</p> +<p>One of the reasons to not hint horizontally is antialiasing for LCD screens: The pixel geometry of modern displays supplies three vertical subpixels as the eye moves horizontally across each visible pixel. On devices where we can be certain this characteristic is present a rasterizer can take advantage of the subpixels to add increments of weight. In Western writing systems this turns out to be the more critical direction anyway; the weights and spacing of vertical stems (see above) are central to Armenian, Cyrillic, Greek, and Latin type designs. Even when the rasterizer uses greyscale antialiasing instead of color (a necessary compromise when one doesn't know the screen characteristics), the unhinted vertical features preserve the design's weight and spacing much better than aliased type would.</p> <p>2) Alignment in the vertical direction: Weights and spacing along the y axis are less critical; what is much more important is the visual alignment of related features (like cap-height and x-height). The sense of alignment for these is enhanced by the sharpness of grid-fit edges, while the cruder vertical resolution (full pixels instead of 1/3 pixels) is less of a problem.</p> <p>On the technical side, horizontal alignment zones for ascender, x-height, and other important height values (traditionally called ‘blue zones’) as defined in the font are positioned independently, each being rounded to the nearest pixel edge, taking care of overshoot suppression at small sizes, stem darkening, and scaling.</p> <p>Hstems (this is, hint values defined in the font to help align horizontal features) that fall within a blue zone are said to be ‘captured’ and are aligned to that zone. Uncaptured stems are moved in one of four ways, top edge up or down, bottom edge up or down. Unless there are conflicting hstems, the smallest movement is taken to minimize distortion.</p> diff --git a/modules/freetype2/docs/reference/ft2-cid_fonts.html b/modules/freetype2/docs/reference/ft2-cid_fonts.html index f342e939caa5..9dcab71b40af 100644 --- a/modules/freetype2/docs/reference/ft2-cid_fonts.html +++ b/modules/freetype2/docs/reference/ft2-cid_fonts.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="cid_fonts">CID Fonts</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-computations.html b/modules/freetype2/docs/reference/ft2-computations.html index 400adb9570ce..d615dcfa257a 100644 --- a/modules/freetype2/docs/reference/ft2-computations.html +++ b/modules/freetype2/docs/reference/ft2-computations.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="computations">Computations</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-error_code_values.html b/modules/freetype2/docs/reference/ft2-error_code_values.html index f28b89fa5472..f53f6cd33071 100644 --- a/modules/freetype2/docs/reference/ft2-error_code_values.html +++ b/modules/freetype2/docs/reference/ft2-error_code_values.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="error_code_values">Error Code Values</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-error_enumerations.html b/modules/freetype2/docs/reference/ft2-error_enumerations.html index 03537589e5d2..9169802335a5 100644 --- a/modules/freetype2/docs/reference/ft2-error_enumerations.html +++ b/modules/freetype2/docs/reference/ft2-error_enumerations.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="error_enumerations">Error Enumerations</h1> diff --git a/modules/freetype2/docs/reference/ft2-font_formats.html b/modules/freetype2/docs/reference/ft2-font_formats.html index 1ff4f50583a0..54c4adfdfa9d 100644 --- a/modules/freetype2/docs/reference/ft2-font_formats.html +++ b/modules/freetype2/docs/reference/ft2-font_formats.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="font_formats">Font Formats</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-gasp_table.html b/modules/freetype2/docs/reference/ft2-gasp_table.html index 74351e90ad02..3bb22ee350d2 100644 --- a/modules/freetype2/docs/reference/ft2-gasp_table.html +++ b/modules/freetype2/docs/reference/ft2-gasp_table.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="gasp_table">Gasp Table</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-glyph_management.html b/modules/freetype2/docs/reference/ft2-glyph_management.html index 36643aac6844..00ef43ab5ba9 100644 --- a/modules/freetype2/docs/reference/ft2-glyph_management.html +++ b/modules/freetype2/docs/reference/ft2-glyph_management.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="glyph_management">Glyph Management</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-glyph_stroker.html b/modules/freetype2/docs/reference/ft2-glyph_stroker.html index bd1c38286f97..b1398107b825 100644 --- a/modules/freetype2/docs/reference/ft2-glyph_stroker.html +++ b/modules/freetype2/docs/reference/ft2-glyph_stroker.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="glyph_stroker">Glyph Stroker</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-glyph_variants.html b/modules/freetype2/docs/reference/ft2-glyph_variants.html index db4965580c36..b74b5b083070 100644 --- a/modules/freetype2/docs/reference/ft2-glyph_variants.html +++ b/modules/freetype2/docs/reference/ft2-glyph_variants.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="glyph_variants">Unicode Variation Sequences</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-gx_validation.html b/modules/freetype2/docs/reference/ft2-gx_validation.html index c7ddd5664f99..81ad8be368eb 100644 --- a/modules/freetype2/docs/reference/ft2-gx_validation.html +++ b/modules/freetype2/docs/reference/ft2-gx_validation.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="gx_validation">TrueTypeGX/AAT Validation</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-gzip.html b/modules/freetype2/docs/reference/ft2-gzip.html index d88ee082bb1b..51a9d29fc2bd 100644 --- a/modules/freetype2/docs/reference/ft2-gzip.html +++ b/modules/freetype2/docs/reference/ft2-gzip.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="gzip">GZIP Streams</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-header_file_macros.html b/modules/freetype2/docs/reference/ft2-header_file_macros.html index 26e34d78072e..88cb179d0ed8 100644 --- a/modules/freetype2/docs/reference/ft2-header_file_macros.html +++ b/modules/freetype2/docs/reference/ft2-header_file_macros.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="header_file_macros">Header File Macros</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-header_inclusion.html b/modules/freetype2/docs/reference/ft2-header_inclusion.html index 9f4182d4d405..107ac5c895fd 100644 --- a/modules/freetype2/docs/reference/ft2-header_inclusion.html +++ b/modules/freetype2/docs/reference/ft2-header_inclusion.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="header_inclusion">FreeType's header inclusion scheme</h1> diff --git a/modules/freetype2/docs/reference/ft2-incremental.html b/modules/freetype2/docs/reference/ft2-incremental.html index c20a47534dd1..2257282965ae 100644 --- a/modules/freetype2/docs/reference/ft2-incremental.html +++ b/modules/freetype2/docs/reference/ft2-incremental.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="incremental">Incremental Loading</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-index.html b/modules/freetype2/docs/reference/ft2-index.html index 62a25465eee0..ee99e2ff2084 100644 --- a/modules/freetype2/docs/reference/ft2-index.html +++ b/modules/freetype2/docs/reference/ft2-index.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <table class="index"> <tr><td><a href="ft2-bdf_fonts.html#BDF_PropertyType">BDF_PROPERTY_TYPE_ATOM</a></td><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_UNFITTED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Done">FT_Stroker_Done</a></td></tr> @@ -375,5 +375,5 @@ <hr> <table class="index-toc-link"><tr><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<div class="timestamp">generated on Mon Jan 8 12:30:20 2018</div></body> +<div class="timestamp">generated on Tue May 1 23:34:43 2018</div></body> </html> diff --git a/modules/freetype2/docs/reference/ft2-lcd_filtering.html b/modules/freetype2/docs/reference/ft2-lcd_filtering.html index 98e8a2ca6f64..1e5d5ed7153d 100644 --- a/modules/freetype2/docs/reference/ft2-lcd_filtering.html +++ b/modules/freetype2/docs/reference/ft2-lcd_filtering.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="lcd_filtering">LCD Filtering</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-list_processing.html b/modules/freetype2/docs/reference/ft2-list_processing.html index 72beabc50e9b..bc4beae8ad8d 100644 --- a/modules/freetype2/docs/reference/ft2-list_processing.html +++ b/modules/freetype2/docs/reference/ft2-list_processing.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="list_processing">List Processing</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-lzw.html b/modules/freetype2/docs/reference/ft2-lzw.html index f8f735c38e37..2e24b9334393 100644 --- a/modules/freetype2/docs/reference/ft2-lzw.html +++ b/modules/freetype2/docs/reference/ft2-lzw.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="lzw">LZW Streams</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-mac_specific.html b/modules/freetype2/docs/reference/ft2-mac_specific.html index a9b9fb30828d..46ee03bab901 100644 --- a/modules/freetype2/docs/reference/ft2-mac_specific.html +++ b/modules/freetype2/docs/reference/ft2-mac_specific.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="mac_specific">Mac Specific Interface</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-module_management.html b/modules/freetype2/docs/reference/ft2-module_management.html index 9d1293faa1b7..b14dae4cc660 100644 --- a/modules/freetype2/docs/reference/ft2-module_management.html +++ b/modules/freetype2/docs/reference/ft2-module_management.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="module_management">Module Management</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-multiple_masters.html b/modules/freetype2/docs/reference/ft2-multiple_masters.html index 6b51b53da7ee..669dc0ab3bbb 100644 --- a/modules/freetype2/docs/reference/ft2-multiple_masters.html +++ b/modules/freetype2/docs/reference/ft2-multiple_masters.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="multiple_masters">Multiple Masters</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-ot_validation.html b/modules/freetype2/docs/reference/ft2-ot_validation.html index 52991cec3e70..27bd40a164c8 100644 --- a/modules/freetype2/docs/reference/ft2-ot_validation.html +++ b/modules/freetype2/docs/reference/ft2-ot_validation.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="ot_validation">OpenType Validation</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-outline_processing.html b/modules/freetype2/docs/reference/ft2-outline_processing.html index 21921296c731..3b12f93b2bf7 100644 --- a/modules/freetype2/docs/reference/ft2-outline_processing.html +++ b/modules/freetype2/docs/reference/ft2-outline_processing.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="outline_processing">Outline Processing</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-parameter_tags.html b/modules/freetype2/docs/reference/ft2-parameter_tags.html index 6178d03254fd..b1d1e642d9ce 100644 --- a/modules/freetype2/docs/reference/ft2-parameter_tags.html +++ b/modules/freetype2/docs/reference/ft2-parameter_tags.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="parameter_tags">Parameter Tags</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-pcf_driver.html b/modules/freetype2/docs/reference/ft2-pcf_driver.html index 75d6d2a7d65c..2bc4c966f203 100644 --- a/modules/freetype2/docs/reference/ft2-pcf_driver.html +++ b/modules/freetype2/docs/reference/ft2-pcf_driver.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="pcf_driver">The PCF driver</h1> diff --git a/modules/freetype2/docs/reference/ft2-pfr_fonts.html b/modules/freetype2/docs/reference/ft2-pfr_fonts.html index a398c503ea05..18c97c60e312 100644 --- a/modules/freetype2/docs/reference/ft2-pfr_fonts.html +++ b/modules/freetype2/docs/reference/ft2-pfr_fonts.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="pfr_fonts">PFR Fonts</h1> <h2>Synopsis</h2> @@ -141,7 +141,7 @@ <p>Metrics resolution. This is equivalent to ‘outline_resolution’ for non-PFR fonts. Optional (parameter can be NULL).</p> </td></tr> <tr><td class="val" id="ametrics_x_scale">ametrics_x_scale</td><td class="desc"> -<p>A 16.16 fixed-point number used to scale distance expressed in metrics units to device sub-pixels. This is equivalent to ‘face->size->x_scale’, but for metrics only. Optional (parameter can be NULL).</p> +<p>A 16.16 fixed-point number used to scale distance expressed in metrics units to device subpixels. This is equivalent to ‘face->size->x_scale’, but for metrics only. Optional (parameter can be NULL).</p> </td></tr> <tr><td class="val" id="ametrics_y_scale">ametrics_y_scale</td><td class="desc"> <p>Same as ‘ametrics_x_scale’ but for the vertical direction. optional (parameter can be NULL).</p> @@ -195,7 +195,7 @@ <h4>note</h4> <p>This function always return distances in original PFR metrics units. This is unlike <a href="ft2-base_interface.html#FT_Get_Kerning">FT_Get_Kerning</a> with the <a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_UNSCALED</a> mode, which always returns distances converted to outline units.</p> -<p>You can use the value of the ‘x_scale’ and ‘y_scale’ parameters returned by <a href="ft2-pfr_fonts.html#FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a> to scale these to device sub-pixels.</p> +<p>You can use the value of the ‘x_scale’ and ‘y_scale’ parameters returned by <a href="ft2-pfr_fonts.html#FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a> to scale these to device subpixels.</p> <hr> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="middle">[<a href="#">Top</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table></div> @@ -233,7 +233,7 @@ <p>FreeType error code. 0 means success.</p> <h4>note</h4> -<p>You can use the ‘x_scale’ or ‘y_scale’ results of <a href="ft2-pfr_fonts.html#FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a> to convert the advance to device sub-pixels (i.e., 1/64th of pixels).</p> +<p>You can use the ‘x_scale’ or ‘y_scale’ results of <a href="ft2-pfr_fonts.html#FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a> to convert the advance to device subpixels (i.e., 1/64th of pixels).</p> <hr> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="middle">[<a href="#">Top</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table></div> diff --git a/modules/freetype2/docs/reference/ft2-properties.html b/modules/freetype2/docs/reference/ft2-properties.html index abf5b10aba3c..60f067a19630 100644 --- a/modules/freetype2/docs/reference/ft2-properties.html +++ b/modules/freetype2/docs/reference/ft2-properties.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="properties">Driver properties</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-quick_advance.html b/modules/freetype2/docs/reference/ft2-quick_advance.html index e62710a940b9..dafefcf5ba8f 100644 --- a/modules/freetype2/docs/reference/ft2-quick_advance.html +++ b/modules/freetype2/docs/reference/ft2-quick_advance.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="quick_advance">Quick retrieval of advance values</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-raster.html b/modules/freetype2/docs/reference/ft2-raster.html index 172fe351e27e..db8e8a39552c 100644 --- a/modules/freetype2/docs/reference/ft2-raster.html +++ b/modules/freetype2/docs/reference/ft2-raster.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="raster">Scanline Converter</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-sfnt_names.html b/modules/freetype2/docs/reference/ft2-sfnt_names.html index 1b1b0cf56a9f..2d3d5533773c 100644 --- a/modules/freetype2/docs/reference/ft2-sfnt_names.html +++ b/modules/freetype2/docs/reference/ft2-sfnt_names.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="sfnt_names">SFNT Names</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-sizes_management.html b/modules/freetype2/docs/reference/ft2-sizes_management.html index fc5d28afd2ec..1e4daf9e2a75 100644 --- a/modules/freetype2/docs/reference/ft2-sizes_management.html +++ b/modules/freetype2/docs/reference/ft2-sizes_management.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="sizes_management">Size Management</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-system_interface.html b/modules/freetype2/docs/reference/ft2-system_interface.html index bbd2e1935e9e..b9162306ca01 100644 --- a/modules/freetype2/docs/reference/ft2-system_interface.html +++ b/modules/freetype2/docs/reference/ft2-system_interface.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="system_interface">System Interface</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-t1_cid_driver.html b/modules/freetype2/docs/reference/ft2-t1_cid_driver.html index a9a3fffd474b..a255eeb4883b 100644 --- a/modules/freetype2/docs/reference/ft2-t1_cid_driver.html +++ b/modules/freetype2/docs/reference/ft2-t1_cid_driver.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="t1_cid_driver">The Type 1 and CID drivers</h1> diff --git a/modules/freetype2/docs/reference/ft2-toc.html b/modules/freetype2/docs/reference/ft2-toc.html index b169b3169cda..c803ca1de9d6 100644 --- a/modules/freetype2/docs/reference/ft2-toc.html +++ b/modules/freetype2/docs/reference/ft2-toc.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1>Table of Contents</h1> <div class="section"> @@ -289,5 +289,5 @@ <hr> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td></tr></table> -<div class="timestamp">generated on Mon Jan 8 12:30:20 2018</div></body> +<div class="timestamp">generated on Tue May 1 23:34:43 2018</div></body> </html> diff --git a/modules/freetype2/docs/reference/ft2-truetype_engine.html b/modules/freetype2/docs/reference/ft2-truetype_engine.html index 1a6d26cd637c..4ad43f4546d2 100644 --- a/modules/freetype2/docs/reference/ft2-truetype_engine.html +++ b/modules/freetype2/docs/reference/ft2-truetype_engine.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="truetype_engine">The TrueType Engine</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-truetype_tables.html b/modules/freetype2/docs/reference/ft2-truetype_tables.html index c3d2caaf1d3d..9cddc35c99cc 100644 --- a/modules/freetype2/docs/reference/ft2-truetype_tables.html +++ b/modules/freetype2/docs/reference/ft2-truetype_tables.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="truetype_tables">TrueType Tables</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-tt_driver.html b/modules/freetype2/docs/reference/ft2-tt_driver.html index f9f371abc6dd..cc8008ddf754 100644 --- a/modules/freetype2/docs/reference/ft2-tt_driver.html +++ b/modules/freetype2/docs/reference/ft2-tt_driver.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="tt_driver">The TrueType driver</h1> diff --git a/modules/freetype2/docs/reference/ft2-type1_tables.html b/modules/freetype2/docs/reference/ft2-type1_tables.html index dda179c6c40b..b5c9c418a669 100644 --- a/modules/freetype2/docs/reference/ft2-type1_tables.html +++ b/modules/freetype2/docs/reference/ft2-type1_tables.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="type1_tables">Type 1 Tables</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/docs/reference/ft2-user_allocation.html b/modules/freetype2/docs/reference/ft2-user_allocation.html index 30cd264484ce..449bc0b32cfa 100644 --- a/modules/freetype2/docs/reference/ft2-user_allocation.html +++ b/modules/freetype2/docs/reference/ft2-user_allocation.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="user_allocation">User allocation</h1> diff --git a/modules/freetype2/docs/reference/ft2-version.html b/modules/freetype2/docs/reference/ft2-version.html index d2926fb7b97a..a3ab9a7c4068 100644 --- a/modules/freetype2/docs/reference/ft2-version.html +++ b/modules/freetype2/docs/reference/ft2-version.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="version">FreeType Version</h1> <h2>Synopsis</h2> @@ -223,7 +223,7 @@ <pre> #define <a href="ft2-version.html#FREETYPE_MAJOR">FREETYPE_MAJOR</a> 2 #define <a href="ft2-version.html#FREETYPE_MINOR">FREETYPE_MINOR</a> 9 -#define <a href="ft2-version.html#FREETYPE_PATCH">FREETYPE_PATCH</a> 0 +#define <a href="ft2-version.html#FREETYPE_PATCH">FREETYPE_PATCH</a> 1 </pre> <p>These three macros identify the FreeType source code version. Use <a href="ft2-version.html#FT_Library_Version">FT_Library_Version</a> to access them at runtime.</p> diff --git a/modules/freetype2/docs/reference/ft2-winfnt_fonts.html b/modules/freetype2/docs/reference/ft2-winfnt_fonts.html index f058df8a3a5e..26ffb1cf837e 100644 --- a/modules/freetype2/docs/reference/ft2-winfnt_fonts.html +++ b/modules/freetype2/docs/reference/ft2-winfnt_fonts.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.9 API Reference</title> +<title>FreeType-2.9.1 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,7 +100,7 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.9 API Reference</h1> +<h1>FreeType-2.9.1 API Reference</h1> <h1 id="winfnt_fonts">Window FNT Files</h1> <h2>Synopsis</h2> diff --git a/modules/freetype2/include/freetype/config/ftconfig.h b/modules/freetype2/include/freetype/config/ftconfig.h index f539e9a17a70..eedebf4082ee 100644 --- a/modules/freetype2/include/freetype/config/ftconfig.h +++ b/modules/freetype2/include/freetype/config/ftconfig.h @@ -422,9 +422,9 @@ FT_BEGIN_HEADER #endif /* !FT_BASE_DEF */ - /* When compiling FreeType as a DLL, some systems/compilers need a */ - /* special attribute in front OR after the return type of function */ - /* declarations. */ + /* When compiling FreeType as a DLL or DSO with hidden visibility */ + /* some systems/compilers need a special attribute in front OR after */ + /* the return type of function declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ @@ -455,19 +455,28 @@ FT_BEGIN_HEADER /* */ #ifndef FT_EXPORT -#ifdef __cplusplus +#ifdef FT2_BUILD_LIBRARY + +#if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) ) +#define FT_EXPORT( x ) __declspec( dllexport ) x +#elif defined( __GNUC__ ) && __GNUC__ >= 4 +#define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x +#elif defined( __cplusplus ) #define FT_EXPORT( x ) extern "C" x #else #define FT_EXPORT( x ) extern x #endif -#ifdef _MSC_VER -#undef FT_EXPORT -#ifdef _DLL -#define FT_EXPORT( x ) __declspec( dllexport ) x #else + +#if defined( FT2_DLLIMPORT ) #define FT_EXPORT( x ) __declspec( dllimport ) x +#elif defined( __cplusplus ) +#define FT_EXPORT( x ) extern "C" x +#else +#define FT_EXPORT( x ) extern x #endif + #endif #endif /* !FT_EXPORT */ diff --git a/modules/freetype2/include/freetype/config/ftoption.h b/modules/freetype2/include/freetype/config/ftoption.h index a5cb7fff2352..4bcab2af5c81 100644 --- a/modules/freetype2/include/freetype/config/ftoption.h +++ b/modules/freetype2/include/freetype/config/ftoption.h @@ -82,6 +82,10 @@ FT_BEGIN_HEADER /* to control the various font drivers and modules. The controllable */ /* properties are listed in the section @properties. */ /* */ + /* You have to undefine this configuration option on platforms that lack */ + /* the concept of environment variables (and thus don't have the */ + /* `getenv' function), for example Windows CE. */ + /* */ /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ /* multiple lines for better readability). */ /* */ diff --git a/modules/freetype2/include/freetype/freetype.h b/modules/freetype2/include/freetype/freetype.h index eda95e2abe4b..96644046e456 100644 --- a/modules/freetype2/include/freetype/freetype.h +++ b/modules/freetype2/include/freetype/freetype.h @@ -724,11 +724,12 @@ FT_BEGIN_HEADER /* Same as FT_ENCODING_JOHAB. Deprecated. */ /* */ /* <Note> */ - /* By default, FreeType automatically synthesizes a Unicode charmap */ - /* for PostScript fonts, using their glyph name dictionaries. */ - /* However, it also reports the encodings defined explicitly in the */ - /* font file, for the cases when they are needed, with the Adobe */ - /* values as well. */ + /* By default, FreeType enables a Unicode charmap and tags it with */ + /* FT_ENCODING_UNICODE when it is either provided or can be generated */ + /* from PostScript glyph name dictionaries in the font file. */ + /* All other encodings are considered legacy and tagged only if */ + /* explicitly defined in the font file. Otherwise, FT_ENCODING_NONE */ + /* is used. */ /* */ /* FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap */ /* is neither Unicode nor ISO-8859-1 (otherwise it is set to */ @@ -1175,7 +1176,7 @@ FT_BEGIN_HEADER /* interpolating between them. Supported formats are Adobe MM, */ /* TrueType GX, and OpenType variation fonts. */ /* */ - /* See the multiple-masters specific API for details. */ + /* See section @multiple_masters for API details. */ /* */ /* FT_FACE_FLAG_GLYPH_NAMES :: */ /* The face contains glyph names, which can be retrieved using */ @@ -2062,8 +2063,8 @@ FT_BEGIN_HEADER /* data :: A pointer to the parameter data. */ /* */ /* <Note> */ - /* The ID and function of parameters are driver-specific. See the */ - /* various FT_PARAM_TAG_XXX flags for more information. */ + /* The ID and function of parameters are driver-specific. See */ + /* section @parameter_tags for more information. */ /* */ typedef struct FT_Parameter_ { @@ -2833,6 +2834,10 @@ FT_BEGIN_HEADER /* since its glyph indices are not listed in any of the font's */ /* charmaps. */ /* */ + /* If no active cmap is set up (i.e., `face->charmap' is zero), the */ + /* call to @FT_Get_Char_Index is omitted, and the function behaves */ + /* identically to @FT_Load_Glyph. */ + /* */ FT_EXPORT( FT_Error ) FT_Load_Char( FT_Face face, FT_ULong char_code, @@ -3065,7 +3070,7 @@ FT_BEGIN_HEADER * * Advance widths are rounded to integer values; however, using the * `lsb_delta' and `rsb_delta' fields of @FT_GlyphSlotRec, it is - * possible to get fractional advance widths for sub-pixel positioning + * possible to get fractional advance widths for subpixel positioning * (which is recommended to use). * * If configuration option AF_CONFIG_OPTION_TT_SIZE_METRICS is active, @@ -3204,13 +3209,13 @@ FT_BEGIN_HEADER /* opacity). */ /* */ /* FT_RENDER_MODE_LCD :: */ - /* This mode corresponds to horizontal RGB and BGR sub-pixel */ + /* This mode corresponds to horizontal RGB and BGR subpixel */ /* displays like LCD screens. It produces 8-bit bitmaps that are */ /* 3~times the width of the original glyph outline in pixels, and */ /* which use the @FT_PIXEL_MODE_LCD mode. */ /* */ /* FT_RENDER_MODE_LCD_V :: */ - /* This mode corresponds to vertical RGB and BGR sub-pixel displays */ + /* This mode corresponds to vertical RGB and BGR subpixel displays */ /* (like PDA screens, rotated LCD displays, etc.). It produces */ /* 8-bit bitmaps that are 3~times the height of the original */ /* glyph outline in pixels and use the @FT_PIXEL_MODE_LCD_V mode. */ @@ -4552,7 +4557,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 9 -#define FREETYPE_PATCH 0 +#define FREETYPE_PATCH 1 /*************************************************************************/ diff --git a/modules/freetype2/include/freetype/ftdriver.h b/modules/freetype2/include/freetype/ftdriver.h index 02d104dc3ce5..e90475b2af30 100644 --- a/modules/freetype2/include/freetype/ftdriver.h +++ b/modules/freetype2/include/freetype/ftdriver.h @@ -111,9 +111,9 @@ FT_BEGIN_HEADER * * One of the reasons to not hint horizontally is antialiasing for LCD * screens: The pixel geometry of modern displays supplies three - * vertical sub-pixels as the eye moves horizontally across each visible + * vertical subpixels as the eye moves horizontally across each visible * pixel. On devices where we can be certain this characteristic is - * present a rasterizer can take advantage of the sub-pixels to add + * present a rasterizer can take advantage of the subpixels to add * increments of weight. In Western writing systems this turns out to * be the more critical direction anyway; the weights and spacing of * vertical stems (see above) are central to Armenian, Cyrillic, Greek, diff --git a/modules/freetype2/include/freetype/ftgasp.h b/modules/freetype2/include/freetype/ftgasp.h index 9b54fc86a085..fc1248ff4896 100644 --- a/modules/freetype2/include/freetype/ftgasp.h +++ b/modules/freetype2/include/freetype/ftgasp.h @@ -29,6 +29,9 @@ #endif +FT_BEGIN_HEADER + + /*************************************************************************** * * @section: @@ -131,6 +134,8 @@ /* */ +FT_END_HEADER + #endif /* FTGASP_H_ */ diff --git a/modules/freetype2/include/freetype/ftpfr.h b/modules/freetype2/include/freetype/ftpfr.h index ce60eb4a8add..a69cc482dc11 100644 --- a/modules/freetype2/include/freetype/ftpfr.h +++ b/modules/freetype2/include/freetype/ftpfr.h @@ -71,7 +71,7 @@ FT_BEGIN_HEADER * * ametrics_x_scale :: * A 16.16 fixed-point number used to scale distance expressed - * in metrics units to device sub-pixels. This is equivalent to + * in metrics units to device subpixels. This is equivalent to * `face->size->x_scale', but for metrics only. Optional (parameter * can be NULL). * @@ -123,7 +123,7 @@ FT_BEGIN_HEADER * mode, which always returns distances converted to outline units. * * You can use the value of the `x_scale' and `y_scale' parameters - * returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels. + * returned by @FT_Get_PFR_Metrics to scale these to device subpixels. */ FT_EXPORT( FT_Error ) FT_Get_PFR_Kerning( FT_Face face, @@ -154,7 +154,7 @@ FT_BEGIN_HEADER * * @note: * You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics - * to convert the advance to device sub-pixels (i.e., 1/64th of pixels). + * to convert the advance to device subpixels (i.e., 1/64th of pixels). */ FT_EXPORT( FT_Error ) FT_Get_PFR_Advance( FT_Face face, diff --git a/modules/freetype2/include/freetype/internal/ftobjs.h b/modules/freetype2/include/freetype/internal/ftobjs.h index 37c6baffe6fe..1c3c6ad45634 100644 --- a/modules/freetype2/include/freetype/internal/ftobjs.h +++ b/modules/freetype2/include/freetype/internal/ftobjs.h @@ -155,7 +155,7 @@ FT_BEGIN_HEADER } FT_CMapRec; - /* typecase any pointer to a charmap handle */ + /* typecast any pointer to a charmap handle */ #define FT_CMAP( x ) ( (FT_CMap)( x ) ) /* obvious macros */ diff --git a/modules/freetype2/modules.cfg b/modules/freetype2/modules.cfg index 6ce0f3edbe26..4bf344524c56 100644 --- a/modules/freetype2/modules.cfg +++ b/modules/freetype2/modules.cfg @@ -66,7 +66,7 @@ FONT_MODULES += type42 # No FT_CONFIG_OPTION_PIC support. FONT_MODULES += winfonts -# PCF font driver. +# PCF font driver. If debugging and tracing is enabled, needs `ftbitmap.c'. # No FT_CONFIG_OPTION_PIC support. FONT_MODULES += pcf @@ -113,11 +113,11 @@ RASTER_MODULES += smooth # FreeType's cache sub-system (quite stable but still in beta -- this means # that its public API is subject to change if necessary). See -# include/freetype/ftcache.h. Needs ftglyph.c. +# include/freetype/ftcache.h. Needs `ftglyph.c'. # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += cache -# TrueType GX/AAT table validation. Needs ftgxval.c below. +# TrueType GX/AAT table validation. Needs `ftgxval.c' below. # # No FT_CONFIG_OPTION_PIC support. # AUX_MODULES += gxvalid @@ -140,7 +140,7 @@ AUX_MODULES += lzw # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += bzip2 -# OpenType table validation. Needs ftotval.c below. +# OpenType table validation. Needs `ftotval.c' below. # # No FT_CONFIG_OPTION_PIC support. # AUX_MODULES += otvalid @@ -183,12 +183,7 @@ BASE_EXTENSIONS += ftbitmap.c # See include/freetype/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c -# Support functions for font formats. -# -# See include/freetype/ftfntfmt.h for the API. -BASE_EXTENSIONS += ftfntfmt.c - -# Access FSType information. Needs fttype1.c. +# Access FSType information. Needs `fttype1.c'. # # See include/freetype/freetype.h for the API. BASE_EXTENSIONS += ftfstype.c @@ -198,7 +193,7 @@ BASE_EXTENSIONS += ftfstype.c # See include/freetype/ftgasp.h for the API. BASE_EXTENSIONS += ftgasp.c -# Convenience functions to handle glyphs. Needs ftbitmap.c. +# Convenience functions to handle glyphs. Needs `ftbitmap.c'. # # See include/freetype/ftglyph.h for the API. BASE_EXTENSIONS += ftglyph.c @@ -208,11 +203,6 @@ BASE_EXTENSIONS += ftglyph.c # See include/freetype/ftgxval.h for the API. BASE_EXTENSIONS += ftgxval.c -# Support for LCD color filtering of subpixel bitmaps. -# -# See include/freetype/ftlcdfil.h for the API. -BASE_EXTENSIONS += ftlcdfil.c - # Multiple Master font interface. # # See include/freetype/ftmm.h for the API. @@ -233,12 +223,13 @@ BASE_EXTENSIONS += ftpatent.c # See include/freetype/ftpfr.h for the API. BASE_EXTENSIONS += ftpfr.c -# Path stroker. Needs ftglyph.c. +# Path stroker. Needs `ftglyph.c'. # # See include/freetype/ftstroke.h for the API. BASE_EXTENSIONS += ftstroke.c -# Support for synthetic emboldening and slanting of fonts. Needs ftbitmap.c. +# Support for synthetic emboldening and slanting of fonts. Needs +# `ftbitmap.c'. # # See include/freetype/ftsynth.h for the API. BASE_EXTENSIONS += ftsynth.c diff --git a/modules/freetype2/moz.build b/modules/freetype2/moz.build index 925691b51fb9..5917b43dc8a6 100644 --- a/modules/freetype2/moz.build +++ b/modules/freetype2/moz.build @@ -65,12 +65,10 @@ SOURCES += [ 'src/base/ftbdf.c', # Access BDF-specific strings. 'src/base/ftbitmap.c', # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into 8bpp format, and for emboldening of bitmap glyphs. 'src/base/ftcid.c', # Access CID font information. - 'src/base/ftfntfmt.c', # Support functions for font formats. 'src/base/ftfstype.c', # Access FSType information. 'src/base/ftgasp.c', # Support for GASP table queries. 'src/base/ftglyph.c', # Convenience functions to handle glyphs. 'src/base/ftgxval.c', # Interface for gxvalid module. - 'src/base/ftlcdfil.c', # Support for LCD color filtering of subpixel bitmaps. 'src/base/ftmm.c', # Multiple Master font interface. 'src/base/ftotval.c', # Interface for otvalid module. 'src/base/ftpatent.c', # Support for FT_Face_CheckTrueTypePatents. diff --git a/modules/freetype2/src/autofit/afblue.c b/modules/freetype2/src/autofit/afblue.c index 61ab7957f0ce..e4078fd04443 100644 --- a/modules/freetype2/src/autofit/afblue.c +++ b/modules/freetype2/src/autofit/afblue.c @@ -166,6 +166,10 @@ '\0', '\xE2', '\xB4', '\x84', ' ', '\xE2', '\xB4', '\x85', ' ', '\xE2', '\xB4', '\x94', ' ', '\xE2', '\xB4', '\x95', ' ', '\xE2', '\xB4', '\x81', ' ', '\xE2', '\xB4', '\x82', ' ', '\xE2', '\xB4', '\x98', ' ', '\xE2', '\xB4', '\x9D', /* âŽ âŽ âŽ âŽ âŽ âŽ âŽ âŽ */ '\0', + '\xE1', '\xB2', '\x9C', ' ', '\xE1', '\xB2', '\x9F', ' ', '\xE1', '\xB2', '\xB3', ' ', '\xE1', '\xB2', '\xB8', ' ', '\xE1', '\xB2', '\x92', ' ', '\xE1', '\xB2', '\x94', ' ', '\xE1', '\xB2', '\x9D', ' ', '\xE1', '\xB2', '\xB4', /* á² á² á²³ á²ž á² á² á² á²Ž */ + '\0', + '\xE1', '\xB2', '\x98', ' ', '\xE1', '\xB2', '\xB2', ' ', '\xE1', '\xB2', '\x9D', ' ', '\xE1', '\xB2', '\xA9', ' ', '\xE1', '\xB2', '\x9B', ' ', '\xE1', '\xB2', '\xA8', ' ', '\xE1', '\xB2', '\xAF', ' ', '\xE1', '\xB2', '\xBD', /* á² á²² á² á²© á² á²š á²¯ á²œ */ + '\0', '\xE2', '\xB0', '\x85', ' ', '\xE2', '\xB0', '\x94', ' ', '\xE2', '\xB0', '\xAA', ' ', '\xE2', '\xB0', '\x84', ' ', '\xE2', '\xB0', '\x82', ' ', '\xE2', '\xB0', '\x8A', ' ', '\xE2', '\xB0', '\xAB', ' ', '\xE2', '\xB0', '\x8B', /* â° â° â°ª â° â° â° â°« â° */ '\0', '\xE2', '\xB0', '\x85', ' ', '\xE2', '\xB0', '\x84', ' ', '\xE2', '\xB0', '\x82', ' ', '\xE2', '\xB0', '\xAA', ' ', '\xE2', '\xB0', '\x9E', ' ', '\xE2', '\xB0', '\xA1', ' ', '\xE2', '\xB0', '\x8A', ' ', '\xE2', '\xB0', '\x94', /* â° â° â° â°ª â° â°¡ â° â° */ @@ -539,6 +543,8 @@ { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM, 0 }, { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER, 0 }, + { AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM, 0 }, { AF_BLUE_STRING_MAX, 0 }, { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM, 0 }, diff --git a/modules/freetype2/src/autofit/afblue.dat b/modules/freetype2/src/autofit/afblue.dat index d3cc4284b87e..bc2f0d27540a 100644 --- a/modules/freetype2/src/autofit/afblue.dat +++ b/modules/freetype2/src/autofit/afblue.dat @@ -242,6 +242,11 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER "âŽ âŽ âŽ âŽ âŽ âŽ âŽ âŽ" + AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP + "á² á² á²³ á²ž á² á² á² á²Ž" + AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM + "á² á²² á² á²© á² á²š á²¯ á²œ" + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP "â° â° â°ª â° â° â° â°« â°" AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM @@ -795,13 +800,14 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN: { AF_BLUE_STRING_ETHIOPIC_BOTTOM, 0 } { AF_BLUE_STRING_MAX, 0 } - // blue zones for Mtavruli are missing (not yet defined in Unicode) AF_BLUE_STRINGSET_GEOR { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP, AF_BLUE_PROPERTY_LATIN_TOP | AF_BLUE_PROPERTY_LATIN_X_HEIGHT } { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM, 0 } { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP } { AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER, 0 } + { AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM, 0 } { AF_BLUE_STRING_MAX, 0 } AF_BLUE_STRINGSET_GEOK diff --git a/modules/freetype2/src/autofit/afblue.h b/modules/freetype2/src/autofit/afblue.h index 56b591aa8df6..de31e259c3bf 100644 --- a/modules/freetype2/src/autofit/afblue.h +++ b/modules/freetype2/src/autofit/afblue.h @@ -147,119 +147,121 @@ FT_BEGIN_HEADER AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1813, AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1845, AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1877, - AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1909, - AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1941, - AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1973, - AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 2005, - AF_BLUE_STRING_GOTHIC_TOP = 2037, - AF_BLUE_STRING_GOTHIC_BOTTOM = 2077, - AF_BLUE_STRING_GREEK_CAPITAL_TOP = 2097, - AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 2118, - AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 2136, - AF_BLUE_STRING_GREEK_SMALL = 2154, - AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 2178, - AF_BLUE_STRING_GUJARATI_TOP = 2202, - AF_BLUE_STRING_GUJARATI_BOTTOM = 2234, - AF_BLUE_STRING_GUJARATI_ASCENDER = 2266, - AF_BLUE_STRING_GUJARATI_DESCENDER = 2316, - AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 2349, - AF_BLUE_STRING_GURMUKHI_BASE = 2369, - AF_BLUE_STRING_GURMUKHI_HEAD = 2401, - AF_BLUE_STRING_GURMUKHI_TOP = 2433, - AF_BLUE_STRING_GURMUKHI_BOTTOM = 2465, - AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2497, - AF_BLUE_STRING_HEBREW_TOP = 2517, - AF_BLUE_STRING_HEBREW_BOTTOM = 2541, - AF_BLUE_STRING_HEBREW_DESCENDER = 2559, - AF_BLUE_STRING_KANNADA_TOP = 2574, - AF_BLUE_STRING_KANNADA_BOTTOM = 2618, - AF_BLUE_STRING_KAYAH_LI_TOP = 2650, - AF_BLUE_STRING_KAYAH_LI_BOTTOM = 2674, - AF_BLUE_STRING_KAYAH_LI_ASCENDER = 2694, - AF_BLUE_STRING_KAYAH_LI_DESCENDER = 2702, - AF_BLUE_STRING_KAYAH_LI_LARGE_DESCENDER = 2714, - AF_BLUE_STRING_KHMER_TOP = 2735, - AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2759, - AF_BLUE_STRING_KHMER_BOTTOM = 2799, - AF_BLUE_STRING_KHMER_DESCENDER = 2831, - AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2865, - AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2952, - AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2960, - AF_BLUE_STRING_LAO_TOP = 2968, - AF_BLUE_STRING_LAO_BOTTOM = 3000, - AF_BLUE_STRING_LAO_ASCENDER = 3032, - AF_BLUE_STRING_LAO_LARGE_ASCENDER = 3048, - AF_BLUE_STRING_LAO_DESCENDER = 3060, - AF_BLUE_STRING_LATIN_CAPITAL_TOP = 3084, - AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 3100, - AF_BLUE_STRING_LATIN_SMALL_F_TOP = 3116, - AF_BLUE_STRING_LATIN_SMALL_TOP = 3130, - AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 3146, - AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 3162, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 3172, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 3192, - AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 3212, - AF_BLUE_STRING_LATIN_SUBS_SMALL = 3232, - AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 3268, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 3288, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 3319, - AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 3348, - AF_BLUE_STRING_LATIN_SUPS_SMALL = 3374, - AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 3399, - AF_BLUE_STRING_LISU_TOP = 3410, - AF_BLUE_STRING_LISU_BOTTOM = 3442, - AF_BLUE_STRING_MALAYALAM_TOP = 3474, - AF_BLUE_STRING_MALAYALAM_BOTTOM = 3518, - AF_BLUE_STRING_MYANMAR_TOP = 3550, - AF_BLUE_STRING_MYANMAR_BOTTOM = 3582, - AF_BLUE_STRING_MYANMAR_ASCENDER = 3614, - AF_BLUE_STRING_MYANMAR_DESCENDER = 3642, - AF_BLUE_STRING_NKO_TOP = 3674, - AF_BLUE_STRING_NKO_BOTTOM = 3698, - AF_BLUE_STRING_NKO_SMALL_TOP = 3713, - AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3722, - AF_BLUE_STRING_OL_CHIKI = 3734, - AF_BLUE_STRING_OLD_TURKIC_TOP = 3758, - AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3773, - AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3793, - AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3833, - AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3863, - AF_BLUE_STRING_OSAGE_SMALL_TOP = 3878, - AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3918, - AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3958, - AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3983, - AF_BLUE_STRING_OSMANYA_TOP = 3998, - AF_BLUE_STRING_OSMANYA_BOTTOM = 4038, - AF_BLUE_STRING_SAURASHTRA_TOP = 4078, - AF_BLUE_STRING_SAURASHTRA_BOTTOM = 4110, - AF_BLUE_STRING_SHAVIAN_TOP = 4130, - AF_BLUE_STRING_SHAVIAN_BOTTOM = 4140, - AF_BLUE_STRING_SHAVIAN_DESCENDER = 4165, - AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 4175, - AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4210, - AF_BLUE_STRING_SINHALA_TOP = 4225, - AF_BLUE_STRING_SINHALA_BOTTOM = 4257, - AF_BLUE_STRING_SINHALA_DESCENDER = 4289, - AF_BLUE_STRING_SUNDANESE_TOP = 4333, - AF_BLUE_STRING_SUNDANESE_BOTTOM = 4357, - AF_BLUE_STRING_SUNDANESE_DESCENDER = 4389, - AF_BLUE_STRING_TAI_VIET_TOP = 4397, - AF_BLUE_STRING_TAI_VIET_BOTTOM = 4417, - AF_BLUE_STRING_TAMIL_TOP = 4429, - AF_BLUE_STRING_TAMIL_BOTTOM = 4461, - AF_BLUE_STRING_TELUGU_TOP = 4493, - AF_BLUE_STRING_TELUGU_BOTTOM = 4521, - AF_BLUE_STRING_THAI_TOP = 4549, - AF_BLUE_STRING_THAI_BOTTOM = 4573, - AF_BLUE_STRING_THAI_ASCENDER = 4601, - AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4613, - AF_BLUE_STRING_THAI_DESCENDER = 4625, - AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4641, - AF_BLUE_STRING_THAI_DIGIT_TOP = 4649, - AF_BLUE_STRING_TIFINAGH = 4661, - AF_BLUE_STRING_VAI_TOP = 4693, - AF_BLUE_STRING_VAI_BOTTOM = 4725, - af_blue_1_1 = 4756, + AF_BLUE_STRING_GEORGIAN_MTAVRULI_TOP = 1909, + AF_BLUE_STRING_GEORGIAN_MTAVRULI_BOTTOM = 1941, + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1973, + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 2005, + AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 2037, + AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 2069, + AF_BLUE_STRING_GOTHIC_TOP = 2101, + AF_BLUE_STRING_GOTHIC_BOTTOM = 2141, + AF_BLUE_STRING_GREEK_CAPITAL_TOP = 2161, + AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 2182, + AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 2200, + AF_BLUE_STRING_GREEK_SMALL = 2218, + AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 2242, + AF_BLUE_STRING_GUJARATI_TOP = 2266, + AF_BLUE_STRING_GUJARATI_BOTTOM = 2298, + AF_BLUE_STRING_GUJARATI_ASCENDER = 2330, + AF_BLUE_STRING_GUJARATI_DESCENDER = 2380, + AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 2413, + AF_BLUE_STRING_GURMUKHI_BASE = 2433, + AF_BLUE_STRING_GURMUKHI_HEAD = 2465, + AF_BLUE_STRING_GURMUKHI_TOP = 2497, + AF_BLUE_STRING_GURMUKHI_BOTTOM = 2529, + AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2561, + AF_BLUE_STRING_HEBREW_TOP = 2581, + AF_BLUE_STRING_HEBREW_BOTTOM = 2605, + AF_BLUE_STRING_HEBREW_DESCENDER = 2623, + AF_BLUE_STRING_KANNADA_TOP = 2638, + AF_BLUE_STRING_KANNADA_BOTTOM = 2682, + AF_BLUE_STRING_KAYAH_LI_TOP = 2714, + AF_BLUE_STRING_KAYAH_LI_BOTTOM = 2738, + AF_BLUE_STRING_KAYAH_LI_ASCENDER = 2758, + AF_BLUE_STRING_KAYAH_LI_DESCENDER = 2766, + AF_BLUE_STRING_KAYAH_LI_LARGE_DESCENDER = 2778, + AF_BLUE_STRING_KHMER_TOP = 2799, + AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2823, + AF_BLUE_STRING_KHMER_BOTTOM = 2863, + AF_BLUE_STRING_KHMER_DESCENDER = 2895, + AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2929, + AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 3016, + AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 3024, + AF_BLUE_STRING_LAO_TOP = 3032, + AF_BLUE_STRING_LAO_BOTTOM = 3064, + AF_BLUE_STRING_LAO_ASCENDER = 3096, + AF_BLUE_STRING_LAO_LARGE_ASCENDER = 3112, + AF_BLUE_STRING_LAO_DESCENDER = 3124, + AF_BLUE_STRING_LATIN_CAPITAL_TOP = 3148, + AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 3164, + AF_BLUE_STRING_LATIN_SMALL_F_TOP = 3180, + AF_BLUE_STRING_LATIN_SMALL_TOP = 3194, + AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 3210, + AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 3226, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 3236, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 3256, + AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 3276, + AF_BLUE_STRING_LATIN_SUBS_SMALL = 3296, + AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 3332, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 3352, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 3383, + AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 3412, + AF_BLUE_STRING_LATIN_SUPS_SMALL = 3438, + AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 3463, + AF_BLUE_STRING_LISU_TOP = 3474, + AF_BLUE_STRING_LISU_BOTTOM = 3506, + AF_BLUE_STRING_MALAYALAM_TOP = 3538, + AF_BLUE_STRING_MALAYALAM_BOTTOM = 3582, + AF_BLUE_STRING_MYANMAR_TOP = 3614, + AF_BLUE_STRING_MYANMAR_BOTTOM = 3646, + AF_BLUE_STRING_MYANMAR_ASCENDER = 3678, + AF_BLUE_STRING_MYANMAR_DESCENDER = 3706, + AF_BLUE_STRING_NKO_TOP = 3738, + AF_BLUE_STRING_NKO_BOTTOM = 3762, + AF_BLUE_STRING_NKO_SMALL_TOP = 3777, + AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3786, + AF_BLUE_STRING_OL_CHIKI = 3798, + AF_BLUE_STRING_OLD_TURKIC_TOP = 3822, + AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3837, + AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3857, + AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3897, + AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3927, + AF_BLUE_STRING_OSAGE_SMALL_TOP = 3942, + AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3982, + AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 4022, + AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 4047, + AF_BLUE_STRING_OSMANYA_TOP = 4062, + AF_BLUE_STRING_OSMANYA_BOTTOM = 4102, + AF_BLUE_STRING_SAURASHTRA_TOP = 4142, + AF_BLUE_STRING_SAURASHTRA_BOTTOM = 4174, + AF_BLUE_STRING_SHAVIAN_TOP = 4194, + AF_BLUE_STRING_SHAVIAN_BOTTOM = 4204, + AF_BLUE_STRING_SHAVIAN_DESCENDER = 4229, + AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 4239, + AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4274, + AF_BLUE_STRING_SINHALA_TOP = 4289, + AF_BLUE_STRING_SINHALA_BOTTOM = 4321, + AF_BLUE_STRING_SINHALA_DESCENDER = 4353, + AF_BLUE_STRING_SUNDANESE_TOP = 4397, + AF_BLUE_STRING_SUNDANESE_BOTTOM = 4421, + AF_BLUE_STRING_SUNDANESE_DESCENDER = 4453, + AF_BLUE_STRING_TAI_VIET_TOP = 4461, + AF_BLUE_STRING_TAI_VIET_BOTTOM = 4481, + AF_BLUE_STRING_TAMIL_TOP = 4493, + AF_BLUE_STRING_TAMIL_BOTTOM = 4525, + AF_BLUE_STRING_TELUGU_TOP = 4557, + AF_BLUE_STRING_TELUGU_BOTTOM = 4585, + AF_BLUE_STRING_THAI_TOP = 4613, + AF_BLUE_STRING_THAI_BOTTOM = 4637, + AF_BLUE_STRING_THAI_ASCENDER = 4665, + AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4677, + AF_BLUE_STRING_THAI_DESCENDER = 4689, + AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4705, + AF_BLUE_STRING_THAI_DIGIT_TOP = 4713, + AF_BLUE_STRING_TIFINAGH = 4725, + AF_BLUE_STRING_VAI_TOP = 4757, + AF_BLUE_STRING_VAI_BOTTOM = 4789, + af_blue_1_1 = 4820, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1, AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203, @@ -336,41 +338,41 @@ FT_BEGIN_HEADER AF_BLUE_STRINGSET_DSRT = 75, AF_BLUE_STRINGSET_ETHI = 80, AF_BLUE_STRINGSET_GEOR = 83, - AF_BLUE_STRINGSET_GEOK = 88, - AF_BLUE_STRINGSET_GLAG = 95, - AF_BLUE_STRINGSET_GOTH = 100, - AF_BLUE_STRINGSET_GREK = 103, - AF_BLUE_STRINGSET_GUJR = 110, - AF_BLUE_STRINGSET_GURU = 116, - AF_BLUE_STRINGSET_HEBR = 122, - AF_BLUE_STRINGSET_KALI = 126, - AF_BLUE_STRINGSET_KHMR = 132, - AF_BLUE_STRINGSET_KHMS = 138, - AF_BLUE_STRINGSET_KNDA = 141, - AF_BLUE_STRINGSET_LAO = 144, - AF_BLUE_STRINGSET_LATN = 150, - AF_BLUE_STRINGSET_LATB = 157, - AF_BLUE_STRINGSET_LATP = 164, - AF_BLUE_STRINGSET_LISU = 171, - AF_BLUE_STRINGSET_MLYM = 174, - AF_BLUE_STRINGSET_MYMR = 177, - AF_BLUE_STRINGSET_NKOO = 182, - AF_BLUE_STRINGSET_NONE = 187, - AF_BLUE_STRINGSET_OLCK = 188, - AF_BLUE_STRINGSET_ORKH = 191, - AF_BLUE_STRINGSET_OSGE = 194, - AF_BLUE_STRINGSET_OSMA = 202, - AF_BLUE_STRINGSET_SAUR = 205, - AF_BLUE_STRINGSET_SHAW = 208, - AF_BLUE_STRINGSET_SINH = 214, - AF_BLUE_STRINGSET_SUND = 218, - AF_BLUE_STRINGSET_TAML = 222, - AF_BLUE_STRINGSET_TAVT = 225, - AF_BLUE_STRINGSET_TELU = 228, - AF_BLUE_STRINGSET_TFNG = 231, - AF_BLUE_STRINGSET_THAI = 234, - AF_BLUE_STRINGSET_VAII = 242, - af_blue_2_1 = 245, + AF_BLUE_STRINGSET_GEOK = 90, + AF_BLUE_STRINGSET_GLAG = 97, + AF_BLUE_STRINGSET_GOTH = 102, + AF_BLUE_STRINGSET_GREK = 105, + AF_BLUE_STRINGSET_GUJR = 112, + AF_BLUE_STRINGSET_GURU = 118, + AF_BLUE_STRINGSET_HEBR = 124, + AF_BLUE_STRINGSET_KALI = 128, + AF_BLUE_STRINGSET_KHMR = 134, + AF_BLUE_STRINGSET_KHMS = 140, + AF_BLUE_STRINGSET_KNDA = 143, + AF_BLUE_STRINGSET_LAO = 146, + AF_BLUE_STRINGSET_LATN = 152, + AF_BLUE_STRINGSET_LATB = 159, + AF_BLUE_STRINGSET_LATP = 166, + AF_BLUE_STRINGSET_LISU = 173, + AF_BLUE_STRINGSET_MLYM = 176, + AF_BLUE_STRINGSET_MYMR = 179, + AF_BLUE_STRINGSET_NKOO = 184, + AF_BLUE_STRINGSET_NONE = 189, + AF_BLUE_STRINGSET_OLCK = 190, + AF_BLUE_STRINGSET_ORKH = 193, + AF_BLUE_STRINGSET_OSGE = 196, + AF_BLUE_STRINGSET_OSMA = 204, + AF_BLUE_STRINGSET_SAUR = 207, + AF_BLUE_STRINGSET_SHAW = 210, + AF_BLUE_STRINGSET_SINH = 216, + AF_BLUE_STRINGSET_SUND = 220, + AF_BLUE_STRINGSET_TAML = 224, + AF_BLUE_STRINGSET_TAVT = 227, + AF_BLUE_STRINGSET_TELU = 230, + AF_BLUE_STRINGSET_TFNG = 233, + AF_BLUE_STRINGSET_THAI = 236, + AF_BLUE_STRINGSET_VAII = 244, + af_blue_2_1 = 247, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0, af_blue_2_1_1 = af_blue_2_1 + 2, diff --git a/modules/freetype2/src/autofit/afranges.c b/modules/freetype2/src/autofit/afranges.c index 1355c5e7cc35..cf67fafb11c6 100644 --- a/modules/freetype2/src/autofit/afranges.c +++ b/modules/freetype2/src/autofit/afranges.c @@ -91,7 +91,7 @@ AF_UNIRANGE_REC( 0x06E7, 0x06E8 ), AF_UNIRANGE_REC( 0x06EA, 0x06ED ), AF_UNIRANGE_REC( 0x08D4, 0x08E1 ), - AF_UNIRANGE_REC( 0x08E3, 0x08FF ), + AF_UNIRANGE_REC( 0x08D3, 0x08FF ), AF_UNIRANGE_REC( 0xFBB2, 0xFBC1 ), AF_UNIRANGE_REC( 0xFE70, 0xFE70 ), AF_UNIRANGE_REC( 0xFE72, 0xFE72 ), @@ -163,6 +163,7 @@ AF_UNIRANGE_REC( 0x09C1, 0x09C4 ), AF_UNIRANGE_REC( 0x09CD, 0x09CD ), AF_UNIRANGE_REC( 0x09E2, 0x09E3 ), + AF_UNIRANGE_REC( 0x09FE, 0x09FE ), AF_UNIRANGE_REC( 0, 0 ) }; @@ -190,6 +191,7 @@ { AF_UNIRANGE_REC( 0x11100, 0x11102 ), AF_UNIRANGE_REC( 0x11127, 0x11134 ), + AF_UNIRANGE_REC( 0x11146, 0x11146 ), AF_UNIRANGE_REC( 0, 0 ) }; @@ -304,6 +306,7 @@ AF_UNIRANGE_REC( 0x0953, 0x0957 ), AF_UNIRANGE_REC( 0x0962, 0x0963 ), AF_UNIRANGE_REC( 0xA8E0, 0xA8F1 ), + AF_UNIRANGE_REC( 0xA8FF, 0xA8FF ), AF_UNIRANGE_REC( 0, 0 ) }; @@ -338,11 +341,8 @@ const AF_Script_UniRangeRec af_geor_uniranges[] = { - AF_UNIRANGE_REC( 0x10D0, 0x10FF ), /* Georgian (Mkhedruli) */ -#if 0 - /* the following range is proposed for inclusion in Unicode */ - AF_UNIRANGE_REC( 0x1C90, 0x1CBF ), /* Georgian (Mtavruli) */ -#endif + AF_UNIRANGE_REC( 0x10D0, 0x10FF ), /* Georgian (Mkhedruli) */ + AF_UNIRANGE_REC( 0x1C90, 0x1CBF ), /* Georgian Extended (Mtavruli) */ AF_UNIRANGE_REC( 0, 0 ) }; @@ -355,8 +355,8 @@ const AF_Script_UniRangeRec af_geok_uniranges[] = { /* Khutsuri */ - AF_UNIRANGE_REC( 0x10A0, 0x10CD ), /* Georgian (Asomtavruli) */ - AF_UNIRANGE_REC( 0x2D00, 0x2D2D ), /* Georgian (Nuskhuri) */ + AF_UNIRANGE_REC( 0x10A0, 0x10CD ), /* Georgian (Asomtavruli) */ + AF_UNIRANGE_REC( 0x2D00, 0x2D2D ), /* Georgian Supplement (Nuskhuri) */ AF_UNIRANGE_REC( 0, 0 ) }; @@ -425,6 +425,7 @@ AF_UNIRANGE_REC( 0x0AC1, 0x0AC8 ), AF_UNIRANGE_REC( 0x0ACD, 0x0ACD ), AF_UNIRANGE_REC( 0x0AE2, 0x0AE3 ), + AF_UNIRANGE_REC( 0x0AFA, 0x0AFF ), AF_UNIRANGE_REC( 0, 0 ) }; @@ -655,7 +656,8 @@ const AF_Script_UniRangeRec af_mlym_nonbase_uniranges[] = { - AF_UNIRANGE_REC( 0x0D01, 0x0D01 ), + AF_UNIRANGE_REC( 0x0D00, 0x0D01 ), + AF_UNIRANGE_REC( 0x0D3B, 0x0D3C ), AF_UNIRANGE_REC( 0x0D4D, 0x0D4E ), AF_UNIRANGE_REC( 0x0D62, 0x0D63 ), AF_UNIRANGE_REC( 0, 0 ) @@ -697,6 +699,7 @@ const AF_Script_UniRangeRec af_nkoo_nonbase_uniranges[] = { AF_UNIRANGE_REC( 0x07EB, 0x07F5 ), + AF_UNIRANGE_REC( 0x07FD, 0x07FD ), AF_UNIRANGE_REC( 0, 0 ) }; @@ -856,6 +859,7 @@ const AF_Script_UniRangeRec af_telu_nonbase_uniranges[] = { AF_UNIRANGE_REC( 0x0C00, 0x0C00 ), + AF_UNIRANGE_REC( 0x0C04, 0x0C04 ), AF_UNIRANGE_REC( 0x0C3E, 0x0C40 ), AF_UNIRANGE_REC( 0x0C46, 0x0C56 ), AF_UNIRANGE_REC( 0x0C62, 0x0C63 ), @@ -1006,10 +1010,13 @@ AF_UNIRANGE_REC( 0xFE30, 0xFE4F ), /* CJK Compatibility Forms */ AF_UNIRANGE_REC( 0xFF00, 0xFFEF ), /* Halfwidth and Fullwidth Forms */ AF_UNIRANGE_REC( 0x1B000, 0x1B0FF ), /* Kana Supplement */ + AF_UNIRANGE_REC( 0x1B100, 0x1B12F ), /* Kana Extended-A */ AF_UNIRANGE_REC( 0x1D300, 0x1D35F ), /* Tai Xuan Hing Symbols */ AF_UNIRANGE_REC( 0x20000, 0x2A6DF ), /* CJK Unified Ideographs Extension B */ AF_UNIRANGE_REC( 0x2A700, 0x2B73F ), /* CJK Unified Ideographs Extension C */ AF_UNIRANGE_REC( 0x2B740, 0x2B81F ), /* CJK Unified Ideographs Extension D */ + AF_UNIRANGE_REC( 0x2B820, 0x2CEAF ), /* CJK Unified Ideographs Extension E */ + AF_UNIRANGE_REC( 0x2CEB0, 0x2EBEF ), /* CJK Unified Ideographs Extension F */ AF_UNIRANGE_REC( 0x2F800, 0x2FA1F ), /* CJK Compatibility Ideographs Supplement */ AF_UNIRANGE_REC( 0, 0 ) }; diff --git a/modules/freetype2/src/autofit/afscript.h b/modules/freetype2/src/autofit/afscript.h index 6ac193f6a71c..623a1734a623 100644 --- a/modules/freetype2/src/autofit/afscript.h +++ b/modules/freetype2/src/autofit/afscript.h @@ -137,7 +137,7 @@ "Georgian (Mkhedruli)", HB_SCRIPT_GEORGIAN, HINTING_BOTTOM_TO_TOP, - "\xE1\x83\x98 \xE1\x83\x94 \xE1\x83\x90" ) /* á á á */ + "\xE1\x83\x98 \xE1\x83\x94 \xE1\x83\x90 \xE1\xB2\xBF" ) /* á á á á² */ SCRIPT( geok, GEOK, "Georgian (Khutsuri)", diff --git a/modules/freetype2/src/autofit/aftypes.h b/modules/freetype2/src/autofit/aftypes.h index a50013439bf8..6bd8c895b2a1 100644 --- a/modules/freetype2/src/autofit/aftypes.h +++ b/modules/freetype2/src/autofit/aftypes.h @@ -76,9 +76,9 @@ extern void* _af_debug_hints; typedef struct AF_WidthRec_ { - FT_Pos org; /* original position/width in font units */ - FT_Pos cur; /* current/scaled position/width in device sub-pixels */ - FT_Pos fit; /* current/fitted position/width in device sub-pixels */ + FT_Pos org; /* original position/width in font units */ + FT_Pos cur; /* current/scaled position/width in device subpixels */ + FT_Pos fit; /* current/fitted position/width in device subpixels */ } AF_WidthRec, *AF_Width; diff --git a/modules/freetype2/src/base/Jamfile b/modules/freetype2/src/base/Jamfile index 2b47b8a242a7..4994c1b4caac 100644 --- a/modules/freetype2/src/base/Jamfile +++ b/modules/freetype2/src/base/Jamfile @@ -21,8 +21,10 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; ftadvanc ftcalc ftdbgmem + ftfntfmt ftgloadr fthash + ftlcdfil ftobjs ftoutln ftpic @@ -51,13 +53,11 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; ftbitmap ftcid ftdebug - ftfntfmt ftfstype ftgasp ftglyph ftgxval ftinit - ftlcdfil ftmm ftotval ftpatent diff --git a/modules/freetype2/src/base/ftbase.c b/modules/freetype2/src/base/ftbase.c index a1bdbaf6eac5..f914b9b247b6 100644 --- a/modules/freetype2/src/base/ftbase.c +++ b/modules/freetype2/src/base/ftbase.c @@ -23,8 +23,10 @@ #include "ftadvanc.c" #include "ftcalc.c" #include "ftdbgmem.c" +#include "ftfntfmt.c" #include "ftgloadr.c" #include "fthash.c" +#include "ftlcdfil.c" #include "ftmac.c" #include "ftobjs.c" #include "ftoutln.c" diff --git a/modules/freetype2/src/base/ftbitmap.c b/modules/freetype2/src/base/ftbitmap.c index 93efb0944799..a9746663faa1 100644 --- a/modules/freetype2/src/base/ftbitmap.c +++ b/modules/freetype2/src/base/ftbitmap.c @@ -237,7 +237,7 @@ unsigned char* out = buffer; unsigned char* limit = bitmap->buffer + pitch * bitmap->rows; - unsigned int delta = new_pitch - pitch; + unsigned int delta = new_pitch - len; FT_MEM_ZERO( out, new_pitch * ypixels ); @@ -247,8 +247,10 @@ { FT_MEM_COPY( out, in, len ); in += pitch; - out += pitch; + out += len; + /* we use FT_QALLOC_MULT, which doesn't zero out the buffer; */ + /* consequently, we have to manually zero out the remaining bytes */ FT_MEM_ZERO( out, delta ); out += delta; } @@ -261,14 +263,14 @@ unsigned char* out = buffer; unsigned char* limit = bitmap->buffer + pitch * bitmap->rows; - unsigned int delta = new_pitch - pitch; + unsigned int delta = new_pitch - len; while ( in < limit ) { FT_MEM_COPY( out, in, len ); in += pitch; - out += pitch; + out += len; FT_MEM_ZERO( out, delta ); out += delta; diff --git a/modules/freetype2/src/base/ftlcdfil.c b/modules/freetype2/src/base/ftlcdfil.c index 5c38911a907d..8d314df0803c 100644 --- a/modules/freetype2/src/base/ftlcdfil.c +++ b/modules/freetype2/src/base/ftlcdfil.c @@ -77,7 +77,7 @@ /* take care of bitmap flow */ - if ( pitch > 0 ) + if ( pitch > 0 && height > 0 ) origin += pitch * (FT_Int)( height - 1 ); /* horizontal in-place FIR filter */ @@ -192,7 +192,7 @@ /* take care of bitmap flow */ - if ( pitch > 0 ) + if ( pitch > 0 && height > 0 ) origin += pitch * (FT_Int)( height - 1 ); /* horizontal in-place intra-pixel filter */ diff --git a/modules/freetype2/src/base/ftoutln.c b/modules/freetype2/src/base/ftoutln.c index 9c29ade92fbb..cb91321debfb 100644 --- a/modules/freetype2/src/base/ftoutln.c +++ b/modules/freetype2/src/base/ftoutln.c @@ -286,12 +286,13 @@ FT_TRACE5(( "FT_Outline_Decompose: Done\n", n )); return FT_Err_Ok; + Invalid_Outline: + error = FT_THROW( Invalid_Outline ); + /* fall through */ + Exit: FT_TRACE5(( "FT_Outline_Decompose: Error 0x%x\n", error )); return error; - - Invalid_Outline: - return FT_THROW( Invalid_Outline ); } diff --git a/modules/freetype2/src/base/ftver.rc b/modules/freetype2/src/base/ftver.rc new file mode 100644 index 000000000000..a2903d588348 --- /dev/null +++ b/modules/freetype2/src/base/ftver.rc @@ -0,0 +1,61 @@ +/***************************************************************************/ +/* */ +/* ftver.rc */ +/* */ +/* FreeType VERSIONINFO resource for Windows DLLs. */ +/* */ +/* Copyright 2018 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include<windows.h> + +#define FT_VERSION 2,9,1,0 +#define FT_VERSION_STR "2.9.1" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION FT_VERSION +PRODUCTVERSION FT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#endif +#ifdef _DLL +FILETYPE VFT_DLL +#define FT_FILENAME "freetype.dll" +#else +FILETYPE VFT_STATIC_LIB +#define FT_FILENAME "freetype.lib" +#endif +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "The FreeType Project" + VALUE "FileDescription", "Font Rendering Library" + VALUE "FileVersion", FT_VERSION_STR + VALUE "ProductName", "FreeType" + VALUE "ProductVersion", FT_VERSION_STR + VALUE "LegalCopyright", "\251 2018 The FreeType Project www.freetype.org. All rights reserved." + VALUE "InternalName", "freetype" + VALUE "OriginalFilename", FT_FILENAME + END + END + + BLOCK "VarFileInfo" + BEGIN + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a "language,codepage" combination supported by the file. */ + VALUE "Translation", 0x409, 1252 + END +END diff --git a/modules/freetype2/src/base/rules.mk b/modules/freetype2/src/base/rules.mk index 6491f5d8a6bc..e9805bd068a3 100644 --- a/modules/freetype2/src/base/rules.mk +++ b/modules/freetype2/src/base/rules.mk @@ -40,8 +40,10 @@ BASE_SRC := $(BASE_DIR)/basepic.c \ $(BASE_DIR)/ftadvanc.c \ $(BASE_DIR)/ftcalc.c \ $(BASE_DIR)/ftdbgmem.c \ + $(BASE_DIR)/ftfntfmt.c \ $(BASE_DIR)/ftgloadr.c \ $(BASE_DIR)/fthash.c \ + $(BASE_DIR)/ftlcdfil.c \ $(BASE_DIR)/ftobjs.c \ $(BASE_DIR)/ftoutln.c \ $(BASE_DIR)/ftpic.c \ diff --git a/modules/freetype2/src/cff/cffload.c b/modules/freetype2/src/cff/cffload.c index ba49793dc8a3..1c6fe5156673 100644 --- a/modules/freetype2/src/cff/cffload.c +++ b/modules/freetype2/src/cff/cffload.c @@ -1933,6 +1933,24 @@ else if ( priv->initial_random_seed == 0 ) priv->initial_random_seed = 987654321; + /* some sanitizing to avoid overflows later on; */ + /* the upper limits are ad-hoc values */ + if ( priv->blue_shift > 1000 || priv->blue_shift < 0 ) + { + FT_TRACE2(( "cff_load_private_dict:" + " setting unlikely BlueShift value %d to default (7)\n", + priv->blue_shift )); + priv->blue_shift = 7; + } + + if ( priv->blue_fuzz > 1000 || priv->blue_fuzz < 0 ) + { + FT_TRACE2(( "cff_load_private_dict:" + " setting unlikely BlueFuzz value %d to default (1)\n", + priv->blue_fuzz )); + priv->blue_fuzz = 1; + } + Exit: /* clean up */ cff_blend_clear( subfont ); /* clear blend stack */ diff --git a/modules/freetype2/src/pshinter/pshglob.c b/modules/freetype2/src/pshinter/pshglob.c index 29f328d0e6d6..accc04921d08 100644 --- a/modules/freetype2/src/pshinter/pshglob.c +++ b/modules/freetype2/src/pshinter/pshglob.c @@ -227,8 +227,8 @@ } - /* Re-read blue zones from the original fonts and store them into out */ - /* private structure. This function re-orders, sanitizes and */ + /* Re-read blue zones from the original fonts and store them into our */ + /* private structure. This function re-orders, sanitizes, and */ /* fuzz-expands the zones as well. */ static void psh_blues_set_zones( PSH_Blues target, diff --git a/modules/freetype2/src/sfnt/sfobjs.c b/modules/freetype2/src/sfnt/sfobjs.c index 0c917030f37f..6ba8509f569d 100644 --- a/modules/freetype2/src/sfnt/sfobjs.c +++ b/modules/freetype2/src/sfnt/sfobjs.c @@ -1144,6 +1144,8 @@ FT_Bool has_outline; FT_Bool is_apple_sbit; FT_Bool is_apple_sbix; + FT_Bool has_CBLC; + FT_Bool has_CBDT; FT_Bool ignore_typographic_family = FALSE; FT_Bool ignore_typographic_subfamily = FALSE; @@ -1224,6 +1226,13 @@ goto Exit; } + has_CBLC = !face->goto_table( face, TTAG_CBLC, stream, 0 ); + has_CBDT = !face->goto_table( face, TTAG_CBDT, stream, 0 ); + + /* Ignore outlines for CBLC/CBDT fonts. */ + if ( has_CBLC || has_CBDT ) + has_outline = FALSE; + /* OpenType 1.8.2 introduced limits to this value; */ /* however, they make sense for older SFNT fonts also */ if ( face->header.Units_Per_EM < 16 || diff --git a/modules/freetype2/src/sfnt/ttcmap.c b/modules/freetype2/src/sfnt/ttcmap.c index 8cc70f759af6..996e66485fab 100644 --- a/modules/freetype2/src/sfnt/ttcmap.c +++ b/modules/freetype2/src/sfnt/ttcmap.c @@ -222,10 +222,10 @@ /***** The following charmap lookup and iteration functions all *****/ /***** assume that the value `charcode' fulfills the following. *****/ /***** *****/ - /***** - For one byte characters, `charcode' is simply the *****/ + /***** - For one-byte characters, `charcode' is simply the *****/ /***** character code. *****/ /***** *****/ - /***** - For two byte characters, `charcode' is the 2-byte *****/ + /***** - For two-byte characters, `charcode' is the 2-byte *****/ /***** character code in big endian format. More precisely: *****/ /***** *****/ /***** (charcode >> 8) is the first byte value *****/ @@ -252,11 +252,11 @@ /* subs 518 SUBHEAD[NSUBS] sub-headers array */ /* glyph_ids 518+NSUB*8 USHORT[] glyph ID array */ /* */ - /* The `keys' table is used to map charcode high-bytes to sub-headers. */ + /* The `keys' table is used to map charcode high bytes to sub-headers. */ /* The value of `NSUBS' is the number of sub-headers defined in the */ /* table and is computed by finding the maximum of the `keys' table. */ /* */ - /* Note that for any n, `keys[n]' is a byte offset within the `subs' */ + /* Note that for any `n', `keys[n]' is a byte offset within the `subs' */ /* table, i.e., it is the corresponding sub-header index multiplied */ /* by 8. */ /* */ @@ -269,8 +269,8 @@ /* delta 4 SHORT see below */ /* offset 6 USHORT see below */ /* */ - /* A sub-header defines, for each high-byte, the range of valid */ - /* low-bytes within the charmap. Note that the range defined by `first' */ + /* A sub-header defines, for each high byte, the range of valid */ + /* low bytes within the charmap. Note that the range defined by `first' */ /* and `count' must be completely included in the interval [0..255] */ /* according to the specification. */ /* */ @@ -360,7 +360,7 @@ /* check range within 0..255 */ if ( valid->level >= FT_VALIDATE_PARANOID ) { - if ( first_code >= 256 || first_code + code_count > 256 ) + if ( first_code >= 256 || code_count > 256 - first_code ) FT_INVALID_DATA; } @@ -412,7 +412,7 @@ { FT_UInt char_lo = (FT_UInt)( char_code & 0xFF ); FT_UInt char_hi = (FT_UInt)( char_code >> 8 ); - FT_Byte* p = table + 6; /* keys table */ + FT_Byte* p = table + 6; /* keys table */ FT_Byte* subs = table + 518; /* subheaders table */ FT_Byte* sub; @@ -425,8 +425,8 @@ sub = subs; /* jump to first sub-header */ /* check that the sub-header for this byte is 0, which */ - /* indicates that it is really a valid one-byte value */ - /* Otherwise, return 0 */ + /* indicates that it is really a valid one-byte value; */ + /* otherwise, return 0 */ /* */ p += char_lo * 2; if ( TT_PEEK_USHORT( p ) != 0 ) @@ -445,6 +445,7 @@ if ( sub == subs ) goto Exit; } + result = sub; } @@ -517,6 +518,13 @@ FT_UInt pos, idx; + if ( char_lo >= start + count && charcode <= 0xFF ) + { + /* this happens only for a malformed cmap */ + charcode = 0x100; + continue; + } + if ( offset == 0 ) { if ( charcode == 0x100 ) @@ -549,19 +557,18 @@ } } } + + /* if unsuccessful, avoid `charcode' leaving */ + /* the current 256-character block */ + if ( count ) + charcode--; } - /* If `charcode' is <= 0xFF, retry with `charcode + 1'. If */ - /* `charcode' is 0x100 after the loop, do nothing since we have */ - /* just reached the first sub-header for two-byte character codes. */ - /* */ - /* For all other cases, we jump to the next sub-header and adjust */ - /* `charcode' accordingly. */ + /* If `charcode' is <= 0xFF, retry with `charcode + 1'. */ + /* Otherwise jump to the next 256-character block and retry. */ Next_SubHeader: if ( charcode <= 0xFF ) charcode++; - else if ( charcode == 0x100 ) - ; else charcode = FT_PAD_FLOOR( charcode, 0x100 ) + 0x100; } diff --git a/modules/freetype2/src/sfnt/ttpost.c b/modules/freetype2/src/sfnt/ttpost.c index f140649993a3..6de99ef9778a 100644 --- a/modules/freetype2/src/sfnt/ttpost.c +++ b/modules/freetype2/src/sfnt/ttpost.c @@ -473,8 +473,8 @@ /* idx :: The glyph index. */ /* */ /* <InOut> */ - /* PSname :: The address of a string pointer. Will be NULL in case */ - /* of error, otherwise it is a pointer to the glyph name. */ + /* PSname :: The address of a string pointer. Undefined in case of */ + /* error, otherwise it is a pointer to the glyph name. */ /* */ /* You must not modify the returned string! */ /* */ diff --git a/modules/freetype2/src/sfnt/ttsbit.c b/modules/freetype2/src/sfnt/ttsbit.c index 53e61756d184..33b8640bc31a 100644 --- a/modules/freetype2/src/sfnt/ttsbit.c +++ b/modules/freetype2/src/sfnt/ttsbit.c @@ -1514,7 +1514,7 @@ FT_FRAME_EXIT(); if ( glyph_start == glyph_end ) - return FT_THROW( Invalid_Argument ); + return FT_THROW( Missing_Bitmap ); if ( glyph_start > glyph_end || glyph_end - glyph_start < 8 || face->ebdt_size - strike_offset < glyph_end ) diff --git a/modules/freetype2/src/smooth/ftgrays.c b/modules/freetype2/src/smooth/ftgrays.c index 6ce6f86444cd..803a19e41503 100644 --- a/modules/freetype2/src/smooth/ftgrays.c +++ b/modules/freetype2/src/smooth/ftgrays.c @@ -404,7 +404,7 @@ typedef ptrdiff_t FT_PtrDist; /* need to define them to "float" or "double" when experimenting with */ /* new algorithms */ - typedef long TPos; /* sub-pixel coordinate */ + typedef long TPos; /* subpixel coordinate */ typedef int TCoord; /* integer scanline/pixel coordinate */ typedef int TArea; /* cell areas, coordinate products */ diff --git a/modules/freetype2/src/tools/apinames.c b/modules/freetype2/src/tools/apinames.c index 73bc99de5d9d..06c3260430e5 100644 --- a/modules/freetype2/src/tools/apinames.c +++ b/modules/freetype2/src/tools/apinames.c @@ -22,7 +22,7 @@ #include <ctype.h> #define PROGRAM_NAME "apinames" -#define PROGRAM_VERSION "0.2" +#define PROGRAM_VERSION "0.3" #define LINEBUFF_SIZE 1024 @@ -32,7 +32,8 @@ typedef enum OutputFormat_ OUTPUT_WINDOWS_DEF, /* output a Windows .DEF file for Visual C++ or Mingw */ OUTPUT_BORLAND_DEF, /* output a Windows .DEF file for Borland C++ */ OUTPUT_WATCOM_LBC, /* output a Watcom Linker Command File */ - OUTPUT_NETWARE_IMP /* output a NetWare ImportFile */ + OUTPUT_NETWARE_IMP, /* output a NetWare ImportFile */ + OUTPUT_GNU_VERMAP /* output a version map for GNU or Solaris linker */ } OutputFormat; @@ -198,6 +199,15 @@ names_dump( FILE* out, } break; + case OUTPUT_GNU_VERMAP: + { + fprintf( out, "{\n\tglobal:\n" ); + for ( nn = 0; nn < num_names; nn++ ) + fprintf( out, "\t\t%s;\n", the_names[nn].name ); + fprintf( out, "\tlocal:\n\t\t*;\n};\n" ); + } + break; + default: /* LIST */ for ( nn = 0; nn < num_names; nn++ ) fprintf( out, "%s\n", the_names[nn].name ); @@ -323,6 +333,7 @@ usage( void ) " -wB : output .DEF file for Borland C++\n" " -wW : output Watcom Linker Response File\n" " -wN : output NetWare Import File\n" + " -wL : output version map for GNU or Solaris linker\n" "\n"; fprintf( stderr, @@ -410,6 +421,10 @@ int main( int argc, const char* const* argv ) format = OUTPUT_NETWARE_IMP; break; + case 'L': + format = OUTPUT_GNU_VERMAP; + break; + case 0: break; diff --git a/modules/freetype2/src/tools/docmaker/content.py b/modules/freetype2/src/tools/docmaker/content.py index c9969dbe5bbf..198780aee4fe 100644 --- a/modules/freetype2/src/tools/docmaker/content.py +++ b/modules/freetype2/src/tools/docmaker/content.py @@ -109,7 +109,7 @@ class DocCode: def dump( self, prefix = "", width = 60 ): lines = self.dump_lines( 0, width ) for l in lines: - print prefix + l + print( prefix + l ) def dump_lines( self, margin = 0, width = 60 ): result = [] @@ -139,7 +139,7 @@ class DocPara: def dump( self, prefix = "", width = 60 ): lines = self.dump_lines( 0, width ) for l in lines: - print prefix + l + print( prefix + l ) def dump_lines( self, margin = 0, width = 60 ): cur = "" # current line @@ -243,13 +243,13 @@ class DocField: def dump( self, prefix = "" ): if self.field: - print prefix + self.field + " ::" + print( prefix + self.field + " ::" ) prefix = prefix + "----" first = 1 for p in self.items: if not first: - print "" + print( "" ) p.dump( prefix ) first = 0 @@ -330,10 +330,10 @@ class DocMarkup: return None def dump( self, margin ): - print " " * margin + "<" + self.tag + ">" + print( " " * margin + "<" + self.tag + ">" ) for f in self.fields: f.dump( " " ) - print " " * margin + "</" + self.tag + ">" + print( " " * margin + "</" + self.tag + ">" ) ################################################################ diff --git a/modules/freetype2/src/tools/docmaker/docbeauty.py b/modules/freetype2/src/tools/docmaker/docbeauty.py index 3ddf4a94a155..0b021fa6c971 100644 --- a/modules/freetype2/src/tools/docmaker/docbeauty.py +++ b/modules/freetype2/src/tools/docmaker/docbeauty.py @@ -10,9 +10,7 @@ from sources import * from content import * from utils import * -import utils - -import sys, os, time, string, getopt +import sys, os, string, getopt content_processor = ContentProcessor() @@ -40,13 +38,13 @@ def beautify_block( block ): def usage(): - print "\nDocBeauty 0.1 Usage information\n" - print " docbeauty [options] file1 [file2 ...]\n" - print "using the following options:\n" - print " -h : print this page" - print " -b : backup original files with the 'orig' extension" - print "" - print " --backup : same as -b" + print( "\nDocBeauty 0.1 Usage information\n" ) + print( " docbeauty [options] file1 [file2 ...]\n" ) + print( "using the following options:\n" ) + print( " -h : print this page" ) + print( " -b : backup original files with the 'orig' extension" ) + print( "" ) + print( " --backup : same as -b" ) def main( argv ): diff --git a/modules/freetype2/src/tools/docmaker/docmaker.py b/modules/freetype2/src/tools/docmaker/docmaker.py index 253a4d35af7a..eb49afb0a0a3 100644 --- a/modules/freetype2/src/tools/docmaker/docmaker.py +++ b/modules/freetype2/src/tools/docmaker/docmaker.py @@ -31,21 +31,21 @@ from tohtml import * import utils -import sys, os, time, string, glob, getopt +import sys, glob, getopt def usage(): - print "\nDocMaker Usage information\n" - print " docmaker [options] file1 [file2 ...]\n" - print "using the following options:\n" - print " -h : print this page" - print " -t : set project title, as in '-t \"My Project\"'" - print " -o : set output directory, as in '-o mydir'" - print " -p : set documentation prefix, as in '-p ft2'" - print "" - print " --title : same as -t, as in '--title=\"My Project\"'" - print " --output : same as -o, as in '--output=mydir'" - print " --prefix : same as -p, as in '--prefix=ft2'" + print( "\nDocMaker Usage information\n" ) + print( " docmaker [options] file1 [file2 ...]\n" ) + print( "using the following options:\n" ) + print( " -h : print this page" ) + print( " -t : set project title, as in '-t \"My Project\"'" ) + print( " -o : set output directory, as in '-o mydir'" ) + print( " -p : set documentation prefix, as in '-p ft2'" ) + print( "" ) + print( " --title : same as -t, as in '--title=\"My Project\"'" ) + print( " --output : same as -o, as in '--output=mydir'" ) + print( " --prefix : same as -p, as in '--prefix=ft2'" ) def main( argv ): diff --git a/modules/freetype2/src/tools/docmaker/sources.py b/modules/freetype2/src/tools/docmaker/sources.py index 2cd5a3379c25..e3b95e0faa79 100644 --- a/modules/freetype2/src/tools/docmaker/sources.py +++ b/modules/freetype2/src/tools/docmaker/sources.py @@ -29,7 +29,7 @@ # -import fileinput, re, sys, os, string +import fileinput, re, string ################################################################ @@ -296,10 +296,10 @@ class SourceBlock: # debugging only -- not used in normal operations def dump( self ): if self.content: - print "{{{content start---" + print( "{{{content start---" ) for l in self.content: - print l - print "---content end}}}" + print( l ) + print( "---content end}}}" ) return fmt = "" @@ -307,7 +307,7 @@ class SourceBlock: fmt = repr( self.format.id ) + " " for line in self.lines: - print line + print( line ) ################################################################ diff --git a/modules/freetype2/src/tools/docmaker/tohtml.py b/modules/freetype2/src/tools/docmaker/tohtml.py index 7f5ecda41ce7..9f318a2a4944 100644 --- a/modules/freetype2/src/tools/docmaker/tohtml.py +++ b/modules/freetype2/src/tools/docmaker/tohtml.py @@ -406,7 +406,7 @@ class HtmlFormatter( Formatter ): return string.join( lines, '\n' ) def print_html_items( self, items ): - print self.make_html_items( items ) + print( self.make_html_items( items ) ) def print_html_field( self, field ): if field.name: @@ -414,10 +414,10 @@ class HtmlFormatter( Formatter ): + field.name + "</b></td><td>" ) - print self.make_html_items( field.items ) + print( self.make_html_items( field.items ) ) if field.name: - print "</td></tr></table>" + print( "</td></tr></table>" ) def html_source_quote( self, line, block_name = None ): result = "" @@ -468,14 +468,14 @@ class HtmlFormatter( Formatter ): return result def print_html_field_list( self, fields ): - print '<table class="fields">' + print( '<table class="fields">' ) for field in fields: - print ( '<tr><td class="val" id="' + field.name + '">' - + field.name - + '</td><td class="desc">' ) + print( '<tr><td class="val" id="' + field.name + '">' + + field.name + + '</td><td class="desc">' ) self.print_html_items( field.items ) - print "</td></tr>" - print "</table>" + print( "</td></tr>" ) + print( "</table>" ) def print_html_markup( self, markup ): table_fields = [] @@ -499,7 +499,7 @@ class HtmlFormatter( Formatter ): # formatting the index # def index_enter( self ): - print self.html_index_header + print( self.html_index_header ) self.index_items = {} def index_name_enter( self, name ): @@ -512,7 +512,7 @@ class HtmlFormatter( Formatter ): count = len( self.block_index ) rows = ( count + self.columns - 1 ) // self.columns - print '<table class="index">' + print( '<table class="index">' ) for r in range( rows ): line = "<tr>" for c in range( self.columns ): @@ -531,15 +531,15 @@ class HtmlFormatter( Formatter ): else: line = line + '<td></td>' line = line + "</tr>" - print line + print( line ) - print "</table>" + print( "</table>" ) print( index_footer_start + self.file_prefix + "toc.html" + index_footer_end ) - print self.html_footer + print( self.html_footer ) self.index_items = {} @@ -553,25 +553,25 @@ class HtmlFormatter( Formatter ): # formatting the table of contents # def toc_enter( self ): - print self.html_toc_header - print "<h1>Table of Contents</h1>" + print( self.html_toc_header ) + print( "<h1>Table of Contents</h1>" ) def toc_chapter_enter( self, chapter ): - print chapter_header + string.join( chapter.title ) + chapter_inter - print '<table class="toc">' + print( chapter_header + string.join( chapter.title ) + chapter_inter ) + print( '<table class="toc">' ) def toc_section_enter( self, section ): - print ( '<tr><td class="link">' - + '<a href="' + self.make_section_url( section ) + '">' - + section.title + '</a></td><td class="desc">' ) - print self.make_html_para( section.abstract ) + print( '<tr><td class="link">' + + '<a href="' + self.make_section_url( section ) + '">' + + section.title + '</a></td><td class="desc">' ) + print( self.make_html_para( section.abstract ) ) def toc_section_exit( self, section ): - print "</td></tr>" + print( "</td></tr>" ) def toc_chapter_exit( self, chapter ): - print "</table>" - print chapter_footer + print( "</table>" ) + print( chapter_footer ) def toc_index( self, index_filename ): print( chapter_header @@ -583,7 +583,7 @@ class HtmlFormatter( Formatter ): + self.file_prefix + "index.html" + toc_footer_end ) - print self.html_footer + print( self.html_footer ) def toc_dump( self, toc_filename = None, index_filename = None ): if toc_filename == None: @@ -598,11 +598,11 @@ class HtmlFormatter( Formatter ): # formatting sections # def section_enter( self, section ): - print self.html_header + print( self.html_header ) - print ( section_title_header1 + section.name + section_title_header2 - + section.title - + section_title_footer ) + print( section_title_header1 + section.name + section_title_header2 + + section.title + + section_title_footer ) maxwidth = 0 for b in section.blocks.values(): @@ -612,8 +612,8 @@ class HtmlFormatter( Formatter ): width = 70 # XXX magic number if maxwidth > 0: # print section synopsis - print section_synopsis_header - print '<table class="synopsis">' + print( section_synopsis_header ) + print( '<table class="synopsis">' ) columns = width // maxwidth if columns < 1: @@ -650,17 +650,17 @@ class HtmlFormatter( Formatter ): line = line + '</td>' line = line + "</tr>" - print line + print( line ) - print "</table>" - print section_synopsis_footer + print( "</table>" ) + print( section_synopsis_footer ) - print description_header - print self.make_html_items( section.description ) - print description_footer + print( description_header ) + print( self.make_html_items( section.description ) ) + print( description_footer ) def block_enter( self, block ): - print block_header + print( block_header ) # place html anchor if needed if block.name: @@ -686,28 +686,28 @@ class HtmlFormatter( Formatter ): # + " '" + block.source.filename + "'.\n" ) if header: - print ( header_location_header - + 'Defined in ' + header + '.' - + header_location_footer ) + print( header_location_header + + 'Defined in ' + header + '.' + + header_location_footer ) - print source_header + print( source_header ) for l in block.code: - print self.html_source_quote( l, block.name ) - print source_footer + print( self.html_source_quote( l, block.name ) ) + print( source_footer ) def markup_enter( self, markup, block ): if markup.tag == "description": - print description_header + print( description_header ) else: - print marker_header + markup.tag + marker_inter + print( marker_header + markup.tag + marker_inter ) self.print_html_markup( markup ) def markup_exit( self, markup, block ): if markup.tag == "description": - print description_footer + print( description_footer ) else: - print marker_footer + print( marker_footer ) def block_exit( self, block ): print( block_footer_start + self.file_prefix + "index.html" @@ -715,7 +715,7 @@ class HtmlFormatter( Formatter ): + block_footer_end ) def section_exit( self, section ): - print html_footer + print( html_footer ) def section_dump_all( self ): for section in self.sections: diff --git a/modules/freetype2/src/truetype/ttgload.c b/modules/freetype2/src/truetype/ttgload.c index 32ed34aba5ef..39d9c3f73629 100644 --- a/modules/freetype2/src/truetype/ttgload.c +++ b/modules/freetype2/src/truetype/ttgload.c @@ -1219,7 +1219,7 @@ * Theoretically, a glyph's bytecode can toggle ClearType's * `backward compatibility' mode, which would allow modification * of the advance width. In reality, however, applications - * neither allow nor expect modified advance widths if sub-pixel + * neither allow nor expect modified advance widths if subpixel * rendering is active. * */ @@ -2709,6 +2709,10 @@ ( load_flags & FT_LOAD_NO_BITMAP ) == 0 && IS_DEFAULT_INSTANCE ) { + FT_Fixed x_scale = size->root.metrics.x_scale; + FT_Fixed y_scale = size->root.metrics.y_scale; + + error = load_sbit_image( size, glyph, glyph_index, load_flags ); if ( FT_ERR_EQ( error, Missing_Bitmap ) ) { @@ -2716,9 +2720,13 @@ /* if we have a bitmap-only font, return an empty glyph */ if ( !FT_IS_SCALABLE( glyph->face ) ) { - TT_Face face = (TT_Face)glyph->face; - FT_Short left_bearing = 0, top_bearing = 0; - FT_UShort advance_width = 0, advance_height = 0; + TT_Face face = (TT_Face)glyph->face; + + FT_Short left_bearing = 0; + FT_Short top_bearing = 0; + + FT_UShort advance_width = 0; + FT_UShort advance_height = 0; /* to return an empty glyph, however, we need metrics data */ @@ -2744,13 +2752,13 @@ glyph->metrics.width = 0; glyph->metrics.height = 0; - glyph->metrics.horiBearingX = left_bearing; + glyph->metrics.horiBearingX = FT_MulFix( left_bearing, x_scale ); glyph->metrics.horiBearingY = 0; - glyph->metrics.horiAdvance = advance_width; + glyph->metrics.horiAdvance = FT_MulFix( advance_width, x_scale ); glyph->metrics.vertBearingX = 0; - glyph->metrics.vertBearingY = top_bearing; - glyph->metrics.vertAdvance = advance_height; + glyph->metrics.vertBearingY = FT_MulFix( top_bearing, y_scale ); + glyph->metrics.vertAdvance = FT_MulFix( advance_height, y_scale ); glyph->format = FT_GLYPH_FORMAT_BITMAP; glyph->bitmap.pixel_mode = FT_PIXEL_MODE_MONO; @@ -2781,13 +2789,11 @@ /* sanity checks: if `xxxAdvance' in the sbit metric */ /* structure isn't set, use `linearXXXAdvance' */ if ( !glyph->metrics.horiAdvance && glyph->linearHoriAdvance ) - glyph->metrics.horiAdvance = - FT_MulFix( glyph->linearHoriAdvance, - size->metrics->x_scale ); + glyph->metrics.horiAdvance = FT_MulFix( glyph->linearHoriAdvance, + x_scale ); if ( !glyph->metrics.vertAdvance && glyph->linearVertAdvance ) - glyph->metrics.vertAdvance = - FT_MulFix( glyph->linearVertAdvance, - size->metrics->y_scale ); + glyph->metrics.vertAdvance = FT_MulFix( glyph->linearVertAdvance, + y_scale ); } return FT_Err_Ok; diff --git a/modules/freetype2/src/truetype/ttgxvar.c b/modules/freetype2/src/truetype/ttgxvar.c index 96a171ef4d49..29ab2a4efddb 100644 --- a/modules/freetype2/src/truetype/ttgxvar.c +++ b/modules/freetype2/src/truetype/ttgxvar.c @@ -1733,17 +1733,13 @@ /* based on the [min,def,max] values for the axis to be [-1,0,1]. */ /* Then, if there's an `avar' table, we renormalize this range. */ - FT_TRACE5(( "%d design coordinate%s:\n", - num_coords, - num_coords == 1 ? "" : "s" )); - a = mmvar->axis; for ( i = 0; i < num_coords; i++, a++ ) { FT_Fixed coord = coords[i]; - FT_TRACE5(( " %.5f\n", coord / 65536.0 )); + FT_TRACE5(( " %d: %.5f\n", i, coord / 65536.0 )); if ( coord > a->maximum || coord < a->minimum ) { FT_TRACE1(( @@ -2043,7 +2039,9 @@ FT_TRACE2(( "loaded\n" )); - FT_TRACE5(( "number of GX style axes: %d\n", fvar_head.axisCount )); + FT_TRACE5(( "%d variation ax%s\n", + fvar_head.axisCount, + fvar_head.axisCount == 1 ? "is" : "es" )); if ( FT_NEW( face->blend ) ) goto Exit; @@ -2143,6 +2141,10 @@ { GX_FVar_Axis axis_rec; +#ifdef FT_DEBUG_LEVEL_TRACE + int invalid = 0; +#endif + if ( FT_STREAM_READ_FIELDS( fvaraxis_fields, &axis_rec ) ) goto Exit; @@ -2163,22 +2165,31 @@ if ( a->minimum > a->def || a->def > a->maximum ) { - FT_TRACE2(( "TT_Get_MM_Var:" - " invalid \"%s\" axis record; disabling\n", - a->name )); - a->minimum = a->def; a->maximum = a->def; + +#ifdef FT_DEBUG_LEVEL_TRACE + invalid = 1; +#endif } - FT_TRACE5(( " \"%s\":" - " minimum=%.5f, default=%.5f, maximum=%.5f," - " flags=0x%04X\n", +#ifdef FT_DEBUG_LEVEL_TRACE + if ( i == 0 ) + FT_TRACE5(( " idx tag " + /* " XXX `XXXX'" */ + " minimum default maximum flags\n" )); + /* " XXXX.XXXXX XXXX.XXXXX XXXX.XXXXX 0xXXXX" */ + + FT_TRACE5(( " %3d `%s'" + " %10.5f %10.5f %10.5f 0x%04X%s\n", + i, a->name, a->minimum / 65536.0, a->def / 65536.0, a->maximum / 65536.0, - *axis_flags )); + *axis_flags, + invalid ? " (invalid, disabled)" : "" )); +#endif a++; axis_flags++; @@ -2203,6 +2214,10 @@ goto Exit; } + FT_TRACE5(( "%d instance%s\n", + fvar_head.instanceCount, + fvar_head.instanceCount == 1 ? "" : "s" )); + ns = mmvar->namedstyle; nsc = face->blend->normalized_stylecoords; for ( i = 0; i < fvar_head.instanceCount; i++, ns++ ) @@ -2225,6 +2240,52 @@ else ns->psid = 0xFFFF; +#ifdef FT_DEBUG_LEVEL_TRACE + { + SFNT_Service sfnt = (SFNT_Service)face->sfnt; + + FT_String* strname = NULL; + FT_String* psname = NULL; + + FT_ULong pos; + + + pos = FT_STREAM_POS(); + + if ( ns->strid != 0xFFFF ) + { + (void)sfnt->get_name( face, + (FT_UShort)ns->strid, + &strname ); + if ( strname && !ft_strcmp( strname, ".notdef" ) ) + strname = NULL; + } + + if ( ns->psid != 0xFFFF ) + { + (void)sfnt->get_name( face, + (FT_UShort)ns->psid, + &psname ); + if ( psname && !ft_strcmp( psname, ".notdef" ) ) + psname = NULL; + } + + (void)FT_STREAM_SEEK( pos ); + + FT_TRACE5(( " instance %d (%s%s%s, %s%s%s)\n", + i, + strname ? "name: `" : "", + strname ? strname : "unnamed", + strname ? "'" : "", + psname ? "PS name: `" : "", + psname ? psname : "no PS name", + psname ? "'" : "" )); + + FT_FREE( strname ); + FT_FREE( psname ); + } +#endif /* FT_DEBUG_LEVEL_TRACE */ + ft_var_to_normalized( face, num_axes, ns->coords, nsc ); nsc += num_axes; @@ -2382,11 +2443,12 @@ num_coords = mmvar->num_axis; } - FT_TRACE5(( "normalized design coordinates:\n" )); + FT_TRACE5(( "TT_Set_MM_Blend:\n" + " normalized design coordinates:\n" )); for ( i = 0; i < num_coords; i++ ) { - FT_TRACE5(( " %.5f\n", coords[i] / 65536.0 )); + FT_TRACE5(( " %.5f\n", coords[i] / 65536.0 )); if ( coords[i] < -0x00010000L || coords[i] > 0x00010000L ) { FT_TRACE1(( "TT_Set_MM_Blend: normalized design coordinate %.5f\n" @@ -2773,6 +2835,8 @@ if ( !face->blend->avar_loaded ) ft_var_load_avar( face ); + FT_TRACE5(( "TT_Set_Var_Design:\n" + " normalized design coordinates:\n" )); ft_var_to_normalized( face, num_coords, blend->coords, normalized ); error = tt_set_mm_blend( face, mmvar->num_axis, normalized, 0 ); diff --git a/modules/freetype2/src/truetype/ttinterp.c b/modules/freetype2/src/truetype/ttinterp.c index 2dc5270ee302..da9b595aba0c 100644 --- a/modules/freetype2/src/truetype/ttinterp.c +++ b/modules/freetype2/src/truetype/ttinterp.c @@ -8526,8 +8526,8 @@ LNo_Error_: FT_TRACE4(( " %d instruction%s executed\n", - ins_counter == 1 ? "" : "s", - ins_counter )); + ins_counter, + ins_counter == 1 ? "" : "s" )); return FT_Err_Ok; LErrorCodeOverflow_: diff --git a/modules/freetype2/src/truetype/ttobjs.c b/modules/freetype2/src/truetype/ttobjs.c index bc8086f25684..6685dc819607 100644 --- a/modules/freetype2/src/truetype/ttobjs.c +++ b/modules/freetype2/src/truetype/ttobjs.c @@ -147,7 +147,7 @@ { #define TRICK_NAMES_MAX_CHARACTERS 19 -#define TRICK_NAMES_COUNT 23 +#define TRICK_NAMES_COUNT 26 static const char trick_names[TRICK_NAMES_COUNT] [TRICK_NAMES_MAX_CHARACTERS + 1] = @@ -167,12 +167,15 @@ "DFGirl-W6-WIN-BF", /* dftt-h6.ttf; version 1.00, 1993 */ "DFGothic-EB", /* DynaLab Inc. 1992-1995 */ "DFGyoSho-Lt", /* DynaLab Inc. 1992-1995 */ + "DFHei-Md-HK-BF", /* maybe DynaLab Inc. */ "DFHSGothic-W5", /* DynaLab Inc. 1992-1995 */ "DFHSMincho-W3", /* DynaLab Inc. 1992-1995 */ "DFHSMincho-W7", /* DynaLab Inc. 1992-1995 */ "DFKaiSho-SB", /* dfkaisb.ttf */ "DFKaiShu", + "DFKaiShu-Md-HK-BF", /* maybe DynaLab Inc. */ "DFKai-SB", /* kaiu.ttf; version 3.00, 1998 [DFKaiShu-SB-Estd-BF] */ + "DFMing-Bd-HK-BF", /* maybe DynaLab Inc. */ "DLC", /* dftt-m7.ttf; version 1.00, 1993 [DLCMingBold] */ /* dftt-f5.ttf; version 1.00, 1993 [DLCFongSung] */ "DLCHayMedium", /* dftt-b5.ttf; version 1.00, 1993 */ @@ -270,7 +273,7 @@ tt_check_trickyness_sfnt_ids( TT_Face face ) { #define TRICK_SFNT_IDS_PER_FACE 3 -#define TRICK_SFNT_IDS_NUM_FACES 26 +#define TRICK_SFNT_IDS_NUM_FACES 29 static const tt_sfnt_id_rec sfnt_id[TRICK_SFNT_IDS_NUM_FACES] [TRICK_SFNT_IDS_PER_FACE] = { @@ -299,6 +302,11 @@ { 0xCE5956E9UL, 0x0000BC85UL }, /* fpgm */ { 0x8272F416UL, 0x00000045UL } /* prep */ }, + { /* DFHei-Md-HK-BF */ + { 0x1257EB46UL, 0x00000350UL }, /* cvt */ + { 0xF699D160UL, 0x0000715FUL }, /* fpgm */ + { 0xD222F568UL, 0x000003BCUL } /* prep */ + }, { /* DFHSGothic-W5 */ { 0x1262EB4EUL, 0x00000350UL }, /* cvt */ { 0xE86A5D64UL, 0x00007940UL }, /* fpgm */ @@ -324,6 +332,16 @@ { 0xA6E78C01UL, 0x00008998UL }, /* fpgm */ { 0x13A42602UL, 0x0000007EUL } /* prep */ }, + { /* DFKaiShu-Md-HK-BF */ + { 0x11E5EAD4UL, 0x00000360UL }, /* cvt */ + { 0x9DB282B2UL, 0x0000C06EUL }, /* fpgm */ + { 0x53E6D7CAUL, 0x00000082UL } /* prep */ + }, + { /* DFMing-Bd-HK-BF */ + { 0x1243EB18UL, 0x00000350UL }, /* cvt */ + { 0xBA0A8C30UL, 0x000074ADUL }, /* fpgm */ + { 0xF3D83409UL, 0x0000037BUL } /* prep */ + }, { /* DLCLiShu */ { 0x07DCF546UL, 0x00000308UL }, /* cvt */ { 0x40FE7C90UL, 0x00008E2AUL }, /* fpgm */ diff --git a/modules/freetype2/src/type1/t1load.c b/modules/freetype2/src/type1/t1load.c index 2b8d4893c692..9dfa637a6953 100644 --- a/modules/freetype2/src/type1/t1load.c +++ b/modules/freetype2/src/type1/t1load.c @@ -2493,6 +2493,24 @@ type1->encoding.num_chars = loader.num_chars; } + /* some sanitizing to avoid overflows later on; */ + /* the upper limits are ad-hoc values */ + if ( priv->blue_shift > 1000 || priv->blue_shift < 0 ) + { + FT_TRACE2(( "T1_Open_Face:" + " setting unlikely BlueShift value %d to default (7)\n", + priv->blue_shift )); + priv->blue_shift = 7; + } + + if ( priv->blue_fuzz > 1000 || priv->blue_fuzz < 0 ) + { + FT_TRACE2(( "T1_Open_Face:" + " setting unlikely BlueFuzz value %d to default (1)\n", + priv->blue_fuzz )); + priv->blue_fuzz = 1; + } + Exit: t1_done_loader( &loader ); return error; diff --git a/modules/freetype2/vms_make.com b/modules/freetype2/vms_make.com index 6222c5e8ece3..7b8a49b3b3ec 100644 --- a/modules/freetype2/vms_make.com +++ b/modules/freetype2/vms_make.com @@ -356,8 +356,8 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base]) OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,\ - fttype1.obj,ftfntfmt.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj,\ - ftbitmap.obj,ftlcdfil.obj,ftgasp.obj + fttype1.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj,\ + ftbitmap.obj,ftgasp.obj all : $(OBJS) library [--.lib]freetype.olb $(OBJS)

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Fall back to the memory cache when a shortcut is created. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 1387995d6a8764a730deac5a6d50a1f2ffa3ca0e Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:56 2018 +0200 Bug 1448305 - Fall back to the memory cache when a shortcut is created. r=JanH --- .../mozilla/gecko/icons/TestIconRequestBuilder.java | 21 +++++++++++++++++++++ .../java/org/mozilla/gecko/GeckoApplication.java | 16 ++++++++++++++-- .../org/mozilla/gecko/icons/IconRequestBuilder.java | 10 ++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java index 066febaf2b93..2d80ad7ae5f6 100644 --- a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java @@ -172,6 +172,27 @@ public class TestIconRequestBuilder { } @Test + public void testSkipMemoryIf() { + IconRequest request = Icons.with(RuntimeEnvironment.application) + .pageUrl(TEST_PAGE_URL_1) + .build(); + + Assert.assertFalse(request.shouldSkipMemory()); + + request.modify() + .skipMemoryIf(true) + .deferBuild(); + + Assert.assertTrue(request.shouldSkipMemory()); + + request.modify() + .skipMemoryIf(false) + .deferBuild(); + + Assert.assertFalse(request.shouldSkipMemory()); + } + + @Test public void testExecutionOnBackgroundThread() { IconRequest request = Icons.with(RuntimeEnvironment.application) .pageUrl(TEST_PAGE_URL_1) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index 9a5e89dc1579..e896134e0af9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -613,15 +613,27 @@ public class GeckoApplication extends Application } public static void createBrowserShortcut(final String title, final String url) { - Icons.with(GeckoAppShell.getApplicationContext()) + createBrowserShortcut(title, url, true); + } + + private static void createBrowserShortcut(final String title, final String url, final boolean skipMemoryCache) { + // Try to fetch the icon from the disk cache. The memory cache is + // initially skipped to avoid the use of downsized icons. + Icons.with(GeckoAppShell.getApplicationContext()) .pageUrl(url) .skipNetwork() - .skipMemory() + .skipMemoryIf(skipMemoryCache) .forLauncherIcon() .build() .execute(new IconCallback() { @Override public void onIconResponse(final IconResponse response) { + if (response.isGenerated() && skipMemoryCache) { + // The icon was not found in the disk cache. + // Fall back to the memory cache. + createBrowserShortcut(title, url, false); + return; + } createShortcutWithIcon(title, url, response.getBitmap()); } }); diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java index b2fb46e3a39f..7e3ac5ce1395 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java @@ -107,6 +107,16 @@ public class IconRequestBuilder { } /** + * If shouldSkipMemory is true then skip the memory cache and do not return + * a previously loaded icon. + */ + @CheckResult + public IconRequestBuilder skipMemoryIf(boolean shouldSkipMemory) { + internal.skipMemory = shouldSkipMemory; + return this; + } + + /** * The icon will be used as (Android) launcher icon. The loaded icon will be scaled to the * preferred Android launcher icon size. */

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of TwoLinePageRow in private tabs. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 4744f30185f1e76fd8243bdc07e2c5dac6dd2302 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:40 2018 +0200 Bug 1448305 - Avoid disk cache for icons of TwoLinePageRow in private tabs. r=JanH E.g. autocompletion results and the "Recently closed" list. --- .../base/java/org/mozilla/gecko/home/TwoLinePageRow.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java b/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java index 334842e2bb2f..5be453f5a536 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java @@ -204,14 +204,11 @@ public class TwoLinePageRow extends ThemedLinearLayout * selected tab. */ protected void updateDisplayedUrl() { - final Tab selectedTab = Tabs.getInstance().getSelectedTab(); - final boolean isPrivate = (selectedTab != null) && (selectedTab.isPrivate()); - // We always want to display the underlying page url, however for readermode pages // we navigate to the about:reader equivalent, hence we need to use that url when finding // existing tabs final String navigationUrl = mHasReaderCacheItem ? ReaderModeUtils.getAboutReaderForUrl(mPageUrl) : mPageUrl; - Tab tab = Tabs.getInstance().getFirstTabForUrl(navigationUrl, isPrivate); + Tab tab = Tabs.getInstance().getFirstTabForUrl(navigationUrl, isCurrentTabInPrivateMode()); if (!mShowIcons || tab == null) { @@ -280,6 +277,7 @@ public class TwoLinePageRow extends ThemedLinearLayout } else if (bookmarkId < BrowserContract.Bookmarks.FAKE_PARTNER_BOOKMARKS_START) { mOngoingIconLoad = Icons.with(getContext()) .pageUrl(pageURL) + .setPrivateMode(isCurrentTabInPrivateMode()) .skipNetwork() .privileged(true) .icon(IconDescriptor.createGenericIcon( @@ -289,6 +287,7 @@ public class TwoLinePageRow extends ThemedLinearLayout } else { mOngoingIconLoad = Icons.with(getContext()) .pageUrl(pageURL) + .setPrivateMode(isCurrentTabInPrivateMode()) .skipNetwork() .build() .execute(mFavicon.createIconCallback()); @@ -307,6 +306,15 @@ public class TwoLinePageRow extends ThemedLinearLayout } /** + * @return true if this view is shown inside a private tab, independent of whether + * a private mode theme is applied via <code>setPrivateMode(true)</code>. + */ + private boolean isCurrentTabInPrivateMode() { + final Tab tab = Tabs.getInstance().getSelectedTab(); + return tab != null && tab.isPrivate(); + } + + /** * Update the data displayed by this row. * <p> * This method must be invoked on the UI thread.

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tabs. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c04236287b17b1e8a3ca2a30344d2fe718cae788 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:35:39 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tabs. r=JanH --- .../mozilla/gecko/icons/TestIconRequestBuilder.java | 21 +++++++++++++++++++++ mobile/android/base/java/org/mozilla/gecko/Tab.java | 1 + .../java/org/mozilla/gecko/icons/IconRequest.java | 9 +++++++++ .../org/mozilla/gecko/icons/IconRequestBuilder.java | 10 ++++++++++ .../gecko/icons/processing/DiskProcessor.java | 2 +- 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java index 620caa9f70d0..066febaf2b93 100644 --- a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java @@ -85,6 +85,27 @@ public class TestIconRequestBuilder { } @Test + public void testPrivateMode() { + IconRequest request = Icons.with(RuntimeEnvironment.application) + .pageUrl(TEST_PAGE_URL_1) + .build(); + + Assert.assertFalse(request.isPrivateMode()); + + request.modify() + .setPrivateMode(true) + .deferBuild(); + + Assert.assertTrue(request.isPrivateMode()); + + request.modify() + .setPrivateMode(false) + .deferBuild(); + + Assert.assertFalse(request.isPrivateMode()); + } + + @Test public void testSkipNetwork() { IconRequest request = Icons.with(RuntimeEnvironment.application) .pageUrl(TEST_PAGE_URL_1) diff --git a/mobile/android/base/java/org/mozilla/gecko/Tab.java b/mobile/android/base/java/org/mozilla/gecko/Tab.java index 8b84a2c7db66..91c1d1571435 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Tab.java +++ b/mobile/android/base/java/org/mozilla/gecko/Tab.java @@ -443,6 +443,7 @@ public class Tab { } mRunningIconRequest = mIconRequestBuilder + .setPrivateMode(isPrivate()) .build() .execute(new IconCallback() { @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java index 8161b9510f3f..da74a8fb5318 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java @@ -23,6 +23,7 @@ public class IconRequest { // Those values are written by the IconRequestBuilder class. /* package-private */ String pageUrl; /* package-private */ boolean privileged; + /* package-private */ boolean isPrivate; /* package-private */ TreeSet<IconDescriptor> icons; /* package-private */ boolean skipNetwork; /* package-private */ boolean backgroundThread; @@ -40,6 +41,7 @@ public class IconRequest { // Setting some sensible defaults. this.privileged = false; + this.isPrivate = false; this.skipMemory = false; this.skipDisk = false; this.skipNetwork = false; @@ -97,6 +99,13 @@ public class IconRequest { } /** + * Is this request initiated from a tab in private browsing mode? + */ + public boolean isPrivateMode() { + return isPrivate; + } + + /** * Get the number of icon descriptors associated with this request. */ public int getIconCount() { diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java index ddae3b64bc64..b2fb46e3a39f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java @@ -62,6 +62,15 @@ public class IconRequestBuilder { } /** + * Set the private mode to avoid saving the result to the disk. + */ + @CheckResult + public IconRequestBuilder setPrivateMode(boolean isPrivate) { + internal.isPrivate = isPrivate; + return this; + } + + /** * Skip the network and do not load an icon from a network connection. */ @CheckResult @@ -165,6 +174,7 @@ public class IconRequestBuilder { IconRequest request = new IconRequest(internal.getContext()); request.pageUrl = internal.pageUrl; request.privileged = internal.privileged; + request.isPrivate = internal.isPrivate; request.icons = new TreeSet<>(internal.icons); request.skipNetwork = internal.skipNetwork; request.backgroundThread = internal.backgroundThread; diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java b/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java index 150aa503b83e..4923c6fc93c4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java @@ -8,7 +8,7 @@ import org.mozilla.gecko.util.StringUtils; public class DiskProcessor implements Processor { @Override public void process(IconRequest request, IconResponse response) { - if (request.shouldSkipDisk()) { + if (request.shouldSkipDisk() || request.isPrivateMode()) { return; }

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tab's session history. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c72b56ea4eb7dcbb73d1fce9b9ac066abbe5bd53 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:05 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tab's session history. r=JanH --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 ++-- .../java/org/mozilla/gecko/tabs/TabHistoryController.java | 6 ++++-- .../java/org/mozilla/gecko/tabs/TabHistoryFragment.java | 13 +++++++++---- .../base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java | 3 ++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index ea9480d149cc..4a497f6999e0 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -784,7 +784,7 @@ public class BrowserApp extends GeckoApp // Initialize Tab History Controller. tabHistoryController = new TabHistoryController(new OnShowTabHistory() { @Override - public void onShowHistory(final List<TabHistoryPage> historyPageList, final int toIndex) { + public void onShowHistory(final List<TabHistoryPage> historyPageList, final int toIndex, final boolean isPrivate) { runOnUiThread(new Runnable() { @Override public void run() { @@ -798,7 +798,7 @@ public class BrowserApp extends GeckoApp return; } - final TabHistoryFragment fragment = TabHistoryFragment.newInstance(historyPageList, toIndex); + final TabHistoryFragment fragment = TabHistoryFragment.newInstance(historyPageList, toIndex, isPrivate); final FragmentManager fragmentManager = getSupportFragmentManager(); GeckoAppShell.getHapticFeedbackDelegate().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); fragment.show(R.id.tab_history_panel, fragmentManager.beginTransaction(), TAB_HISTORY_FRAGMENT_TAG); diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java index 0d81f587ca5a..5144c10da05b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java @@ -25,7 +25,7 @@ public class TabHistoryController { }; public interface OnShowTabHistory { - void onShowHistory(List<TabHistoryPage> historyPageList, int toIndex); + void onShowHistory(List<TabHistoryPage> historyPageList, int toIndex, boolean isPrivate); } public TabHistoryController(OnShowTabHistory showTabHistoryListener) { @@ -40,6 +40,8 @@ public class TabHistoryController { data.putString("action", action.name()); data.putInt("tabId", tab.getId()); + final boolean isPrivate = tab.isPrivate(); + EventDispatcher.getInstance().dispatch("Session:GetHistory", data, new EventCallback() { @Override public void sendSuccess(final Object response) { @@ -74,7 +76,7 @@ public class TabHistoryController { historyPageList.add(new TabHistoryPage(title, url, selected)); } - showTabHistoryListener.onShowHistory(historyPageList, toIndex); + showTabHistoryListener.onShowHistory(historyPageList, toIndex, isPrivate); } @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java index 3324636e1141..0877fe258746 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java @@ -32,6 +32,7 @@ import android.widget.ListView; public class TabHistoryFragment extends Fragment implements OnItemClickListener, OnClickListener { private static final String ARG_LIST = "historyPageList"; private static final String ARG_INDEX = "index"; + private static final String ARG_PRIVATE_MODE = "private"; private static final String BACK_STACK_ID = "backStateId"; private List<TabHistoryPage> historyPageList; @@ -45,11 +46,12 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, } - public static TabHistoryFragment newInstance(List<TabHistoryPage> historyPageList, int toIndex) { + public static TabHistoryFragment newInstance(List<TabHistoryPage> historyPageList, int toIndex, boolean isPrivate) { final TabHistoryFragment fragment = new TabHistoryFragment(); final Bundle args = new Bundle(); args.putParcelableArrayList(ARG_LIST, (ArrayList<? extends Parcelable>) historyPageList); args.putInt(ARG_INDEX, toIndex); + args.putBoolean(ARG_PRIVATE_MODE, isPrivate); fragment.setArguments(args); return fragment; } @@ -79,7 +81,8 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, Bundle bundle = getArguments(); historyPageList = bundle.getParcelableArrayList(ARG_LIST); toIndex = bundle.getInt(ARG_INDEX); - final ArrayAdapter<TabHistoryPage> urlAdapter = new TabHistoryAdapter(getActivity(), historyPageList); + boolean isPrivate = bundle.getBoolean(ARG_PRIVATE_MODE); + final ArrayAdapter<TabHistoryPage> urlAdapter = new TabHistoryAdapter(getActivity(), historyPageList, isPrivate); dialogList.setAdapter(urlAdapter); dialogList.setOnItemClickListener(this); } @@ -153,11 +156,13 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, private static class TabHistoryAdapter extends ArrayAdapter<TabHistoryPage> { private final List<TabHistoryPage> pages; private final Context context; + private final boolean isPrivate; - public TabHistoryAdapter(Context context, List<TabHistoryPage> pages) { + public TabHistoryAdapter(Context context, List<TabHistoryPage> pages, boolean isPrivate) { super(context, R.layout.tab_history_item_row, pages); this.context = context; this.pages = pages; + this.isPrivate = isPrivate; } @Override @@ -167,7 +172,7 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, row = new TabHistoryItemRow(context, null); } - row.update(pages.get(position), position == 0, position == pages.size() - 1); + row.update(pages.get(position), position == 0, position == pages.size() - 1, isPrivate); return row; } } diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java index 112dbc07dc9a..7e4220c94fd4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java @@ -38,7 +38,7 @@ public class TabHistoryItemRow extends RelativeLayout { } // Update the views with historic page detail. - public void update(final TabHistoryPage historyPage, boolean isFirstElement, boolean isLastElement) { + public void update(final TabHistoryPage historyPage, boolean isFirstElement, boolean isLastElement, boolean isPrivate) { ThreadUtils.assertOnUiThread(); timeLineTop.setVisibility(isFirstElement ? View.INVISIBLE : View.VISIBLE); @@ -62,6 +62,7 @@ public class TabHistoryItemRow extends RelativeLayout { ongoingIconLoad = Icons.with(getContext()) .pageUrl(historyPage.getUrl()) + .setPrivateMode(isPrivate) .skipNetwork() .build() .execute(favicon.createIconCallback());

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1441345 - Force the use of the Linux phishing list on Android. r=dimi, a=pascalc
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 9ec06f1b4bb17e562e10cb7d39e1af8370522538 Author: Francois Marier <francois(a)mozilla.com> Date: Wed Sep 12 18:07:26 2018 +0300 Bug 1441345 - Force the use of the Linux phishing list on Android. r=dimi, a=pascalc Reviewers: dimi Reviewed By: dimi Subscribers: dveditz, francois, dimi Bug #: 1441345 Differential Revision: https://phabricator.services.mozilla.com/D5479 --HG-- extra : source : 3fa9372e4c5f05713fe1a9f758487fa443ce7500 --- .../url-classifier/nsUrlClassifierUtils.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp index ce445d4a473e..b8ca0539550a 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp @@ -112,7 +112,15 @@ InitListUpdateRequest(ThreatType aThreatType, ListUpdateRequest* aListUpdateRequest) { aListUpdateRequest->set_threat_type(aThreatType); - aListUpdateRequest->set_platform_type(GetPlatformType()); + PlatformType platform = GetPlatformType(); +#if defined(ANDROID) + // Temporary hack to fix bug 1441345. + if ((aThreatType == SOCIAL_ENGINEERING_PUBLIC) || + (aThreatType == SOCIAL_ENGINEERING)) { + platform = LINUX_PLATFORM; + } +#endif + aListUpdateRequest->set_platform_type(platform); aListUpdateRequest->set_threat_entry_type(URL); Constraints* contraints = new Constraints(); @@ -418,6 +426,8 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, // Set up FindFullHashesRequest.threat_info. auto threatInfo = r.mutable_threat_info(); + PlatformType platform = GetPlatformType(); + // 1) Set threat types. for (uint32_t i = 0; i < aListCount; i++) { // Add threat types. @@ -433,6 +443,14 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, } threatInfo->add_threat_types((ThreatType)threatType); +#if defined(ANDROID) + // Temporary hack to fix bug 1441345. + if (((ThreatType)threatType == SOCIAL_ENGINEERING_PUBLIC) || + ((ThreatType)threatType == SOCIAL_ENGINEERING)) { + platform = LINUX_PLATFORM; + } +#endif + // Add client states for index 'i' only when the threat type is available // on current platform. nsCString stateBinary; @@ -442,7 +460,7 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, } // 2) Set platform type. - threatInfo->add_platform_types(GetPlatformType()); + threatInfo->add_platform_types(platform); // 3) Set threat entry type. threatInfo->add_threat_entry_types(URL);

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 1e7ee8ad5a57315bda89fb5b1f7fba49e63ccce4 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 18 15:27:06 2018 -0400 Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup --- dom/media/platforms/android/AndroidDecoderModule.cpp | 12 +++++++----- dom/media/platforms/android/AndroidDecoderModule.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp index df32d9b2f4fd..bffefde46a36 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.cpp +++ b/dom/media/platforms/android/AndroidDecoderModule.cpp @@ -33,15 +33,17 @@ namespace mozilla { mozilla::LazyLogModule sAndroidDecoderModuleLog("AndroidDecoderModule"); -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType) { if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP8)) { - return "video/x-vnd.on2.vp8"; + static NS_NAMED_LITERAL_CSTRING(vp8, "video/x-vnd.on2.vp8"); + return vp8; } else if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP9)) { - return "video/x-vnd.on2.vp9"; + static NS_NAMED_LITERAL_CSTRING(vp9, "video/x-vnd.on2.vp9"); + return vp9; } - return PromiseFlatCString(aMimeType).get(); + return nsCString(aMimeType); } static bool @@ -112,7 +114,7 @@ AndroidDecoderModule::SupportsMimeType( } return java::HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType( - nsCString(TranslateMimeType(aMimeType))); + TranslateMimeType(aMimeType)); } already_AddRefed<MediaDataDecoder> diff --git a/dom/media/platforms/android/AndroidDecoderModule.h b/dom/media/platforms/android/AndroidDecoderModule.h index 86a0766c36e6..4f67965d2b3a 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.h +++ b/dom/media/platforms/android/AndroidDecoderModule.h @@ -31,7 +31,7 @@ private: extern LazyLogModule sAndroidDecoderModuleLog; -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType); } // namespace mozilla

1 0

[tor-browser-build/master] Bug 27827: update go to 1.11.1
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 6cdefb462010bf92ce57751f0c3ccb44ea45d353 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 17 09:28:58 2018 -0600 Bug 27827: update go to 1.11.1 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 2a3b1ad..1841705 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.3 +version: 1.11.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 + sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 27827: pass -tmpdir to the linker in snowflake build
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit f92f149ea8ffb9dd64a798453c85aa124a9391aa Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 16 18:40:59 2018 -0600 Bug 27827: pass -tmpdir to the linker in snowflake build The update to go 1.11.1 fixed part of #27827, namely the /tmp/go-buildRANDOMNUM paths embedded in the binary. However there is still a single /tmp/go-link-RANDOMNUM/go.o path remaining -- it comes from here: https://github.com/golang/go/blob/go1.11.1/src/cmd/link/internal/ld/lib.go#… The random path affects the Go build ID even if we overwrite the random digits in the binary. Luckily there's a -tmpdir flag that lets us override the random path. --- projects/snowflake/build | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index f3616f4..a66a1e9 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -30,32 +30,13 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - [% c("var/faketime") %] go build -ldflags '-s' + # The -tmpdir flag overrides what would otherwise be a randomly generated + # path, /tmp/go-link-RANDOMNUM/go.o. + mkdir -p /var/tmp/go-link.tmpdir + [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' [% ELSE -%] go build -ldflags '-s' [% END -%] -[% IF c("var/osx") -%] - # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 - # on Darwin embeds such paths and the issue is unsolved in upstream Go as of - # 2016-06-28: - # https://github.com/golang/go/issues/9206#issuecomment-310476743 - # The two kinds of paths are ("000000000" stands for 9 random digits): - # /tmp/go-build000000000 - # /tmp/go-link-000000000 - # Such paths are the output of ioutil.TempDir("", "go-build") and - # ioutil.TempDir("", "go-link-"). - cp -a client client.stomped - sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped - # Sanity check: make sure the file actually changed. If it did not, it could - # mean that a change in go or clang has made this step unnecessary. - if cmp client client.stomped - then - echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." - echo "Check projects/snowflake/build" - exit 1 - fi - mv -f client.stomped client -[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Merge remote-tracking branch 'dcf/bug_27827'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 889be4318d80f11f2b5b2b845ab11868149c48f1 Merge: d8ce7fc f92f149 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 10:21:29 2018 +0000 Merge remote-tracking branch 'dcf/bug_27827' projects/go/config | 4 ++-- projects/snowflake/build | 27 ++++----------------------- 2 files changed, 6 insertions(+), 25 deletions(-)

1 0

[tor-browser-build/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit fbb72c65a24ac70619062ebcd16c67a9afb4feae Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:47:48 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- rbm.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rbm.conf b/rbm.conf index d7f1420..13aec99 100644 --- a/rbm.conf +++ b/rbm.conf @@ -53,17 +53,21 @@ var: locales: - ar - ca + - cs - da - de + - el - es-ES - fa - fr - ga-IE - he + - hu - id - is - it - '[% c("var/locale_ja") %]' + - ka - ko - nb-NO - nl

1 0

[tor-browser-build/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a Merge: 0166d3d fbb72c6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:16:59 2018 +0000 Merge remote-tracking branch 'arthur/28082' rbm.conf | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-launcher/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 3aa20983122b4aaed6ae77cfc5bdb48107aa33a4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:41:50 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- src/chrome/content/network-settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index aaa91ac..1599c28 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,17 +306,21 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", + "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", + "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", + "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", + "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c94a5589ffeabf71ea95c3c5c1a3396bdbe14da5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:10:02 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index d13f8259..8f562208 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 38cc505106a37e704ce11a41d22b74cfde36449f Merge: 9e5c4406 c94a5589 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:17:17 2018 +0000 Merge remote-tracking branch 'arthur/28082' trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0