misc fixes

This commit is contained in:
linsui 2021-08-27 17:41:32 +08:00
parent 06fb6d61ad
commit b3988e41aa
91 changed files with 83 additions and 274 deletions

View file

@ -269,7 +269,7 @@ fdroid build:
chown -R vagrant $VAGRANT_HOME;
$fdroid fetchsrclibs $build --verbose;
$fdroid build --verbose --test --scan-binary --on-server --no-tarball $build;
rm -rf build/$build;
rm -rf build;
./tools/build-contains-signatures.py $build || continue;
apt-get install sudo;
$fdroid publish --verbose $build;

View file

@ -303,7 +303,8 @@ Builds:
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y g++
- apt-get install -y g++ openjdk-11-jdk
- update-alternatives --auto java
gradle:
- fdroid
rm:

View file

@ -22,6 +22,7 @@ Builds:
- versionName: '1.31'
versionCode: 31
disable: build failed
commit: '1.31'
timeout: 14400
subdir: demo
@ -75,7 +76,7 @@ Builds:
- cd ./unused_packages/
- ln -s ../packages_orig/GENERAL.mk
- cd ./009_flwm/
- make
- make > /dev/null
- popd
- cp -rf $$nwrkbiz-static-build$$/3rdParty/linux_aarch64_musl/bin/flwm ./src/main/jniLibs/arm64-v8a/libwm.so
- cp -rf $$nwrkbiz-static-build$$/3rdParty/linux_armhf_musl/bin/flwm ./src/main/jniLibs/armeabi-v7a/libwm.so

View file

@ -87,6 +87,7 @@ Builds:
- versionName: 2.4.0
versionCode: 2400
disable: dose not verify
commit: c0b40a9d5f76e6847b4cf0add404a777a3ef8433
subdir: verifier
gradle:

View file

@ -87,6 +87,7 @@ Builds:
- versionName: 2.4.0
versionCode: 2400
disable: dose not verify
commit: c0b40a9d5f76e6847b4cf0add404a777a3ef8433
subdir: wallet
gradle:

View file

@ -44,6 +44,10 @@ Builds:
versionCode: 6
commit: dfcd1df4e1d347aa6284a0aed8339a52ee7f710e
subdir: smartautoclicker
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes

View file

@ -119,6 +119,7 @@ Builds:
subdir: app
gradle:
- standard
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
scandelete:
- library
- libs.prebuilt

View file

@ -60,17 +60,23 @@ Builds:
versionCode: 15
commit: e6b36189ac48689300cbcbf6cf67a4351a5ddcd7
subdir: app
output: build/app/outputs/apk/release/app-release-unsigned.apk
output: build/app/outputs/flutter-apk/app-release.apk
srclibs:
- flutter@2.0.5
- flutter@2.5.0-5.2.pre
rm:
- app/ios
- app/linux
- app/macos
- app/test
- app/web
- app/windows
build:
- $$flutter$$/bin/flutter config --no-analytics
- $$flutter$$/bin/flutter packages pub get
- $$flutter$$/bin/flutter build apk
MaintainerNotes: Builds with Flutter beta channel.
AutoUpdateMode: Version
UpdateCheckMode: Tags ^v.*$
UpdateCheckData: app/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s'(.+)\+

View file

@ -24,6 +24,10 @@ Builds:
versionCode: 3
commit: 6cb75e3ac3a5687ac6be750c44d50fa70d6fbb1a
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes

View file

@ -119,19 +119,15 @@ Builds:
gradle:
- fdroid
- versionName: 4.0.24
versionCode: 40002401
commit: ff4ba504236780720f73395b0938cb00f0488732
subdir: app
submodules: true
gradle:
- fdroid
- versionName: 4.0.25
versionCode: 40002501
commit: 2d4c6f3e5617c14871a08028249c5d79c4db26f9
subdir: app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- fdroid

View file

@ -3414,6 +3414,10 @@ Builds:
commit: 79bf17fe245317610b3417cd301bc31c1d8107b6
subdir: app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- nonRoot
srclibs:

View file

@ -27,6 +27,10 @@ Builds:
versionCode: 10026800
commit: deb6cf51dc885193c14ea7caf90a9c369264f2b5
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- zcashmainnet
ndk: r21b

View file

