Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chromium65 #50

Merged
merged 6 commits into from
Mar 2, 2018
Merged

Chromium65 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
314db99
Update patches for C65
bbondy Mar 1, 2018
e93f40c
Fix error string for extra strings
bbondy Mar 1, 2018
ac9789a
Update strings
bbondy Mar 1, 2018
8ae4317
Remove ldflags patch since Chromium added them in same block
bbondy Mar 2, 2018
d06d383
Update XTB files
bbondy Mar 2, 2018
edc2d31
Update brave-extension DEPS ref
bbondy Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ deps = {
"vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@0931529eba33109c6b3946a83295577fea540045",
"vendor/hashset-cpp": "https://github.com/bbondy/hashset-cpp.git@f427324d667d7188a9e0975cca7f3a8c06226b4d",
"vendor/bloom-filter-cpp": "https://github.com/bbondy/bloom-filter-cpp.git@6faa14ececa33badad149c40f94ff9867159681c",
"vendor/brave-extension": "https://github.com/brave/brave-extension.git@7ceb8687f3c9c490a3c5bf99c06412f154ba991b",
"vendor/brave-extension": "https://github.com/brave/brave-extension.git@a632d49d21353790652166066a23876c9f27084e",
"vendor/requests": "https://github.com/kennethreitz/requests@e4d59bedfd3c7f4f254f4f5d036587bcd8152458",
"vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
"vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403",
Expand Down
33 changes: 4 additions & 29 deletions app/brave_strings.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,27 +214,18 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
Not used in Brave. Placeholder to keep resource maps in sync. It expects one argument: <ph name="ARGUMENT">$1</ph>.
</message>
<if expr="is_macosx">
<message name="IDS_MAC_10_678_OBSOLETE_SOON" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using is about to become unsupported.">
Future versions of Brave will no longer support Mac OS X 10.6, 10.7, or 10.8.
</message>
<message name="IDS_MAC_10_678_OBSOLETE_NOW" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using is no longer supported.">
Brave may not function correctly because it is no longer supported on Mac OS X 10.6, 10.7, or 10.8.
<message name="IDS_MAC_10_9_OBSOLETE_NOW" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using is no longer supported.">
Brave may not function correctly because it is no longer supported on Mac OS X 10.9.
</message>
</if>
<if expr="is_win">
<message name="IDS_WIN_XP_VISTA_OBSOLETE_SOON" desc="A message displayed on an at-launch infobar and about:help warning the user that the computer they are using is about to become unsupported.">
Future versions of Brave will no longer support Windows XP or Windows Vista.
</message>
<message name="IDS_WIN_XP_VISTA_OBSOLETE_NOW" desc="A message displayed on an at-launch infobar and about:help warning the user that the computer they are using is no longer supported.">
<message name="IDS_WIN_XP_VISTA_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the computer they are using is no longer supported.">
Brave may not function correctly because it is no longer supported on Windows XP or Windows Vista.
</message>
</if>
<message name="IDS_ACCNAME_APP" desc="The accessible name for the app menu.">
Brave
</message>
<message name="IDS_ACCNAME_TOOLBAR" desc="The accessible name for the application's toolbar.">
main
</message>
<!-- Hung Browser Detector -->
<if expr="is_win">
<message name="IDS_BROWSER_HUNGBROWSER_MESSAGE" desc="Content of the dialog box shown when the browser is hung">
Expand Down Expand Up @@ -407,7 +398,7 @@ Brave is unable to recover your settings.
Uninstall
</message>
</if>
<message name="IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT" desc="More compact text to show in the default browser query infobar.">
<message name="IDS_DEFAULT_BROWSER_INFOBAR_TEXT" desc="Text to show in an infobar when Brave is not the current default browser.">
Brave isn't your default browser.
</message>
<if expr="chromeos">
Expand Down Expand Up @@ -491,11 +482,6 @@ Brave is unable to recover your settings.
</message>
</if>

<!-- Obsolete System info bar -->
<message name="IDS_SYSTEM_OBSOLETE_MESSAGE" desc="Message shown when your OS is no longer supported. This message is followed by a 'Learn more' link.">
Brave has stopped updating and no longer supports this version of your operating system.
</message>

<!-- Brave API keys info bar -->
<message name="IDS_MISSING_GOOGLE_API_KEYS" desc="Message shown when Brave API keys are missing. This message is followed by a 'Learn more' link.">
Brave API keys are missing. Some functionality of Brave will be disabled.
Expand Down Expand Up @@ -765,9 +751,6 @@ Signing in anyway will merge Brave information like bookmarks, history, and othe
<message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain.">
On Mac, passwords may be saved to your Keychain and accessed or synced by other Brave users sharing this OS X account.
</message>
<message name="IDS_AUTOFILL_ADDRESS_BOOK_PROMPT_DESCRIPTION" desc="Text to show in dialog requesting permission to access the user's Address Book contents.">
Details from your contacts can help you fill out forms more quickly in Brave.
</message>
</if>

<message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox that controls whether info the user types into the autofill dialog is saved by chrome.">
Expand Down Expand Up @@ -1139,14 +1122,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>[email protected]</
</message>
</if>

<!-- Framebust / Blocked Redirection intervention message -->
<if expr="is_android">
<!-- TODO(https://crbug.com/754754) only implemented in Android for now. -->
<message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to.">
Brave stopped this site from taking you to
</message>
</if>

<!-- OOM intervention message -->
<if expr="is_android">
<message name="IDS_NEAR_OOM_INTERVENTION_MESSAGE" desc="The message stating that the browser intervened to stop the page using too much memory.">
Expand Down
5 changes: 1 addition & 4 deletions app/resources/chromium_strings_am.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<translation id="9179832504443063758">Brave የክፍት ምንጭ ፈቃዶች</translation>
<translation id="2310890394934209120">Brave ስርዓተ ክወና በተጨማሪ <ph name="BEGIN_LINK_CROS_OSS"/>ክፍት ምንጭ ሶፍትዌር<ph name="END_LINK_CROS_OSS"/> እውን ሊሆን ችሏል።</translation>
<translation id="8372475781172910778">Brave OS የክፍት ምንጭ ፈቃዶች</translation>
<translation id="8851136666856101339">main</translation>
<translation id="5019879183386042809">Brave ነባሪውን አሳሽ ያድርጉ።</translation>
<translation id="662492621463805426">በBrave ስርዓተ ክወና ይጀምሩ</translation>
<translation id="5063987220091207247">Brave OS ይህን ገጽ መክፈት አይችልም።</translation>
Expand All @@ -39,7 +38,6 @@
Brave ቅንብሮችዎን ማስመለስ አልቻለም።</translation>
<translation id="8554809439398012115">Brave ይህን የይለፍ ቃል ከ<ph name="SAVED_PASSWORD_LINK"/> ጋር ያስቀምጠዋል። በቃልዎ ማስታወስ አይጠበቅብዎትም።</translation>
<translation id="5316336629760101484">በBrave የመነጨ ጠንካራ የይለፍ ቃል ይጠቀሙ</translation>
<translation id="2288174659056124771">Brave ነባሪ አሳሽዎ አይደለም።</translation>
<translation id="6715663530666325392">ግላዊነት የተላበሰው የአሳሽ ባህሪዎችዎ ድር ላይ ለማስቀመጥና ከዚያ Brave ካለው ማንኛውም ኮምፒውተር ለመድረስ አመሳስልን ያዋቅሩ።</translation>
<translation id="2708027082363760195">Brave የህትመት ቅድመ እይታ እንዲሰራ የሚያስፈልገው የፒ ዲ ኤፍ ማያውን አያካትትም።</translation>
<translation id="8880183781256147665">ወደ Brave በማከል ላይ...</translation>
Expand All @@ -48,7 +46,6 @@ Brave ቅንብሮችዎን ማስመለስ አልቻለም።</translation>
<translation id="4168372721886011198"><ph name="FILE_NAME"/> አደገኛ ነው፣ ስለዚህ Brave አግዶታል።</translation>
<translation id="89367911614620585">ይህ ፋይል አደገኛ ሊሆን ስለሚችል Brave አግዶታል።</translation>
<translation id="4635174529212032359">{NUM_DOWNLOAD,plural, =1{አንድ ማውረድ አሁን በሂደት ላይ ነው። ማውረዱን መተው እና ከBrave መውጣት ይፈልጋሉ?}one{# ማውረዶች አሁን በሂደት ላይ ናቸው። ማውረዶቹን መተው እና ከBrave መውጣት ይፈልጋሉ?}other{# ማውረዶች አሁን በሂደት ላይ ናቸው። ማውረዶቹን መተው እና ከBrave መውጣት ይፈልጋሉ?}}</translation>
<translation id="5212535894547383850">Brave ማዘመን አቁሟል፣ እና ከአሁን በኋላ ይህን የስርዓተ ክወናዎን ስሪት አይደግፍም።</translation>
<translation id="2339258256897053758">የBrave Software ኤ ፒ አይ ቁልፎች ይጎድላሉ። አንዳንድ የBrave ተግባራት ይሰናከላሉ።</translation>
<translation id="5906655207909574370">የተዘመነ ለመሆን ጥቂት ብቻ ቀርቷል! ዝማኔውን ለማጠናቀቅ መሣሪያዎን ዳግም ያስጀምሩት።</translation>
<translation id="5877064549588274448">ሰርጥ ተለውጧል። ለውጦችን ለመተግበር መሳሪያዎን ዳግም ያስጀምሩ።</translation>
Expand Down Expand Up @@ -119,7 +116,7 @@ Brave ቅንብሮችዎን ማስመለስ አልቻለም።</translation>
<translation id="7808415789955822133">የBrave OS ውል</translation>
<translation id="6686872257969654608">ስለ Brave OS</translation>
<translation id="2280363356796735201">Brave OS ላይ እገዛ ያግኙ</translation>
<translation id="6161696008382683101">Brave Software Payments (ወደ Brave ተቀድቷል)</translation>
<translation id="5253815230176279256">Brave Software Pay (ወደ Brave ተቀድቷል)</translation>
<translation id="7977435741986383568">Brave የአሰሳ ተሞክሮዎን ለማሻሻል የድር አገልግሎቶችን ሊጠቀም ይችላል። እነዚህን አገልግሎቶች በአማራጭነት ሊያሰናክሏቸው ይችላሉ። <ph name="BEGIN_LINK"/>የበለጠ ለመረዳት<ph name="END_LINK"/></translation>
<translation id="6274110506580702455">ወደ Brave መግባት በዚህ መሣሪያ አስተዳዳሪ ተሰናክሏል።</translation>
<translation id="9220324636239049437">ይሄ 1 ንጥል ከዚህ መሣሪያ ይሰርዛል። ውሂብዎን በኋላ ላይ ሰርስረው ለማውጣት እንደ <ph name="USER_EMAIL"/> ሆነው ወደ Brave ይግቡ።</translation>
Expand Down
5 changes: 1 addition & 4 deletions app/resources/chromium_strings_ar.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<translation id="9179832504443063758">‏تراخيص مفتوحة المصدر لـ Brave</translation>
<translation id="2310890394934209120">‏أصبح نظام التشغيل Brave متاحًا من خلال المزيد من <ph name="BEGIN_LINK_CROS_OSS"/>البرامج مفتوحة المصدر<ph name="END_LINK_CROS_OSS"/>.</translation>
<translation id="8372475781172910778">‏تراخيص مفتوحة المصدر لنظام التشغيل Brave</translation>
<translation id="8851136666856101339">main</translation>
<translation id="5019879183386042809">‏جعل Brave المتصفح الافتراضي</translation>
<translation id="662492621463805426">‏البدء في استخدام نظام التشغيل Brave</translation>
<translation id="5063987220091207247">‏يتعذر على نظام التشغيل Brave فتح هذه الصفحة.</translation>
Expand All @@ -37,7 +36,6 @@
يتعذر على Brave استعادة إعداداتك.</translation>
<translation id="8554809439398012115">‏سيحفظ Brave كلمة المرور هذه بواسطة <ph name="SAVED_PASSWORD_LINK"/>، ولن تحتاج إلى تذكّرها.</translation>
<translation id="5316336629760101484">‏استخدام كلمة مرور قوية تم إنشاؤها بواسطة Brave</translation>
<translation id="2288174659056124771">‏ليس Brave متصفحك الافتراضي.</translation>
<translation id="6715663530666325392">‏يمكنك إعداد المزامنة لحفظ ميزات المتصفح المخصصة على الويب والدخول إليها من Brave على أي كمبيوتر.</translation>
<translation id="2708027082363760195">‏لا يتضمن Brave عارض PDF المطلوب لإجراء معاينة الطباعة.</translation>
<translation id="8880183781256147665">‏جارٍ الإضافة إلى Brave...</translation>
Expand All @@ -46,7 +44,6 @@
<translation id="4168372721886011198">‏ملف <ph name="FILE_NAME"/> ضار، لذلك فقد حظره Brave.</translation>
<translation id="89367911614620585">‏قد يكون هذا الملف ضارًا، لذلك فقد حظره Brave.</translation>
<translation id="4635174529212032359">{NUM_DOWNLOAD,plural, =1{‏هناك تنزيل قيد التقدم حاليًا. هل تريد إلغاء التنزيل والخروج من Brave؟}zero{‏هناك # من التنزيلات قيد التقدم حاليًا. هل تريد إلغاء التنزيلات والخروج من Brave؟}two{‏هناك تنزيلان (#) قيد التقدم حاليًا. هل تريد إلغاء التنزيلين والخروج من Brave؟}few{‏هناك # تنزيلات قيد التقدم حاليًا. هل تريد إلغاء التنزيلات والخروج من Brave؟}many{‏هناك # تنزيلاً قيد التقدم حاليًا. هل تريد إلغاء التنزيلات والخروج من Brave؟}other{‏هناك # من التنزيلات قيد التقدم حاليًا. هل تريد إلغاء التنزيلات والخروج من Brave؟}}</translation>
<translation id="5212535894547383850">‏توقف تحديث Brave ولم يعد متوافقًا مع هذا الإصدار من نظام التشغيل.</translation>
<translation id="2339258256897053758">‏مفاتيح واجهة برمجة تطبيقات Brave Software مفقودة. وسيترتب على ذلك توقف بعض وظائف Brave عن العمل.</translation>
<translation id="5906655207909574370">أوشك التحديث على الانتهاء! أعِد تشغيل الجهاز لإنهاء التحديث.</translation>
<translation id="5877064549588274448">تم تغيير القناة. يمكنك إعادة تشغيل الجهاز لتدخل التغييرات حيز التنفيذ.</translation>
Expand Down Expand Up @@ -117,7 +114,7 @@
<translation id="7808415789955822133">‏بنود نظام تشغيل Brave</translation>
<translation id="6686872257969654608">‏حول نظام التشغيل Brave</translation>
<translation id="2280363356796735201">‏الحصول على مساعدة في نظام التشغيل Brave</translation>
<translation id="6161696008382683101">‏Brave Software Payments (تم النسخ إلى Brave)</translation>
<translation id="5253815230176279256">‏Brave Software Pay (تم النسخ إلى Brave)</translation>
<translation id="7977435741986383568">‏قد يستخدم Brave خدمات الويب لتحسين تجربة التصفح. يمكنك تعطيل هذه الخدمات بشكل اختياري. <ph name="BEGIN_LINK"/>مزيد من المعلومات<ph name="END_LINK"/></translation>
<translation id="6274110506580702455">‏عطَّل مشرف هذا الجهاز تسجيل الدخول إلى Brave.</translation>
<translation id="9220324636239049437">‏سيعمل هذا على حذف عنصر واحد من هذا الجهاز. لاسترداد بياناتك لاحقًا، سجّل الدخول إلى Brave كـ <ph name="USER_EMAIL"/>.</translation>
Expand Down
Loading