Browse Source

Merge branch 'develop' into review_build_process

David A. Velasco 11 years ago
parent
commit
fa1d9c4d1f
3 changed files with 55 additions and 4 deletions
  1. 2 1
      res/values-et-rEE/strings.xml
  2. 53 1
      res/values-lb/strings.xml
  3. 0 2
      res/values-tzm/strings.xml

+ 2 - 1
res/values-et-rEE/strings.xml

@@ -95,6 +95,7 @@
   <string name="sync_foreign_files_forgotten_ticker">Osad kohalikud faili ununesid</string>
   <string name="sync_foreign_files_forgotten_ticker">Osad kohalikud faili ununesid</string>
   <string name="sync_foreign_files_forgotten_content">%1$d faili %2$s kataloogist ei suudeta kopeerida</string>
   <string name="sync_foreign_files_forgotten_content">%1$d faili %2$s kataloogist ei suudeta kopeerida</string>
   <string name="sync_foreign_files_forgotten_explanation">Alates versioonist 1.3.16 failid, mis on üles laetud kopeeritakse kohalikku kataloogi %1$s vältimaks andmete kadu, 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 failid nagu nad on ning eemaldata viide %3$s või tõsta failid %1$s kataloogi ja säilitada viide %4$s.\n\nAllpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s millele nad viitavad.</string>
   <string name="sync_foreign_files_forgotten_explanation">Alates versioonist 1.3.16 failid, mis on üles laetud kopeeritakse kohalikku kataloogi %1$s vältimaks andmete kadu, 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 failid nagu nad on ning eemaldata viide %3$s või tõsta failid %1$s kataloogi ja säilitada viide %4$s.\n\nAllpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s millele nad viitavad.</string>
+  <string name="sync_current_folder_was_removed">Kausta %1$s pole enam olemas</string>
   <string name="foreign_files_move">Tõsta kõik ümber</string>
   <string name="foreign_files_move">Tõsta kõik ümber</string>
   <string name="foreign_files_success">Kõik failid tõsteti ümber</string>
   <string name="foreign_files_success">Kõik failid tõsteti ümber</string>
   <string name="foreign_files_fail">Mõningaid faile ei saa ümber tõsta</string>
   <string name="foreign_files_fail">Mõningaid faile ei saa ümber tõsta</string>
@@ -178,7 +179,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Ootamatu tõrge ; palun kasuta faili valimiseks mõnda teist rakendust</string>
   <string name="filedisplay_unexpected_bad_get_content">Ootamatu tõrge ; palun kasuta faili valimiseks mõnda teist rakendust</string>
   <string name="filedisplay_no_file_selected">Ühtegi faili pole valitud</string>
   <string name="filedisplay_no_file_selected">Ühtegi faili pole valitud</string>
   <string name="oauth_check_onoff">Logi sisse oAuth2-ga</string>
   <string name="oauth_check_onoff">Logi sisse oAuth2-ga</string>
-  <string name="oauth_login_connection">Ühendun oAuth2 serverisse...</string>
+  <string name="oauth_login_connection">oAuth2 serveriga ühendumine...</string>
   <string name="ssl_validator_header">Saidi identiteeti ei suudetud kinnitada</string>
   <string name="ssl_validator_header">Saidi identiteeti ei suudetud kinnitada</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Serveri sertifikaat pole usaldusväärne</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Serveri sertifikaat pole usaldusväärne</string>
   <string name="ssl_validator_reason_cert_expired">- Serveri sertifikaat on aegunud</string>
   <string name="ssl_validator_reason_cert_expired">- Serveri sertifikaat on aegunud</string>

+ 53 - 1
res/values-lb/strings.xml

@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
 <resources>
+  <string name="about_version">Versioun %1$s</string>
   <string name="actionbar_upload">Eroplueden</string>
   <string name="actionbar_upload">Eroplueden</string>
   <string name="actionbar_upload_files">Dateien</string>
   <string name="actionbar_upload_files">Dateien</string>
+  <string name="actionbar_open_with">Opmaachen mat</string>
   <string name="actionbar_mkdir">Dossier erstellen</string>
   <string name="actionbar_mkdir">Dossier erstellen</string>
   <string name="actionbar_settings">Astellungen</string>
   <string name="actionbar_settings">Astellungen</string>
+  <string name="actionbar_see_details">Detailer</string>
   <string name="prefs_category_general">Allgemeng</string>
   <string name="prefs_category_general">Allgemeng</string>
   <string name="prefs_category_more">Méi</string>
   <string name="prefs_category_more">Méi</string>
   <string name="prefs_accounts">Accounten</string>
   <string name="prefs_accounts">Accounten</string>
+  <string name="prefs_pincode">App PIN</string>
   <string name="prefs_help">Hëllef</string>
   <string name="prefs_help">Hëllef</string>
