Skip to content

Commit

Permalink
Merge branch 'master' into v2.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyLB authored Dec 17, 2017
2 parents 57beee3 + a8650ba commit 6093eb2
Show file tree
Hide file tree
Showing 52 changed files with 4 additions and 2 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Screenshots/iPhone 5.8-inch/Image 1.png
Binary file added Assets/Screenshots/iPhone 5.8-inch/Image 2.png
Binary file added Assets/Screenshots/iPhone 5.8-inch/Image 3.png
Binary file added Assets/Screenshots/iPhone 5.8-inch/Image 4.png
Binary file added Assets/Screenshots/iPhone 5.8-inch/Image 5.png
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ For video upload using your iOS device, you need the plugin on your Piwigo serve
Your Piwigo server generates a poster of each uploaded video with [FFmpeg](http://www.ffmpeg.org) (or [avconv](https://libav.org/documentation/avconv.html) from [Libdav](https://libav.org)). If neither of these solutions is installed, the upload will fail. From to our experience, we recommand to install the 'true' [FFmpeg](http://www.ffmpeg.org).

## Translations
Piwigo Mobile is available in the following languages since [v2.1](https://github.com/Piwigo/Piwigo-Mobile/milestone/5?closed=1): [Danish](https://itunes.apple.com/dk/app/piwigo/id472225196?mt=8), [English (U.S.)](https://itunes.apple.com/us/app/piwigo/id472225196?mt=8), [French](https://itunes.apple.com/fr/app/piwigo/id472225196?mt=8) and [Polish](https://itunes.apple.com/pl/app/piwigo/id472225196?mt=8).
Piwigo Mobile is available from the [App Store](https://itunes.apple.com/app/piwigo/id472225196?mt=8) in the following languages:
- [Swedish](https://crowdin.com/project/piwigo-mobile/sv-SE#) since [v2.1.4](https://github.com/Piwigo/Piwigo-Mobile/milestone/10?closed=1),
- [Danish](https://crowdin.com/project/piwigo-mobile/da#), [English (U.S.)](https://crowdin.com/project/piwigo-mobile), [French](https://crowdin.com/project/piwigo-mobile/fr#) and [Polish](https://crowdin.com/project/piwigo-mobile/pl#) since [v2.1](https://github.com/Piwigo/Piwigo-Mobile/milestone/5?closed=1).

Help us to translate Piwigo Mobile on [Crowdin](https://crowdin.com/project/piwigo-mobile)!

Expand Down
2 changes: 1 addition & 1 deletion piwigo/Resources/fr.lproj/AppStore.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

"feedback" = "Des suggestions ou des questions ?\nPiwigo offre un service technique gratuit sur son forum : %@ et nous serons heureux de vous répondre.";

"promotional_text" = "Votre photothèque Piwigo gratuite à portée de main!";
"promotional_text" = "Votre photothèque Piwigo gratuite à porté de main!";

0 comments on commit 6093eb2

Please sign in to comment.