diff --git a/res/drawable-hdpi-v9/ic_action_settings.png b/res/drawable-hdpi-v9/ic_action_settings.png
new file mode 100644
index 0000000000..86b54f4c71
Binary files /dev/null and b/res/drawable-hdpi-v9/ic_action_settings.png differ
diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000000..999d0f0d8c
Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/res/drawable-ldpi-v9/ic_action_settings.png b/res/drawable-ldpi-v9/ic_action_settings.png
new file mode 100644
index 0000000000..e2c2d517f5
Binary files /dev/null and b/res/drawable-ldpi-v9/ic_action_settings.png differ
diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 0000000000..c290e5902f
Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/res/drawable-mdpi-v9/ic_action_settings.png b/res/drawable-mdpi-v9/ic_action_settings.png
new file mode 100644
index 0000000000..47ef3f4429
Binary files /dev/null and b/res/drawable-mdpi-v9/ic_action_settings.png differ
diff --git a/res/drawable-mdpi/ic_action_settings.png b/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000000..0eb78f7c73
Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 538dde76c1..979d7309ed 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -17,12 +17,33 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see .
-->
-
+
\ No newline at end of file
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 1387877520..e4369d6db3 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -97,6 +97,7 @@
Faili %1$d sisu ei suudeta sünkroniseerida (konflikt %2$d)
Osad kohalikud faili ununesid
%1$d faili %2$s kataloogist ei suudeta kopeerida
+ Alates versioonist 1.3.16 failid, mis on üles laaditud kopeeritakse kohalikku kataloogi %1$s vältimaks andmete kadu vältimaks andmete kadu juhul, kui ühte faili sünkroniseeritakse mitmelt kontolt.\n\nSelle muudatusega seoses kõik failid, mis on üles laetud rakenduse vanemate versioonidega, kopeeriti kataloogi %2$s. Selle tegevuse peatas viga, mis tekkis konto sünkroniseerimise käigus. Sa saad jätta faili(d) nagu nad on ning eemaldata viite %3$s või tõsta faili(d) %1$s kataloogi ja säilitada viite %4$s. \n\nAllpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, millele nad viitavad.
Kausta %1$s pole enam olemas
Tõsta kõik ümber
Kõik failid tõsteti ümber
@@ -160,6 +161,8 @@
Autentimisserveriga ühendumine ...
See server ei toeta seda autentimise viisi
%1$s ei toeta mitme konto kasutamist
+ Server ei tagasta korrektset kasutaja ID-d. Palun kontakteeru administraatoriga.
+ Ei suuda autoriseerida selle serveriga.
Hoia faili ajakohasena
Nimeta ümber
Eemalda
@@ -206,6 +209,8 @@
Saaja:
Allkiri:
Algoritm:
+ Ei suuda kuvada sertifikaati.
+ - Vea kohta puudub info
See on kohahoidja
placeholder.txt
PNG pilt
@@ -233,10 +238,12 @@
ära tee midagi, sa pole võrku ühendatud koheseks üleslaadimiseks
Veateade:
Palun kontrolli oma serveri seadeid, võib-olla on mahulimiit ületatud.
+ Vabandust, server ei toeta jagamist. Palun kontakteeru administraatoriga.
Antud faili või kausta ei saa jagada. Tee kindlaks, et see on olemas
Faili või kausta jagamisel esines viga
Antud faili või kausta jagamist pole võimalik tühistada
Faili või kausta jagamise tühistamisel esines viga
Saada
+ Kopeeri link
Kopeeritud lõikepuhvrisse
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index 169731225f..370fa5d254 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -97,6 +97,7 @@
%1$d fájl szinkronizálása nem sikerült (%2$d ütközés)
Néhány helyi fájlt figyelmen kívül hagytunk
%1$d fájlt nem sikerült a %2$s mappából bemásolni
+ Az 1.3.16 verzió használatakor azok az állományok, amiket erről az eszközről töltenek fel, a helyi %1$s mappába másolódnak be, hogy elkerülhető legyen az adatvesztés, amikor ugyanazt az állományt több résztvevő is szinkronizál.\n\nEmiatt a változás miatt, az e program korábbi változataival feltöltött állományok a %2$s mappába másolódtak. Sajnos azonban egy a szinkronizáció közben fellépő hiba miatt ez a feladat csak részben valósult meg. Két lehetősége van: vagy úgy dönt, hogy maradjanak a fájl(ok) ahol vannak és akkor törölje a %3$s-re mutató linket, vagy pedig helyezze át az állomány(oka)t a %1$s mappába, és tartsa meg a %4$s-re mutató linket.\n\nAz alábbiakban látható a helyi fájl(ok) listája és a távoli fájl(ok) a %5$s mappában, amihez linkelve voltak.
A %1$s mappa már nem létezik
Helyezzük át mindet
Az összes fájlt áthelyeztük
@@ -160,6 +161,8 @@
Kapcsolódás a felhasználóazonosítást végző kiszolgálóhoz...
A kiszolgáló nem támogatja ezt a felhasználóazonosítási módszert
%1$s nem támogat több bejelenkezési jogosultságot
+ A szerver nem megfelelő felhasználói id-t ad vissza, vegye fel a kapcsolatot egy rendszergazdával
+ Nem hiteleíthető a szerverrel szemben
Automatikusan frissítse a fájlokat
Átnevezés
Eltávolítás
@@ -206,6 +209,8 @@
Eddig a dátumig:
Aláírás:
Algoritmus:
+ A tanúsítvány nem megjeleníthető.
+ - Nincs információ a hibáról
Ez egy helyőrző
helyörző.txt
PNG kép
@@ -239,5 +244,6 @@
Nem lehet a megosztást megszüntetni. A mappa vagy fájl nem létezik.
Hiba lépett fel a mappa megosztásának visszavonásakor
Küldjük el
+ Link másolása
Bemásolva a vágólapra
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9db43d1d42..531bd7fc5a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -199,8 +199,8 @@
Verilen:
Veren:
Ortak ad:
- Organizasyon:
- Organizasyon birimi:
+ Kurum:
+ Kuruluş birimi:
Ülke:
Eyalet:
Konum:
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b171c0b09b..8d243fce78 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,137 +1,130 @@
- %1$s Android App
- version %1$s
- Refresh account
- Upload
- Content from other apps
- Files
- Open with
- Create directory
- Settings
- Details
- Send
- General
- More
- Accounts
- Manage Accounts
- App PIN
- Protect your client
- Enable instant uploads
- Instantly upload photos taken by camera
- Enable Logging
- This is used to log problems
- This shows the recorded logs
- Delete History
- Help
- Recommend to a friend
- Feedback
- Imprint
-
+ %1$s Android App
+ version %1$s
+ Refresh account
+ Upload
+ Content from other apps
+ Files
+ Open with
+ New folder
+ Settings
+ Details
+ Send
+ General
+ More
+ Accounts
+ Manage Accounts
+ App PIN
+ Protect your client
+ Enable instant uploads
+ Instantly upload photos taken by camera
+ Enable Logging
+ This is used to log problems
+ Logging History
+ This shows the recorded logs
+ Delete History
+ Help
+ Recommend to a friend
+ Feedback
+ Imprint
+
"Try %1$s on your smartphone!"
"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"
- Check Server
- Server address https://…
- Username
- Password
- New to %1$s?
- Files
- Connect
- Upload
- Choose upload directory:
- No account found
- There are no %1$s accounts on your device. Please setup an account first.
-
- Setup
- Quit
- No content to upload
- No content was received. Nothing to upload.
- %1$s is not allowed to access the shared content
- Uploading
- There are no files in this folder.\nNew files can be added with the \"Upload\"
- menu option.
- Tap on a file to display additional information.
- Size:
- Type:
- Created:
- Modified:
- Download
- Refresh file
- File was renamed to %1$s during upload
- Share link
- Unshare link
- Yes
- No
- OK
- Cancel download
- Cancel upload
- Cancel
- Save & Exit
- Error
- Loading …
- Unknown error
- About
- Change password
- Delete account
- Create account
- Upload from …
- Directory name
- Uploading …
- %1$d%% Uploading %2$s
- Upload succeeded
- %1$s was successfully uploaded
- Upload failed
- Upload of %1$s could not be completed
- Downloading …
- %1$d%% Downloading %2$s
- Download succeeded
- %1$s was successfully downloaded
- Download failed
- Download of %1$s could not be completed
- Not downloaded yet
- Choose account
- Synchronization failed
- Synchronization of %1$s could not be completed
- Invalid password for %1$s
+ Check Server
+ Server address https://…
+ Username
+ Password
+ New to %1$s?
+ Files
+ Connect
+ Upload
+ Choose upload folder:
+ No account found
+ There are no %1$s accounts on your device. Please setup an account first.
+ Setup
+ Quit
+ No content to upload
+ No content was received. Nothing to upload.
+ %1$s is not allowed to access the shared content
+ Uploading
+ There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.
+ Tap on a file to display additional information.
+ Size:
+ Type:
+ Created:
+ Modified:
+ Download
+ Refresh file
+ File was renamed to %1$s during upload
+ Share link
+ Unshare link
+ Yes
+ No
+ OK
+ Cancel download
+ Cancel upload
+ Cancel
+ Save & Exit
+ Error
+ Loading …
+ Unknown error
+ About
+ Change password
+ Delete account
+ Create account
+ Upload from …
+ Folder name
+ Uploading …
+ %1$d%% Uploading %2$s
+ Upload succeeded
+ %1$s was successfully uploaded
+ Upload failed
+ Upload of %1$s could not be completed
+ Downloading …
+ %1$d%% Downloading %2$s
+ Download succeeded
+ %1$s was successfully downloaded
+ Download failed
+ Download of %1$s could not be completed
+ Not downloaded yet
+ Choose account
+ Synchronization failed
+ Synchronization of %1$s could not be completed
+ Invalid password for %1$s
Conflicts found
%1$d kept-in-sync files could not be sync\'ed
- Kept-in-sync files failed
- Contents of %1$d files could not be sync\'ed (%2$d conflicts)
- Some local files were forgotten
- %1$d files out of the %2$s directory could not be copied into
- As of version 1.3.16, files uploaded from this device are copied into the local
- %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to
- this change, all files uploaded in previous versions of this app were copied into the %2$s folder.
- However, an error prevented the completion of this operation during account synchronization. You
- may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s
- directory and retain the link to %4$s.\n\nListed below are the local file(s), and the remote
- file(s) in %5$s they were linked to.
- Folder %1$s does not exist anymore
- "Move all"
- "All files were moved"
- "Some files could not be moved"
- "Local: %1$s"
- "Remote: %1$s"
- There is not space enough to copy the selected files into the %1$s folder.
- Would like to move them into instead?
- Please, insert your App PIN
- Enter your App PIN
- The PIN will be requested every time the app is started
- Please, reenter your App PIN
- Remove your App PIN
- The App PINs are not the same
- Incorrect App PIN
- App PIN removed
- App PIN stored
-
- "%1$s music player"
- "%1$s (playing)"
- "%1$s (loading)"
- "%1$s playback finished"
- No media file found
+ Kept-in-sync files failed
+ Contents of %1$d files could not be sync\'ed (%2$d conflicts)
+ Some local files were forgotten
+ %1$d files out of the %2$s folder could not be copied into
+ As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s folder and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to.
+ Folder %1$s does not exist anymore
+ "Move all"
+ "All files were moved"
+ "Some files could not be moved"
+ "Local: %1$s"
+ "Remote: %1$s"
+ There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead?
+ Please, insert your App PIN
+
+ Enter your App PIN
+ The PIN will be requested every time the app is started
+ Please, reenter your App PIN
+ Remove your App PIN
+ The App PINs are not the same
+ Incorrect App PIN
+ App PIN removed
+ App PIN stored
+
+ "%1$s music player"
+ "%1$s (playing)"
+ "%1$s (loading)"
+ "%1$s playback finished"
+ No media file found
No account provided
File not in a valid account
Unsupported media codec
@@ -179,87 +172,86 @@
Your server is not returning a correct user id, please contact an administrator
Can not authenticate against this server
-
- Keep file up to date
- Rename
- Remove
- "Do you really want to remove %1$s ?"
- "Do you really want to remove %1$s and its contents ?"
- Local only
- Local contents only
- Remove from server
- Remote and local
- "Removal succeeded"
- "Removal failed"
- Enter a new name
- "Local copy could not be renamed; try a different name"
- "Rename could not be completed"
- Remote file could not be checked
- File contents already synchronized
- Directory could not be created
- Forbidden characters: / \\ < > : " | ? *
- Wait a moment
- "Unexpected problem ; please select the file from a different app"
- No file was selected
- Send link to …
-
- Login with oAuth2
- Connecting to oAuth2 server…
-
- The identity of the site could not be verified
- - The server certificate is not trusted
- - The server certificate expired
- - The server certificate valid dates are in the future
- - The URL does not match the hostname in the certificate
- Do you want to trust this certificate anyway?
- The certificate could not be saved
- Details
- Hide
- Issued to:
- Issued by:
- Common name:
- Organization:
- Organizational unit:
- Country:
- State:
- Location:
- Validity:
- From:
+
+ Keep file up to date
+ Rename
+ Remove
+ "Do you really want to remove %1$s ?"
+ "Do you really want to remove %1$s and its contents ?"
+ Local only
+ Local contents only
+ Remove from server
+ Remote and local
+ "Removal succeeded"
+ "Removal failed"
+ Enter a new name
+ "Local copy could not be renamed; try a different name"
+ "Rename could not be completed"
+ Remote file could not be checked
+ File contents already synchronized
+ Folder could not be created
+ Forbidden characters: / \\ < > : " | ? *
+ Wait a moment
+ "Unexpected problem ; please select the file from a different app"
+ No file was selected
+ Send link to …
+
+ Login with oAuth2
+ Connecting to oAuth2 server…
+
+ The identity of the site could not be verified
+ - The server certificate is not trusted
+ - The server certificate expired
+ - The server certificate valid dates are in the future
+ - The URL does not match the hostname in the certificate
+ Do you want to trust this certificate anyway?
+ The certificate could not be saved
+ Details
+ Hide
+ Issued to:
+ Issued by:
+ Common name:
+ Organization:
+ Organizational unit:
+ Country:
+ State:
+ Location:
+ Validity:
+ From:
To:
Signature:
Algorithm:
The certificate could not be shown.
- No information about the error
-
- This is a placeholder
- placeholder.txt
- PNG Image
- 389 KB
- 2012/05/18 12:23 PM
- 12:23:45
-
- Upload pictures via WiFi only
- /InstantUpload
- Update conflict
- Remote file %s is not synchronized with local file. Continuing will replace
- content of file on server.
- Keep both
- Overwrite
- Don\'t upload
-
- Image preview
- This image can not be shown
-
- %1$s could not be copied to %2$s local directory
- Failed InstantUpload
- Failed instant uploads
- Summary of all failed instant uploads
- select all
- retry all selected
- delete all selected from uploadqueue
- retry to upload the image:
- Load more Picrures
- do nothing you are not online for instant upload
+
+ This is a placeholder
+ placeholder.txt
+ PNG Image
+ 389 KB
+ 2012/05/18 12:23 PM
+ 12:23:45
+
+ Upload pictures via WiFi only
+ /InstantUpload
+ Update conflict
+ Remote file %s is not synchronized with local file. Continuing will replace content of file on server.
+ Keep both
+ Overwrite
+ Don\'t upload
+
+ Image preview
+ This image can not be shown
+
+ %1$s could not be copied to %2$s local folder
+ Failed InstantUpload
+ Failed instant uploads
+ Summary of all failed instant uploads
+ select all
+ retry all selected
+ delete all selected from uploadqueue
+ retry to upload the image:
+ Load more Picrures
+ do nothing you are not online for instant upload
Failure Message:
Please check your server configuration,maybe your quota is exceeded.