0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge conflicts and merge

Browse source
This commit is contained in:
ashilkn 2024-01-17 10:36:38 +05:30
commit 138274b0f1
14 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/generated/intl/messages_cs.dart generated
View file

@ -34,6 +34,7 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage(
"Edits to location will only be seen within Ente"),
"fileTypes": MessageLookupByLibrary.simpleMessage("File types"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"modifyYourQueryOrTrySearchingFor":
MessageLookupByLibrary.simpleMessage(
"Modify your query, or try searching for"),

1
lib/generated/intl/messages_de.dart generated
View file

@ -898,6 +898,7 @@ class MessageLookup extends MessageLookupByLibrary {
"maps": MessageLookupByLibrary.simpleMessage("Karten"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"),
"mobileWebDesktop":

1
lib/generated/intl/messages_en.dart generated
View file

@ -871,6 +871,7 @@ class MessageLookup extends MessageLookupByLibrary {
"maps": MessageLookupByLibrary.simpleMessage("Maps"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"),
"mobileWebDesktop":

1
lib/generated/intl/messages_es.dart generated
View file

@ -790,6 +790,7 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage("Administrar tu suscripción"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("Mercancías"),
"mobileWebDesktop":

1
lib/generated/intl/messages_fr.dart generated
View file

@ -898,6 +898,7 @@ class MessageLookup extends MessageLookupByLibrary {
"maps": MessageLookupByLibrary.simpleMessage("Cartes"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("Marchandise"),
"mobileWebDesktop":

1
lib/generated/intl/messages_it.dart generated
View file

@ -867,6 +867,7 @@ class MessageLookup extends MessageLookupByLibrary {
"maps": MessageLookupByLibrary.simpleMessage("Mappe"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"),
"mobileWebDesktop":

1
lib/generated/intl/messages_ko.dart generated
View file

@ -34,6 +34,7 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage(
"Edits to location will only be seen within Ente"),
"fileTypes": MessageLookupByLibrary.simpleMessage("File types"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"modifyYourQueryOrTrySearchingFor":
MessageLookupByLibrary.simpleMessage(
"Modify your query, or try searching for"),

1
lib/generated/intl/messages_nl.dart generated
View file

@ -889,6 +889,7 @@ class MessageLookup extends MessageLookupByLibrary {
"maps": MessageLookupByLibrary.simpleMessage("Kaarten"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"),
"mobileWebDesktop":

1
lib/generated/intl/messages_no.dart generated
View file

@ -56,6 +56,7 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage("Ugyldig e-postadresse"),
"kindlyHelpUsWithThisInformation": MessageLookupByLibrary.simpleMessage(
"Vær vennlig og hjelp oss med denne informasjonen"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"modifyYourQueryOrTrySearchingFor":
MessageLookupByLibrary.simpleMessage(
"Modify your query, or try searching for"),

1
lib/generated/intl/messages_pl.dart generated
View file

@ -116,6 +116,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kindlyHelpUsWithThisInformation":
MessageLookupByLibrary.simpleMessage("Pomóż nam z tą informacją"),
"logInLabel": MessageLookupByLibrary.simpleMessage("Zaloguj się"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"moderateStrength": MessageLookupByLibrary.simpleMessage("Umiarkowana"),
"modifyYourQueryOrTrySearchingFor":
MessageLookupByLibrary.simpleMessage(

1
lib/generated/intl/messages_pt.dart generated
View file

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"lostDevice":
MessageLookupByLibrary.simpleMessage("Dispositivo perdido?"),
"manage": MessageLookupByLibrary.simpleMessage("Gerenciar"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"moderateStrength": MessageLookupByLibrary.simpleMessage("Moderada"),
"modifyYourQueryOrTrySearchingFor":
MessageLookupByLibrary.simpleMessage(

1
lib/generated/intl/messages_zh.dart generated
View file

@ -738,6 +738,7 @@ class MessageLookup extends MessageLookupByLibrary {
"maps": MessageLookupByLibrary.simpleMessage("地图"),
"mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
"matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
"memories": MessageLookupByLibrary.simpleMessage("Memories"),
"memoryCount": m31,
"merchandise": MessageLookupByLibrary.simpleMessage("商品"),
"mobileWebDesktop":

1
lib/l10n/intl_zh.arb
View file

@ -410,6 +410,7 @@
"magicSearch": "魔法搜索",
"magicSearchDescription": "请使用我们的桌面应用程序来为您库中的待处理项目建立索引。",
"loadingModel": "正在下载模型...",
"waitingForWifi": "正在等待 WiFi...",
"status": "状态",
"indexedItems": "已索引项目",
"pendingItems": "待处理项目",

3
lib/services/semantic_search/semantic_search_service.dart
View file

@ -151,6 +151,9 @@ class SemanticSearchService {
}
InitializationState getFrameworkInitializationState() {
if (!_hasInitialized) {
return InitializationState.notInitialized;
}
return _mlFramework.initializationState;
}