@ -879,19 +879,14 @@ Builds:
scandelete:
- android/libs/*
- versionName: 1.0.0
versionCode: 566
commit: 1f296a2d1088ad35421f5f8040a9f0803fa46ba8
subdir: android
gradle:
- yes
scandelete:
- android/libs/*
- versionName: 1.0.1
versionCode: 570
commit: 07ad3fcc384d9bdb3679a979dfa5e1423bfef009
subdir: android
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes
scandelete:

View file

@ -487,6 +487,7 @@ Builds:
- versionName: 1.15.3-t1925fb584-g7aa8ae9a47e
versionCode: 65
disable: https://github.com/tailscale/tailscale/issues/2603
commit: d3edb004e3558a5ed286975caf5701f2f96dbc10
subdir: android
sudo:

View file

@ -1840,6 +1840,10 @@ Builds:
versionCode: 616
commit: e62fdc22187264577167c7c558c3b2f984f983c9
subdir: android
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes
rm:

View file

@ -1,28 +1,12 @@
Categories:
- Science & Education
License: Apache-2.0
AuthorName: Wilhelm Stein
SourceCode: https://github.com/wistein/TourCount
IssueTracker: https://github.com/wistein/TourCount/issues
Changelog: https://github.com/wistein/TourCount/blob/HEAD/docs/History.md
AutoName: TourCount
Description: |-
TourCount is an application that supports species-specific counting of
butterflies in nature.
The integrated database is organized according to a tour in nature with its
expected butterfly species. That means, a new (importable and prepared) basic
database instance will be used per tour.
Databases can be individually created and adapted regarding meta data and
expected butterfly species. The recorded data (counts, data and remarks) may
either be read on the smartphone or exported in SQLite- or CSV-format and
transferred to a PC for your own processing, e.g. by importing a csv-file into
MS Excel.
The app demands for storage access permit which is needed for im-/exporting the
counting data, GPS permit for location info per count and the permit to prevent
the phone from sleeping (to control the counting screen when used under Android
5.0.1 or newer).
RepoType: git
Repo: https://github.com/wistein/TourCount.git
@ -275,6 +259,10 @@ Builds:
versionCode: 326
commit: cb4e500513058fe8cc2789f79f82c64db4ca04cc
subdir: tourcount
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes

View file

@ -1 +0,0 @@
Artenspezifische Zählung von Schmetterlingen in der Natur

View file

@ -1 +0,0 @@
Species-specific counting of butterflies in nature

View file

@ -1 +0,0 @@
Comptage par espèce des papillons dans la nature

View file

@ -1 +0,0 @@
ספירת פרפרים בטבע עם מיון לזנים

View file

@ -1 +0,0 @@
Specyficzne dla danego gatunku liczenie motyli w przyrodzie

View file

@ -1 +0,0 @@
Contador de espécies selvagens de borboletas

View file

@ -1 +0,0 @@
Contagem de borboletas por espécie na natureza

View file

@ -1 +0,0 @@
Contagem de borboletas por espécie na natureza

View file

@ -1 +0,0 @@
Numărarea specifică a speciilor de fluturi în natură

View file

@ -1 +0,0 @@
Подсчет бабочек в природе по видам

View file

@ -1 +0,0 @@
Doğadaki kelebeklerin türe özgü sayımı

View file

@ -1 +0,0 @@
Специфічний для виду підрахунок метеликів в природі

View file

@ -1 +0,0 @@
自然界中蝴蝶的物种特定计数

View file

@ -1,18 +1,12 @@
Categories:
- Science & Education
License: Apache-2.0
AuthorName: Wilhelm Stein
SourceCode: https://github.com/wistein/TransektCount
IssueTracker: https://github.com/wistein/TransektCount/issues
Changelog: https://github.com/wistein/TransektCount/blob/HEAD/docs/History.md
AutoName: TransektCount
Description: |-
TransektCount is an application that supports transect counters in nature
preserving projects according to the Butterfly Monitoring Scheme methodology. It
allows a species-specific counting per transect section.
The integrated database is organized according to a single transect inspection.
That means, a new (prepared and importable) basic database instance will be used
per inspection.
RepoType: git
Repo: https://github.com/wistein/TransektCount.git
@ -307,6 +301,10 @@ Builds:
versionCode: 328
commit: 4fee6987aeffb724aeddfa0d9fc296cd1c32866c
subdir: transektcount
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes

View file

@ -1 +0,0 @@
Transektzählung gemäß der Methodik des Schmetterling-Monitoring-Programms

View file

@ -1 +0,0 @@
Transect counting according to the Butterfly Monitoring Scheme methodology

View file

@ -1 +0,0 @@
Comptage des transects selon la méthodologie Butterfly Monitoring Scheme

View file

@ -1 +0,0 @@
ספירת transect בהתאם למתודולגיית סכמת מעקב אחר פרפרים

View file

@ -1 +0,0 @@
Transektowy licznik oparty na metodologii monitorowania motyli UKBMS

View file

@ -1 +0,0 @@
Contagem de transectos segundo a metodologia do Butterfly Monitoring Scheme

View file

@ -1 +0,0 @@
Contagem de transectos, metodologia do Sistema de Monitorização de Borboletas

View file

@ -1 +0,0 @@
Contagem de transectos, metodologia do Sistema de Monitorização de Borboletas

View file

@ -1 +0,0 @@
Numărarea transectelor conform cu metodologia Butterfly Monitoring Scheme

View file

@ -1 +0,0 @@
Подсчет трансект в соответствии с методологией схемы мониторинга бабочек

View file

@ -1 +0,0 @@
Kelebek İzleme Düzeni yöntembilimine göre kesit sayımı

View file

@ -1 +0,0 @@
Підрахунок розрізів за методологією Butterfly Monitoring Scheme

View file

@ -1 +0,0 @@
根据蝴蝶监测方案方法进行样带计数

View file

@ -22,17 +22,6 @@ Builds:
gradle:
- yes
- versionName: 0.4.0
versionCode: 4
commit: 258917a364df8e340d95ab8a0b9291e9312e54eb
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes
- versionName: 0.4.1
versionCode: 5
commit: 8493cd986e0ad38e5fcdc815b61e3c8cad310982

View file

@ -437,6 +437,7 @@ Builds:
- versionName: 12.0.11-aosp
versionCode: 120011
disable: DOES NOT VERIFY
commit: v12.0.11
subdir: oeffi
submodules: true

View file

@ -172,6 +172,10 @@ Builds:
versionCode: 26
commit: 2f28ec35f1a7df1f16fa74caccb939a6ae7d00d5
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes

View file

@ -50,6 +50,10 @@ Builds:
- versionName: 2.11.0
versionCode: 23
commit: 9a49a0bf2eb67f3492122b78777df01637bb92e4
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- offline

View file

@ -146,6 +146,10 @@ Builds:
- versionName: 2.11.0
versionCode: 23
commit: 9a49a0bf2eb67f3492122b78777df01637bb92e4
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- full

View file

@ -9,38 +9,6 @@ Translation: https://zamojski.oneskyapp.com/collaboration/
Changelog: https://github.com/zamojski/TowerCollector/releases
AutoName: Tower Collector
Description: |-
Tower Collector gives you opportunity to contribute in OpenCellID.org and
Mozilla Location Services projects by uploading GPS locations of
GSM/UMTS/LTE/CDMA cell towers from your area. The measurements help map
the extent of mobile phone network coverage. You can use the app to collect
data for personal purposes and export them to CSV or GPX files.
Some features:
* specially optimized GPS parameters to reduce battery drain
* upload to OpenCellID.org and Mozilla Location Services (MLS) projects
* export to SD card as CSV or GPX
* ad-free, forever!
The OpenCellID.org project goal is to create a worldwide open source
database of mobile cell locations. Tower Collector gives you opportunity to
contribute in OpenCellID project by uploading cell towers locations from
your area. Collected data can be used to quickly locate devices without
enabling GPS.
Mozilla Location Services (MLS) is an open source project, aiming to create
a worldwide database of wireless network infrastructure identifiers (cell
towers, WiFi access points, Bluetooth beacons) correlated with GPS
locations. Aggregated cell location set is available under the public
domain "Creative Commons (CC-0)" license.
Please help me translate it to other languages, visit
<a href="http://i18n.zamojski.info/">i18n.zamojski.info</a>
This application does not collect, store or send any information which can
be used to directly identify user, device which is being used or any other
personal information.
BUG REPORTS AND FEATURE REQUEST VIA EMAIL OR GITHUB ISSUES PLEASE.
RepoType: git
Repo: https://github.com/zamojski/TowerCollector

View file

@ -1 +0,0 @@
انضم للمجتمع واجمع احداثيات ابراج شبكة الهاتف في منطقتك

View file

@ -1 +0,0 @@
Der Community beitreten und Mobilfunkmast-Standorte der Region sammeln

View file

@ -1 +0,0 @@
Join the community and collect cell towers locations from your area

View file

@ -1 +0,0 @@
Kolekti (kaj kunhavigi) poziciojn de poŝtelefonajn mastojn en via ĉirkaŭaĵo

View file

@ -1 +0,0 @@
Únase a la comunidad y localice las torres de telefonía movil de su zona

View file

@ -1 +0,0 @@
Collectez les emplacements des pylônes de téléphonie cellulaire de votre région

View file

@ -1 +0,0 @@
מזמינים אותך לקהילה כדי לאסוף אנטנות בסביבתך

View file

@ -1 +0,0 @@
Unisciti alla community e raccogli la posizione dei ripetitori della tua zona

View file

@ -1 +0,0 @@
Ta del i gemenskapen og samle inn telemastplasseringer fra ditt område

View file

@ -1 +0,0 @@
Dołącz do społeczności i zbieraj lokalizacje wież komórkowych ze swojego obszaru

View file

@ -1 +0,0 @@
Junte-se à comunidade e colete locais de torres de celular na sua área

View file

@ -1 +0,0 @@
Participe na comunidade e recolha locais de torres de telemóveis de sua área

View file

@ -1 +0,0 @@
Participe na comunidade e recolha locais de torres de telemóveis de sua área

View file

@ -1 +0,0 @@
Intră în echipă și adună locațiile turnurilor de telefonie mobilă din zona ta

View file

@ -1 +0,0 @@
Присоединяйтесь к сообществу и собирайте локации вышек мобильной связи в округе

View file

@ -1 +0,0 @@
Topluluğa katılın ve bölgenizdeki baz istasyonu kulelerinin konumlarını toplayın

View file

@ -1 +0,0 @@
Приєднуйтесь до спільноти і збирайте місця вишок стільникового зв'язку в окрузі

View file

@ -1 +0,0 @@
Tham gia cộng đồng và thu thập vị trí tháp di động từ khu vực của bạn

View file

@ -1 +0,0 @@
加入社区,收集您所在地区的手机信号塔位置

View file

@ -1 +0,0 @@
加入社群,開始收集您附近的手機基地台位置

View file

@ -45,6 +45,10 @@ Builds:
versionCode: 20200
commit: 9eb1afed23765a89b555358f06685d164373141f
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- others

View file

@ -31,6 +31,7 @@ Builds:
- versionName: 1.4.3
versionCode: 31
disable: https://github.com/FredJul/Warmd/issues/44
commit: 71c3dd36bf0ba2f6fa460add496ed67ad468fb9f
output: build/app/outputs/flutter-apk/app-release.apk
srclibs:

View file

@ -1403,9 +1403,11 @@ Builds:
scandelete:
- app/src/main/assets/fossil_hr
- external/fossil-hr-watchface/build/files/icons
- GBDaoGenerator/build
build:
- cd ../external
- ./build_fossil_hr_watchface.sh
ndk: r21e
AutoUpdateMode: Version %v
UpdateCheckMode: Tags

View file

@ -10,21 +10,6 @@ Translation: https://github.com/gateship-one/odyssey/blob/HEAD/CONTRIBUTING.md#c
Changelog: https://github.com/gateship-one/odyssey/blob/HEAD/CHANGELOG.md
AutoName: Odyssey
Description: |-
Music player that is optimized for speed (even with large music libraries). On
the other hand the players is designed with the Material Design Guidelines in
mind and we try to follow them as close as possible.
Its main features are a fast music library (artist, album, file browser).
A basic playlist management functionality is also part of this player.
To be able to play audio books and podcast this player has a bookmark feature,
that allows you to save your playlist and the playback position, to resume your
audio book/podcast later.
For more comfort you are able to use the launcher widget to have quick control
over your music playback.
RepoType: git
Repo: https://github.com/gateship-one/odyssey

View file

@ -1 +0,0 @@
Musikdateien anhören

View file

@ -1 +0,0 @@
Listen to music files

View file

@ -1 +0,0 @@
Écouter des fichiers musicaux

View file

@ -1 +0,0 @@
האזנה לקובצי מוזיקה

View file

@ -1 +0,0 @@
Ascoltare i file musicali

View file

@ -1 +0,0 @@
Spel av musikkfiler

View file

@ -1 +0,0 @@
Słuchaj plików muzycznych

View file

@ -1 +0,0 @@
Ouça os arquivos de música

View file

@ -1 +0,0 @@
Ouvir ficheiros de música

View file

@ -1 +0,0 @@
Ouvir ficheiros de música

View file

@ -1 +0,0 @@
Ascultați fișiere muzicale

View file

@ -1 +0,0 @@
Прослушивание музыкальных файлов

View file

@ -1 +0,0 @@
Müzik dosyalarını dinleyin

View file

@ -1 +0,0 @@
Прослуховування музичних файлів

View file

@ -1 +0,0 @@
听音乐文件

View file

@ -9,24 +9,6 @@ IssueTracker: https://gitlab.com/midori-web/midori-android/-/issues
Changelog: https://gitlab.com/midori-web/midori-android/-/tags
AutoName: Midori Lite
Description: |-
Midori is a lightweight yet powerful web browser which runs just as well on little embedded computers named for delicious pastries as it does on beefy machines with a core temperature exceeding that of planet earth. And it looks good doing that, too. Oh, and of course it´s free software. And for Android.
<b>Privacy out of the box</b>
* Adblock filter list support
* Private browsing
* Manage cookies and scripts
<b>Productivity features</b>
* Opens many Tabs
* History Manage
* Download Manage
* Bookmark
* Dark Theme
* Share Content
* and much more
<b>Note:</b> <i>Midori</i> does send crash reports without asking you first.
RepoType: git
Repo: https://gitlab.com/midori-web/midori-android.git
@ -64,21 +46,12 @@ Builds:
- scMain
prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
- versionName: 1.1.6.3
versionCode: 35
commit: f743801c4f8c851a1aa8a4beab0c00316ed27cbf
subdir: app
gradle:
- scMain
prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
- versionName: '1.7'
versionCode: 36
commit: 171bc5c8dbcc9a7a91b8bd421b3860f53d1796bf
subdir: app
gradle:
- scMain
prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
- stable
MaintainerNotes: Tracking AntiFeature as the app sends bug reports without consent
(d#2317)

View file

@ -41,6 +41,10 @@ Builds:
versionCode: 7
commit: d311c27efdbbc3c8f30468b3e62f5def7660c6b1
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle:
- yes

View file

@ -331,84 +331,6 @@ Builds:
- make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
ndk: r22b
- versionName: '7.12'
versionCode: 133
commit: 7688ae0689c0ede72893c8b609f52c5f164fabe4
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick
- pushd build/srclib/cpython
- ./configure
- make -j`nproc`
- make altinstall
- popd
output: output/ANDROID7NEON/opt/build/unsigned.apk
srclibs:
- cpython@v3.9.6
prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
> /dev/null
scandelete:
- android/ioio
- android/UsbSerial/usbserial/eclipse_lib
build:
- python3.9 -m venv .
- source bin/activate
- make TARGET=ANDROID DEBUG=n TESTING=n -j`nproc`
ndk: r22b
- versionName: '7.13'
versionCode: 134
commit: 3ab3250ba9c276d6e214bcd507bb8a2c0808ea3f
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick
- pushd build/srclib/cpython
- ./configure
- make -j`nproc`
- make altinstall
- popd
output: output/ANDROID7NEON/opt/build/unsigned.apk
srclibs:
- cpython@v3.9.6
prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
> /dev/null
scandelete:
- android/ioio
- android/UsbSerial/usbserial/eclipse_lib
build:
- python3.9 -m venv .
- source bin/activate
- make TARGET=ANDROID DEBUG=n TESTING=n -j`nproc`
ndk: r22b
- versionName: '7.14'
versionCode: 135
commit: 8e6c261301386ece7c71181529ce072a111a502a
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick
- pushd build/srclib/cpython
- ./configure
- make -j`nproc`
- make altinstall
- popd
output: output/ANDROID7NEON/opt/build/unsigned.apk
srclibs:
- cpython@v3.9.6
prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
> /dev/null
scandelete:
- android/ioio
- android/UsbSerial/usbserial/eclipse_lib
build:
- python3.9 -m venv .
- source bin/activate
- make TARGET=ANDROID DEBUG=n TESTING=n -j`nproc`
ndk: r22b
- versionName: '7.15'
versionCode: 136
commit: ac7bf8c261fcc16b842ad3e3e6500b199ccd0ba5
@ -421,7 +343,7 @@ Builds:
- make -j`nproc`
- make altinstall
- popd
output: output/ANDROID7NEON/opt/build/unsigned.apk
output: output/ANDROID/opt/build/unsigned.apk
srclibs:
- cpython@v3.9.6
prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'