Skip to content

Commit

Permalink
Merge branch 'master' into FDroid
Browse files Browse the repository at this point in the history
  • Loading branch information
@k3b
k3b committed Aug 29, 2018
2 parents 8bd8c6c + fe75be4 commit ed2d0b9
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 68 deletions.
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/html-pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Features:
علامات(الكلمات الرئيسية)</a>, geo, التقييم, ....
</li><li>Optional Folder-Rule based <a href='https://github.com/k3b/AndroFotoFinder/wiki/AutoProcessing'>autoprocessing</a>:
القيام بمعالجة الصور باعادة التسمية, وضع العلامات, والموقع الجغرافي, والعنوان تلقائيا ... عند نسخهم وقصهم .
</li><li>وضع "خاص" في الصور لاخفائهم من بقية برامج عرض الصور.
</li><li>وضع 'خاص' في الصور لاخفائهم من بقية برامج عرض الصور.
</li><li>In <a href='https://github.com/k3b/APhotoManager/wiki/AppPinning'>Protected/Pinned Mode</a>
الأوامر الحساسة مثل تعديل ونسخ, حذف, مشاركة, الاعدادات, وتغيير اختيار الصور, موقفة فبامكانك اعطاء هاتفك للغير بدون خوف.
</li><li>يمكنه تحمل مجموعة كبيرة من الصور (فوق 20000 صورة و 1000 مجلد).
Expand Down
77 changes: 32 additions & 45 deletions app/src/main/res/values-in/html-pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,50 +23,37 @@
-->
<resources>
<string name="about_content_about"><![CDATA["
<h1> A Photo Manager </h1> dengan &#39;'A Photo Map' di &#39;'AndroFotoFinder&#39;
  <br /> Fitur:
  <ul>
    <li> Dapat menangani koleksi gambar berukuran besar (15000+ gambar dalam 1000+ folder) </li>
    <li> Menggunakan penyedia konten gambar Android. Aplikasi usabla tanpa pemindaian gambar awal. </li>
    <li>
    <a href="https://github.com/k3b/APhotoManager/wiki/Filter-View"> Temukan gambar </a> via
    <ul>
      <li> Quicksearch di Folder, Filename, Imagetitle, Imagedescription, Tags (Kata Kunci) dengan wildcard </li>
      <li> folder (dengan hierarkis
      <a href="https://github.com/k3b/APhotoManager/wiki/Folder-Picker"> pemilih peta </a>) </li>
      <li> wildcard yang cocok dengan folder / nama file </li>
      <li> tanggal </li>
<li> Termasuk / Tag yang Dikecualikan (Kata Kunci) dengan wildcard </li>
      area <li> di
      <a href="https://github.com/k3b/APhotoManager/wiki/geographic-map"> peta geografis </a> (jika gambar memiliki info GPS Exif) </li>
      <li> rating </li>
    </ul> </li>
    <li> Menunjukkan hasilnya bisa digulir
    <a href="https://github.com/k3b/APhotoManager/wiki/Gallery-View"> tampilan galeri </a> dengan
    <ul>
      <li> mendukung beberapa pilihan foto </li>
      <li> operasi file Salin, Pindahkan, Hapus, Bagi, Setel Geo, Tetapkan Tag, Edit Exif </li>
    </ul> </li>
    <li>
    <a href="https://github.com/k3b/APhotoManager/wiki/Image-View"> Foto-detail-lihat </a> dengan
    <ul>
      <li> zoom gambar </li>
      <li> gesek untuk pergi ke gambar berikutnya / sebelumnya </li>
      <li> menunjukkan info gambar yang diperluas (Exif, IPTC, XMP, ICC) </li>
      <li> operasi file Copy, Move, Delete, Rename, Share, Set Geo, Set Tags, Edit Exif </li>
    </ul> </li>
    <li>
    <a href="https://github.com/k3b/APhotoManager/wiki/geographic-map"> peta geografis </a> menunjukkan penanda di tempat foto
    diambil </li>
    <li> Perubahan dalam Foto-Metadata (Exif-Geo, Tag (Kata Kunci), Path, Filename, ...) dapat menjadi
    <a href="https://github.com/k3b/APhotoManager/wiki/sync"> Disinkronkan antara Android dan PC MS Windows </a>. </li>
    <li> Operasi file
      <ul>
        <li> juga akan memperbarui database penyedia konten gambar Android </li>
        <li> perbarui berkas xmp-sespan </li>
      </ul>
    </li>
  </ul>
  <br />
<h1>A Photo Manager</h1>dengan 'A Photo Map' di 'AndroFotoFinder'<br/>
<br/>Fitur:
<ul>
<li>Dapat menangani koleksi gambar berukuran besar (15000+ gambar dalam 1000+ folder)</li>
<li>Menggunakan penyedia konten gambar Android. Aplikasi usabla tanpa pemindaian gambar awal.</li>
<li><a href='https://github.com/k3b/APhotoManager/wiki/Filter-View'>Temukan gambar</a> via <ul>
<li>Quicksearch di Folder, Filename, Imagetitle, Imagedescription, Tags (Kata Kunci) dengan wildcard</li>
<li>folder (dengan hierarkis <a href='https://github.com/k3b/APhotoManager/wiki/Folder-Picker'>pemilih peta</a> )</li>
<li>wildcard yang cocok dengan folder / nama file</li>
<li>tanggal</li>
<li>Termasuk / Tag yang Dikecualikan (Kata Kunci) dengan wildcard</li>
<li>area di <a href='https://github.com/k3b/APhotoManager/wiki/geographic-map'>peta geografis</a> (jika gambar memiliki info GPS Exif)</li>
<li>rating</li>
</ul></li>
<li>Menunjukkan hasilnya bisa digulir <a href='https://github.com/k3b/APhotoManager/wiki/Gallery-View'>tampilan galeri</a> dengan <ul>
<li>mendukung beberapa pilihan foto</li>
<li>operasi file Salin, Pindahkan, Hapus, Bagi, Setel Geo, Tetapkan Tag, Edit Exif</li>
</ul></li>
<li><a href='https://github.com/k3b/APhotoManager/wiki/Image-View'>Foto-detail-lihat</a> dengan <ul>
<li>zoom gambar</li>
<li>gesek untuk pergi ke gambar berikutnya / sebelumnya</li>
<li>menunjukkan info gambar yang diperluas (Exif, IPTC, XMP, ICC)</li>
<li>operasi file Copy, Move, Delete, Rename, Share, Set Geo, Set Tags, Edit Exif</li>
</ul></li>
<li><a href='https://github.com/k3b/APhotoManager/wiki/geographic-map'>peta geografis</a> menunjukkan penanda di tempat foto diambil</li>
<li>Perubahan dalam Foto-Metadata (Exif-Geo, Tag (Kata Kunci), Path, Filename, ...) dapat menjadi <a href='https://github.com/k3b/APhotoManager/wiki/sync'>Disinkronkan antara Android dan PC MS Windows</a>.</li>
<li>Operasi file <ul>
<li>juga akan memperbarui database penyedia konten gambar Android</li>
<li>perbarui berkas xmp-sespan</li>
</ul></li>
</ul>
<br />
"]]></string>
</resources>
18 changes: 9 additions & 9 deletions app/src/main/res/values-it/html-pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,40 @@
-->
<resources>
<string name="about_content_about"><![CDATA["
<h1>A Photo Manager</h1>con &#39;A Photo Map&#39; in &#39;AndroFotoFinder&#39;</h1>
<h1>A Photo Manager</h1>con 'A Photo Map' in 'AndroFotoFinder'</h1>
<br />Caratteristiche:
<ul>
<li>Può gestire grandi collezioni di immagini (15000+ immagini in 1000+ cartelle)</li>
<li>Utilizza il provider di contenuti per immagini di Android&#39;. Nessuna scansione di immagini iniziale necessaria.</li>
<li>Utilizza il provider di contenuti per immagini di Android'. Nessuna scansione di immagini iniziale necessaria.</li>
<li>
<a href="https://github.com/k3b/APhotoManager/wiki/Filter-View">Trova immagini</a> in base a
<a href='https://github.com/k3b/APhotoManager/wiki/Filter-View'>Trova immagini</a> in base a
<ul>
<li>cartelle (con un
<a href="https://github.com/k3b/APhotoManager/wiki/Folder-Picker">Selettore Cartelle</a> gerarchico)</li>
<a href='https://github.com/k3b/APhotoManager/wiki/Folder-Picker'>Selettore Cartelle</a> gerarchico)</li>
<li>caratteri jolly che corrispondo a cartelle/nomi di file</li>
<li>data</li>
<li>area in una
<a href="https://github.com/k3b/APhotoManager/wiki/geographic-map">mappa geografica</a> (se l'immagine ha informazioni Exif GPS)</li>
<a href='https://github.com/k3b/APhotoManager/wiki/geographic-map'>mappa geografica</a> (se l'immagine ha informazioni Exif GPS)</li>
</ul></li>
<li>Mostra i risultati in una
<a href="https://github.com/k3b/APhotoManager/wiki/Gallery-View">galleria</a> scorrevole con
<a href='https://github.com/k3b/APhotoManager/wiki/Gallery-View'>galleria</a> scorrevole con
<ul>
<li>supporto a selezione multipla di foto</li>
<li>operazioni sui file come Copia, Sposta, Elimina, Condividi</li>
</ul></li>
<li>
<a href="https://github.com/k3b/APhotoManager/wiki/Image-View">Dettagli foto</a> con
<a href='https://github.com/k3b/APhotoManager/wiki/Image-View'>Dettagli foto</a> con
<ul>
<li>ingrandimento immagine</li>
<li>scorrimento tra un'immagine e l'altra</li>
<li>informazioni estese sull'immagine (Exif, IPTC, XMP, ICC)</li>
<li>operazioni sui file come Copia, Sposta, Elimina, Rinomina, Condividi</li>
</ul></li>
<li>La
<a href="https://github.com/k3b/APhotoManager/wiki/geographic-map">mappa geografica</a> mostra i luoghi dove sono state scattate le foto</li>
<a href='https://github.com/k3b/APhotoManager/wiki/geographic-map'>mappa geografica</a> mostra i luoghi dove sono state scattate le foto</li>
<li>Le operazioni sui file
<ul>
<li>aggiornano anche il database del provider di contenuti per immagini di Android&#39;</li>
<li>aggiornano anche il database del provider di contenuti per immagini di Android'</li>
<li>aggiornano i file xmp-sidecar</li>
<li>conservano la data del file se Android lo supporta.</li>
</ul>
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/res/values-tr/html-pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,44 @@
-->
<resources>
<string name="about_content_about"><![CDATA["
<h1>A Photo Manager</h1>ve &#39;A Photo Map&#39; &#39;AndroFotoFinder&#39; içerisinde
<h1>A Photo Manager</h1>ve 'A Photo Map' 'AndroFotoFinder' içerisinde
<br />Özellikler:
<ul>
<li>Büyük görüntü yığınlarının üstesinden gelebilir (1000+ dizinde 15000+ görüntü)</li>
<li>Android&#39;in görüntü içerik sağlayıcısını kullanır. Önden görüntü taramaya gerek yoktur.</li>
<li>Android'in görüntü içerik sağlayıcısını kullanır. Önden görüntü taramaya gerek yoktur.</li>
<li>
<a href="https://github.com/k3b/APhotoManager/wiki/Filter-View">Görüntüleri</a> şu yollarla bulur
<a href='https://github.com/k3b/APhotoManager/wiki/Filter-View'>Görüntüleri</a> şu yollarla bulur
<ul>
<li>joker karakterler kullanarak Dizin, Dosya adı, Görüntü başlığı, Görüntü tanımı, Etiketler (Anahtar kelimeler) içerisinde bulun (0.6.0 sürümünde yeni)</li>
<li>dizin (hiyerarşik
<a href="https://github.com/k3b/APhotoManager/wiki/Folder-Picker">dizin seçici ile</a>)</li>
<a href='https://github.com/k3b/APhotoManager/wiki/Folder-Picker'>dizin seçici ile</a>)</li>
<li>joker karakterler ile eşleşen dizin/dosya adı</li>
<li>tarih</li>
<li>joker karakterler ile dahil edilen/hariç tutulan etiketler (anahtar kelimeler) (0.6.0 sürümünde yeni)</li>
<li>konum
<a href="https://github.com/k3b/APhotoManager/wiki/geographic-map">coğrafik haritada</a> (eğer görüntünün GPS Exif bilgisi varsa)</li>
<a href='https://github.com/k3b/APhotoManager/wiki/geographic-map'>coğrafik haritada</a> (eğer görüntünün GPS Exif bilgisi varsa)</li>
</ul></li>
<li>Sonuçları kaydırılabilir
<a href="https://github.com/k3b/APhotoManager/wiki/Gallery-View">galeri görüntüsü</a> olarak aşağıdakilerle destekleyerek gösterir
<a href='https://github.com/k3b/APhotoManager/wiki/Gallery-View'>galeri görüntüsü</a> olarak aşağıdakilerle destekleyerek gösterir
<ul>
<li>çoklu fotoğraf seçimi</li>
<li>dosya işlemleri Kopyala, Taşı, Sil, Paylaş, Jeo Ata, Etiketleri Ata</li>
</ul></li>
<li>
<a href="https://github.com/k3b/APhotoManager/wiki/Image-View">Foto-ayrıntı-görünümü</a>
<a href='https://github.com/k3b/APhotoManager/wiki/Image-View'>Foto-ayrıntı-görünümü</a>
<ul>
<li>görüntü yakınlaştırma</li>
<li>önceki/sonraki görüntüye gitmek için kaydırma</li>
<li>kapsamlı görüntü bilgisi gösterir (Exif, IPTC, XMP, ICC)</li>
<li>dosya işlemleri Kopyala, Taşı, Sil, Yeniden Adlandır, Paylaş, Jeo Ata, Etiketleri Ata</li>
</ul></li>
<li>
<a href="https://github.com/k3b/APhotoManager/wiki/geographic-map">Coğrafik harita</a> fotoğrafların çekildiği yerlerde imleçler gösterir</li>
<a href='https://github.com/k3b/APhotoManager/wiki/geographic-map'>Coğrafik harita</a> fotoğrafların çekildiği yerlerde imleçler gösterir</li>
<li>Fotoğraf üstverilerindeki (Exif-Jeo, Etiketler (Anahtar kelimeler), Yol, Dosya adı, ...) değişiklikler
<a href="https://github.com/k3b/APhotoManager/wiki/sync">Android ve MS Windows PC arasında senkronize edilebilir</a>.(0.6.0 sürümünde yeni)</li>
<a href='https://github.com/k3b/APhotoManager/wiki/sync'>Android ve MS Windows PC arasında senkronize edilebilir</a>.(0.6.0 sürümünde yeni)</li>
<li>Dosya işlemleri
<ul>
<li>ayrıca Android&#39;in görüntü içerik sağlayıcı veritabanını da güncelleştirir</li>
<li>ayrıca Android'in görüntü içerik sağlayıcı veritabanını da güncelleştirir</li>
<li>xmp-sidecar dosyalarını güncelleştirir</li>
</ul>
</li>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-uk/html-pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
теги(ключові слова)</a>, гео, рейтинг, ....
</li><li>Необов'язкове правило-папок <a href='https://github.com/k3b/AndroFotoFinder/wiki/AutoProcessing'>автопроцесс</a>:
Фотографії автоматично перейменовуються і отримують теги, географічні назви, назви ..., коли ви копіюєте/переміщуєте їх.
</li><li>Позначте зображення як "ПРИВАТНЕ", щоб приховати їх від інших додатків-галереї та збирачів зображень.
</li><li>Позначте зображення як 'ПРИВАТНЕ', щоб приховати їх від інших додатків-галереї та збирачів зображень.
</li><li>In <a href='https://github.com/k3b/APhotoManager/wiki/AppPinning'>Protected/Pinned Mode</a>
потенційно небезпечних програм-додатків, які редагують/копіюють/видаляють/спільно використовують/налаштовують/ змінюють вибір зображення"
потенційно небезпечних програм-додатків, які редагують/копіюють/видаляють/спільно використовують/налаштовують/ змінюють вибір зображення'
є вимкненими, тому ти можеш передати свій телефон комусь іншому.
</li><li>Можна обробляти великі колекції зображень (20000+ зображень в 1000+ папках).
</li><li>Використовує контент-провайдер зображення для Android. Немає необхідності сканувати початкове зображення.
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values/donottranslate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,19 @@ this program. If not, see <http://www.gnu.org/licenses/>
<string name="about_translate" translatable="false"><![CDATA["
App and internet homepage available in these languages:<ul>
<li>
ar,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/ar-home">ar</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/de-home">de</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/home">en</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/es-home">es</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/fr-home">fr</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/id-home">id</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/it-home">it</a>,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/ja-home">ja</a>,&nbsp;
nl,&nbsp;pl,&nbsp;
<a href="https://github.com/k3b/APhotoManager/wiki/ro-home">ro</a>
,&nbsp;ru,
&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/tr-home">tr</a>,
&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/uk-home">uk</a>,
&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/zh-CN-home">zh-CN</a>,
&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/zh-TW-home">zh-TW</a>
</li>
Expand Down

0 comments on commit ed2d0b9

Please sign in to comment.