[submodule "owncloud-android-library"]
path = owncloud-android-library
url = git://github.com/owncloud/android-library.git
- branch = develop
+ branch = master
[submodule "ocdoc"]
path = user_manual/ocdoc
url = https://github.com/owncloud/documentation
Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement].
### Guidelines
-* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code.
-* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement].
+* Contribute your code in the branch 'master'. It will give us a better chance to test your code before merging it with stable code.
+* For your first contribution, start a pull request on master and send us the signed [Contributor Agreement][agreement].
* Keep on using pull requests for your next contributions although you own write permissions.
[agreement]: http://owncloud.org/about/contributor-agreement/
-### 1. Fork and download android/develop repository:
+### 1. Fork and download android/master repository:
NOTE: You must have the git installation folder in your environment variable PATH to perform the next operations.
* In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner.
* In a command line prompt, clone your new repo: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
* Move to the project folder with ```cd android```.
-* Checkout the remote branch 'develop' in your own local branch: ```git checkout -b develop remotes/origin/develop```.
-* Pull any changes from your remote branch 'develop': ```git pull origin develop```
+* Checkout the remote branch 'master' in your own local branch: ```git checkout -b master remotes/origin/master```.
+* Pull any changes from your remote branch 'master': ```git pull origin master```
* Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
-* Make sure to get the latest changes from official android/develop branch: ```git pull upstream develop```
+* Make sure to get the latest changes from official android/master branch: ```git pull upstream master```
### 7. Create pull request:
* Commit your changes locally: "git commit -a"
* Push your changes to your GitHub repo: "git push"
* Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request
-* Click "Edit" and set "base:develop"
-* Again, click "Edit" and set "compare:develop"
* Enter description and send pull request.
### 8. Create another pull request:
-To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/develop.
+To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/master.
* git fetch upstream
-* git checkout -b my_new_develop_branch upstream/develop
-* If you want to rename that branch later: "git checkout -b my_new_develop_branch_with_new_name"
-* Push branch to server: "git push -u origin name_of_local_develop_branch"
+* git checkout -b my_new_master_branch upstream/master
+* If you want to rename that branch later: "git checkout -b my_new_master_branch_with_new_name"
+* Push branch to server: "git push -u origin name_of_local_master_branch"
* Use GitHub to issue PR
The app performs file synchronization with an ownCloud server. Other ownCloud features may be added in the future, but they are not a priority right now.
## Build Status on
-Git master: 
+Git master: 
-Git develop: 
+Git stable: 
## Development
### Contributing
Please see [Contribution Guidelines](https://owncloud.org/contribute/). Fork this repository and contribute back using
-[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['develop'](https://github.com/owncloud/android/tree/develop) branch.
+[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['master'](https://github.com/owncloud/android/tree/master) branch.
* Open a terminal and go on with the next steps in it.
* Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
* Move to the project folder with ```cd android```.
-* Checkout the remote branch 'develop' in your own local branch 'develop': ```git checkout -b develop remotes/origin/develop```.
-* Pull any changes from your remote branch 'develop': ```git pull origin develop```
+* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b master remotes/origin/master```.
+* Pull any changes from your remote branch 'master': ```git pull origin master```
* Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
-* Make sure to get the latest changes from official android/develop branch: ```git pull upstream develop```
+* Make sure to get the latest changes from official android/master branch: ```git pull upstream master```
At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe the existing alternatives.
-Subproject commit c8f6e5ad57ee27fdac39c7b14eb6ab1942a92d49
+Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019
<string name="instant_upload_on_wifi">Odesílat obrázky pouze přes WiFi</string>
<string name="instant_video_upload_on_wifi">Nahrávat videa pouze přes WiFi</string>
<string name="instant_upload_path">/InstantUpload</string>
+ <string name="conflict_title">Konflikt souboru</string>
+ <string name="conflict_message">Které soubory chcete ponechat? Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.</string>
<string name="conflict_keep_both">Ponechat oba</string>
+ <string name="conflict_use_local_version">Použít lokální verzi</string>
+ <string name="conflict_use_server_version">Použít serverovou verzi</string>
<string name="preview_image_description">Náhled obrázku</string>
<string name="preview_image_error_unknown_format">Obrázek nelze zobrazit</string>
<string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
<string name="instant_upload_on_wifi">Lähetä kuvat vain WiFi-verkossa</string>
<string name="instant_video_upload_on_wifi">Lähetä videot vain wifi-yhteydellä</string>
<string name="instant_upload_path">/InstantUpload</string>
+ <string name="conflict_title">Tiedoston ristiriita</string>
+ <string name="conflict_message">Mitkä tiedostot haluat säilyttää? Jos valitset kummatkin versiot, paikallisen version tiedoston nimeen lisätään numero.</string>
<string name="conflict_keep_both">Säilytä molemmat</string>
+ <string name="conflict_use_local_version">Käytä paikallista versiota</string>
+ <string name="conflict_use_server_version">Käytä palvelimen versiota</string>
<string name="preview_image_description">Kuvan esikatselu</string>
<string name="preview_image_error_unknown_format">Tätä kuvaa ei voi näyttää</string>
<string name="prefs_instant_upload_path_title">Lähetyspolku</string>
<string name="shared_subject_header">jaettu</string>
<string name="with_you_subject_header">kanssasi</string>
<string name="subject_token">%1$s jakoi kohteen \"%2$s\" kanssasi</string>
+ <string name="saml_subject_token">\"%1$s\" on jaettu kanssasi</string>
<string name="auth_refresh_button">Päivitä yhteys</string>
<string name="auth_host_address">Palvelimen osoite</string>
<string name="common_error_out_memory">Muistia ei ole riittävästi</string>
<string name="prefs_log_summary">Ez használható a problémák naplózásához</string>
<string name="prefs_log_title_history">Naplózás előzménye</string>
<string name="prefs_log_summary_history">Ez megjeleníti a rögzitett eseményeket</string>
- <string name="prefs_log_delete_history_button">Elözmények törlése</string>
+ <string name="prefs_log_delete_history_button">Előzmények törlése</string>
<string name="prefs_help">Súgó</string>
<string name="prefs_recommend">Ajánlja egy barátjának</string>
<string name="prefs_feedback">Visszajelzés</string>
<string name="instant_video_upload_on_wifi">Carica i video solo tramite WiFi</string>
<string name="instant_upload_path">/InstantUpload</string>
<string name="conflict_keep_both">Mantieni entrambi</string>
+ <string name="conflict_use_local_version">Usa la versione locale</string>
+ <string name="conflict_use_server_version">Usa la versione del server</string>
<string name="preview_image_description">Anteprima dell\'immagine</string>
<string name="preview_image_error_unknown_format">Questa immagine non può essere mostrata</string>
<string name="error__upload__local_file_not_copied">%1$s non può essere copiato nella cartella locale %2$s</string>
<string name="instant_upload_on_wifi">Fazer envio de fotos somente via WiFi</string>
<string name="instant_video_upload_on_wifi">Enviar vídeos somente via WiFi</string>
<string name="instant_upload_path">/Upload instantâneo</string>
+ <string name="conflict_title">Conflito de arquivo</string>
+ <string name="conflict_message">Quais arquivos você deseja manter? Se você selecionar ambas as versões, o arquivo local terá um número adicionado ao seu nome.</string>
<string name="conflict_keep_both">Manter ambos</string>
+ <string name="conflict_use_local_version">Usar a versão local</string>
+ <string name="conflict_use_server_version">Usar a versão servidor</string>
<string name="preview_image_description">Pré-visualização da imagem</string>
<string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
<string name="error__upload__local_file_not_copied">%1$s não pôde ser copiado para pasta local %2$s</string>
projects / pub / Android / ownCloud.git / commitdiff