+  <string name="prefs_feedback">Feedback</string>
+  <string name="auth_host_url">Server Adress</string>
   <string name="auth_username">Benotzernumm</string>
   <string name="auth_username">Benotzernumm</string>
   <string name="auth_password">Passwuert</string>
   <string name="auth_password">Passwuert</string>
   <string name="sync_string_files">Dateien</string>
   <string name="sync_string_files">Dateien</string>
@@ -16,7 +22,7 @@
   <string name="uploader_wrn_no_account_title">Keen Account fonnt</string>
   <string name="uploader_wrn_no_account_title">Keen Account fonnt</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Erausgoen</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Erausgoen</string>
-  <string name="uploader_info_uploading">Heichlueden</string>
+  <string name="uploader_info_uploading">Eroplueden</string>
   <string name="filedetails_size">Gréisst:</string>
   <string name="filedetails_size">Gréisst:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Erstallt:</string>
   <string name="filedetails_created">Erstallt:</string>
@@ -27,7 +33,53 @@
   <string name="common_ok">OK</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel_upload">Upload ofbriechen</string>
   <string name="common_cancel_upload">Upload ofbriechen</string>
   <string name="common_cancel">Ofbriechen</string>
   <string name="common_cancel">Ofbriechen</string>
+  <string name="common_save_exit">Späicher &amp; géi raus</string>
   <string name="common_error">Fehler</string>
   <string name="common_error">Fehler</string>
+  <string name="common_error_unknown">Et ass en onbekannte Fehler opgetrueden</string>
+  <string name="about_title">Iwwer</string>
   <string name="change_password">Passwuert änneren</string>
   <string name="change_password">Passwuert änneren</string>
+  <string name="delete_account">Account läschen</string>
+  <string name="create_account">Account erstellen</string>
+  <string name="uploader_info_dirname">Dossier\'s Numm</string>
+  <string name="uploader_upload_in_progress_ticker">Gett eropgelueden ...</string>
+  <string name="uploader_upload_succeeded_ticker">Eroplueden färdeg</string>
+  <string name="uploader_upload_failed_ticker">Eroplueden huet net geklappt</string>
+  <string name="downloader_download_failed_ticker">Eroflueden huet net geklappt</string>
+  <string name="common_choose_account">Wiel en Account aus</string>
+  <string name="foreign_files_move">Alles bewegen</string>
+  <string name="pincode_enter_pin_code">Gëff w.e.g. däin App PIN an</string>
+  <string name="pincode_configure_your_pin">Gëff däin App PIN an</string>
+  <string name="pincode_reenter_your_pincode">Gëff däin App PIN w.e.g. nei an</string>
+  <string name="pincode_remove_your_pincode">Huel däin App PIN raus</string>
+  <string name="pincode_wrong">Ongültegen App PIN</string>
+  <string name="pincode_removed">App PIN geläscht</string>
+  <string name="pincode_stored">App PIN gespaichert</string>
+  <string name="auth_no_net_conn_title">Keng Netzwierk Verbindung</string>
+  <string name="auth_nossl_plain_ok_title">Keng geséchert Verbindung verfügbar.</string>
+  <string name="auth_connection_established">Verbindung hiergestallt</string>
+  <string name="auth_not_configured_title">Ongülteg Server Konfiguratioun</string>
+  <string name="auth_unknown_error_title">Et ass en onbekannte Fehler opgetrueden!</string>
+  <string name="auth_incorrect_path_title">Server Instanz net fonnt</string>
+  <string name="common_rename">Ëm-benennen</string>
   <string name="common_remove">Läschen</string>
   <string name="common_remove">Läschen</string>
+  <string name="confirmation_remove_local">Nemmen Lokal</string>
+  <string name="confirmation_remove_remote">Vum Server läschen</string>
+  <string name="ssl_validator_btn_details_see">Detailer</string>
+  <string name="ssl_validator_btn_details_hide">Verstoppen</string>
+  <string name="ssl_validator_label_C">Land:</string>
+  <string name="ssl_validator_label_ST">Staat:</string>
+  <string name="ssl_validator_label_L">Uert:</string>
+  <string name="ssl_validator_label_validity">Gültegkeet:</string>
+  <string name="ssl_validator_label_validity_from">Vun:</string>
+  <string name="ssl_validator_label_validity_to">Fir:</string>
+  <string name="ssl_validator_label_signature">Signatur:</string>
+  <string name="placeholder_filetype">PNG Bild</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">2012/05/18 12:23</string>
+  <string name="placeholder_media_time">12:23:45</string>
+  <string name="conflict_keep_both">Béid halen</string>
+  <string name="conflict_overwrite">Iwwerschreiwen</string>
+  <string name="conflict_dont_upload">Net eroplueden</string>
+  <string name="failed_upload_all_cb">all auswielen</string>
+  <string name="failed_upload_failure_text">Fehler Message:</string>
 </resources>
 </resources>

+ 0 - 2
res/values-tzm/strings.xml

@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources/>