diff --git a/services/web/locales/cs.json b/services/web/locales/cs.json index b91ef1b957..45e9b9fc8a 100644 --- a/services/web/locales/cs.json +++ b/services/web/locales/cs.json @@ -127,7 +127,6 @@ "get_started_now": "Začněte hned", "github_commit_message_placeholder": "Commit zprávy pro změny udělané v __appName__u...", "github_is_premium": "Synchronizace s GitHubem je prémiová funkce", - "github_merge_failed": "Vaše změny v __appName__u a GitHubu nemohou být automaticky mergovány. Prosím mergujte manuálně <0>__sharelatex_branch__ branch do <1>__master_branch__ branche v gitu. Po dokončení manuálního merge klikněte níže pro pokračování.", "github_no_master_branch_error": "Tento repozitář nemůže být importován, protože nemá master branch. Prosím zajistěte, aby projekt měl master branch.", "github_public_description": "Tento repozitář může vidět kdokoliv. Vy určíte kdo do něj může commitovat,", "github_successfully_linked_description": "Děkujeme, úspěšně jsem připojili váš GitHub účet k __appName__u. Nyní můžete exportovat své projekty v __appName__u do GitHubu, nebo importovat projekty z GitHub repozitáře.", diff --git a/services/web/locales/es.json b/services/web/locales/es.json index af3cd3827b..42ab7d10ec 100644 --- a/services/web/locales/es.json +++ b/services/web/locales/es.json @@ -176,7 +176,6 @@ "get_started_now": "Comienza ahora", "github_commit_message_placeholder": "Mensaje del commit para cambios hechos en __appName__...", "github_is_premium": "La sincronización con GitHub es una característica premium", - "github_merge_failed": "Tus cambios en __appName__ y GitHub podrían no ser automáticamente unidos. Por favor, une (merge) la rama <0>__sharelatex_branch__ en la rama <1>__master_branch__ a través de git. Clickea abajo para continuar, después de que hayas hecho el merge manual.", "github_public_description": "Cualquier persona puede ver este repositorio. Tú eliges quién puede contribuir.", "github_successfully_linked_description": "Gracias, vinculamos exitosamente tu cuenta de GitHub con __appName__. Ahora puedes exportar tus proyectos de __appName__ a GitHub o importar proyectos desde tus repositorios en GitHub.", "github_sync": "Sincronización con GitHub", @@ -303,7 +302,6 @@ "or": "o", "other_logs_and_files": "Otros logs y archivos", "over": "más", - "over_x_templates_easy_getting_started": "Hay __over__ de 400 __templates__ en nuestra galería de plantillas, así que es bastante fácil empezar, ya sea que estés escribiendo un artículo científico, una tesis, un CV u otro.", "owner": "Propietario", "page_not_found": "Página no encontrada", "password": "Contraseña", diff --git a/services/web/locales/fi.json b/services/web/locales/fi.json index fca456c12c..1ed04c04d0 100644 --- a/services/web/locales/fi.json +++ b/services/web/locales/fi.json @@ -130,7 +130,6 @@ "get_started_now": "Aloita heti", "github_commit_message_placeholder": "Tehdyt muutokset-viesti sovelluksessa __appName__ tehdyille muutoksille", "github_is_premium": "GitHub-synkronointi on premium-ominaisuus", - "github_merge_failed": "Muutoksiasi sovelluksessa __appName__ ja GitHubissa ei voitu yhdistää automaattisesti. Yhdistä haara <0>__sharelatex_branch__ haaraan <1>__master_branch__ gitissä. Klikkaa alla jatkaaksesi sen jälkeen kun olet yhdistänyt manuaalisesti.", "github_public_description": "Kuka tahansa voi nähdä tämän repositoryn. Voit valita kuka voi tehdä muutoksia.", "github_successfully_linked_description": "Kiitos, olemme linkittäneet GitHub-tilisi sovellukseen __appName__ onnistuneesti. Voit nyt viedä __appName__-projektejasi GitHubiin tai tuoda projekteja omista GitHub-repositoryistasi.", "github_sync": "GitHub Synkronointi", @@ -227,7 +226,6 @@ "or": "tai", "other_logs_and_files": "Muut lokit & tiedostot", "over": "yli", - "over_x_templates_easy_getting_started": "Mallipohjagalleriastamme löytyy __yli__ 400 __mallipohjaa__, joten pääset todella helposti alkuun, kirjoitit sitten tiedeartikkelia, väitöstä, ansioluetteloa tai jotain muuta.", "owner": "Omistaja", "page_not_found": "Sivua Ei Löydy", "password": "Salasana", diff --git a/services/web/locales/fr.json b/services/web/locales/fr.json index b19a9d4e17..8cce1fe5df 100644 --- a/services/web/locales/fr.json +++ b/services/web/locales/fr.json @@ -382,7 +382,6 @@ "github_integration_lowercase": "Intégration avec Git et GitHub", "github_is_premium": "La synchronisation GitHub est une fonctionnalité premium", "github_large_files_error": "Échec de fusion : votre dépôt GitHub contient des fichiers dépassant la taille limite de 50 Mo ", - "github_merge_failed": "Impossible de fusionner automatiquement vos changements dans __appName__ et GitHub. Veuillez fusionner manuellement la branche <0>__sharelatex_branch__ dans la branche <1>__master_branch__ dans Git. Cliquez ci-dessous pour continuer, après avoir fusionné manuellement.", "github_no_master_branch_error": "Ce dépôt ne peut pas être importé car il n’a pas de branche master. Veuillez vous assurer qu’une branche master existe dans le projet.", "github_private_description": "Vous choisissez qui peut voir et commiter dans ce dépôt.", "github_public_description": "Tout le monde peut voir ce dépôt. Vous choisissez qui peut commiter.", @@ -456,8 +455,7 @@ "hotkeys": "Raccourcis clavier", "hundreds_templates_info": "Créez de magnifiques documents en vous basant sur notre galerie de modèles LaTeX pour les revues, conférences, thèses, rapports, CV et bien plus encore.", "i_want_to_stay": "Je veux rester", - "if_error_persists_try_relinking_provider": "Si cette erreur persiste, essayez de lier à nouveau votre compte ici", - "if_have_existing_can_link": "Si vous avez déjà un compte __appName__ sur une autre adresse courriel, vous pouvez le lier à votre compte __institutionName__ en cliquant __clickText.", + "if_have_existing_can_link": "Si vous avez déjà un compte __appName__ sur une autre adresse courriel, vous pouvez le lier à votre compte __institutionName__ en cliquant __clickText__.", "if_owner_can_link": "Si vous possédez le compte __appName__ ayant pour adresse __email__, vous serez autorisé à le lier à votre compte institutionnel __institutionName__.", "ignore_and_continue_institution_linking": "Vous pouvez également ignorer ceci et continuer vers __appName__ avec votre compte __email__.", "ignore_validation_errors": "Ne pas vérifier la syntaxe", @@ -894,7 +892,6 @@ "select_from_output_files": "choisir parmi les fichiers générés", "select_from_source_files": "choisir parmi les fichiers source", "select_github_repository": "Choisissez un dépôt GitHub à importer dans __appName__", - "select_project": "Sélectionner", "send": "Envoyer", "send_first_message": "Envoyez votre premier message à vos collaborateur·rice·s", "send_test_email": "Envoyer un courriel de test", diff --git a/services/web/locales/it.json b/services/web/locales/it.json index ef9a31ec86..412df2ac52 100644 --- a/services/web/locales/it.json +++ b/services/web/locales/it.json @@ -146,7 +146,6 @@ "git": "Git", "github_commit_message_placeholder": "Messaggio di commit per le modifiche effettuate in __appName__...", "github_is_premium": "La sincronizzazione GitHub è una funzionalità premium", - "github_merge_failed": "Le tue modifiche in __appName__ e GitHub non possono essere unite automaticamente. Per favore, unisci manualmente il branch <0>__sharelatex_branch__ con il branch <1>__master_branch__ in git. Clicca qui sotto per continuare dopo aver apportato le modifiche manuali.", "github_public_description": "Chiunque può visualizzare il repository. Puoi scegliere chi può eseguire commit.", "github_successfully_linked_description": "Grazie, abbiamo collegato con successo il tuo account GitHub a __appName__ . Adesso puoi esportare i progetti __appName__ in GitHub, o importarli dai tuoi repository GitHub.", "github_sync": "Sincronizzazione GitHub", @@ -254,7 +253,6 @@ "or": "o", "other_logs_and_files": "Altri log & file", "over": "su", - "over_x_templates_easy_getting_started": "Esistono __over__ 400 __templates__ nella nostra galleria di modelli, ed è quindi molto facile iniziare, sia che tu stia scrivendo un articolo, una tesi, un CV o qualcos altro.", "owner": "Proprietario", "page_not_found": "Pagina Non Trovata", "password": "Password", diff --git a/services/web/locales/ja.json b/services/web/locales/ja.json index 79c5730f3c..7a77e15c83 100644 --- a/services/web/locales/ja.json +++ b/services/web/locales/ja.json @@ -186,7 +186,6 @@ "get_started_now": "今すぐ開始", "github_commit_message_placeholder": "__appName__ で行われた変更のコミットメッセージ…", "github_is_premium": "GitHub統合はプレミアム機能です", - "github_merge_failed": "__appName__ とGitHubの変更を自動的に統合できませんでした。GIT内で <0>__sharelatex_branch__ ブランチと <1>__master_branch__ ブランチを手動で統合してください。手動で統合したあとに、下をクリックして続行してください。", "github_public_description": "このリポジトリは全員が閲覧できます。コミットできる人を選択します。", "github_successfully_linked_description": "ありがとうございます。GitHubアカウントと __appName__ のリンクが完了しました。これからは __appName__ プロジェクトをGitHubにエクスポート、あるいはGitHubリポジトリからプロジェクトのインポートをすることができます。", "github_sync": "GitHub同期", @@ -334,7 +333,6 @@ "other_actions": "その他の操作", "other_logs_and_files": "他のログとファイル", "over": "以上", - "over_x_templates_easy_getting_started": "当社のテンプレートギャラリーには __over__ 400 __templates__ が用意されています。論文や履歴書、あるいは他の文書を書いているときでも、とても簡単に利用を開始することができます。", "owner": "管理者", "page_not_found": "ページが見つかりません", "password": "パスワード", diff --git a/services/web/locales/ko.json b/services/web/locales/ko.json index 2ff21b78a5..c73d8db2af 100644 --- a/services/web/locales/ko.json +++ b/services/web/locales/ko.json @@ -218,7 +218,6 @@ "github_credentials_expired": "GitHub 아이디와 비밀번호가 만료되었습니다.", "github_integration_lowercase": "GitHub 통합", "github_is_premium": "GitHub 동기화는 프리미엄 기능입니다", - "github_merge_failed": "__appName__와 GitHub의 변경사항들은 자동적으로 병합될 수 없습니다. <0>__sharelatex_branch__ 브랜치를 git의<1>__master_branch__브랜치로 수동적으로 병합해주시기 바랍니다. 수동적으로 합병된 후에, 계속하시려면 아래를 클릭하세요.", "github_public_description": "모두가 이 저장소를 볼 수 있습니다. 커밋할 수 있는 분을 선택하실 수 있습니다.", "github_successfully_linked_description": "감사합니다, __appName__로 GitHub 계정을 성공적으로 연결하였습니다. __appName__ 프로젝트를 GitHub으로 전송하시거나 GitHub 저장소의 프로젝트를 불러올 수 있습니다.", "github_sync": "GitHub 동기화", @@ -378,7 +377,6 @@ "other_actions": "다른 방법들", "other_logs_and_files": "기타 로그 및 파일 출력", "over": "더 많은", - "over_x_templates_easy_getting_started": "400개 이상의 템플릿으로 저널 논문(journal article)과 학위 논문(thesis), 자기소개서(CV) 등 여러 문서를 쉽게 작성할 수 있습니다.", "overview": "개요", "owner": "소유자", "page_not_found": "페이지를 찾을 수 없습니다", @@ -502,7 +500,6 @@ "see_what_has_been": "기록 보기 ", "select_all_projects": "전체 선택", "select_github_repository": "__appName__에 불러올 GitHub 저장소를 선택합니다.", - "select_project": "선택", "send": "발신", "send_first_message": "첫 메시지를 전송하세요", "send_test_email": "테스트 이메일 보내기", diff --git a/services/web/locales/nl.json b/services/web/locales/nl.json index 05d5407b33..15a2eed992 100644 --- a/services/web/locales/nl.json +++ b/services/web/locales/nl.json @@ -222,7 +222,6 @@ "github_commit_message_placeholder": "Bericht voor wijzigingen aangebracht in __appName__...", "github_integration_lowercase": "Github integratie", "github_is_premium": "GitHubsnychronisatie is een premium functie", - "github_merge_failed": "Jouw wijzigingen in __appName__ en GitHub konden niet automatisch samengevoegd worden. Doe dit handmatig door de <0>__sharelatex_branch__-tak met de <1>__master_branch__-tak in git samen te voegen. Klik hieronder om door te gaan, nadat je handmatig hebt samengevoegd.", "github_public_description": "Iedereen kan deze repository zien. Jij kiest wie eraan kan bijdragen.", "github_successfully_linked_description": "Bedankt, we hebben je GitHub-account kunnen koppelen aan __appName__. Je kunt nu je __appName__-projecten exporteren naar GitHub, of je projecten vanuit je GitHub repositories importeren.", "github_sync": "GitHub-synchonisatie", @@ -396,7 +395,6 @@ "other_actions": "Andere acties", "other_logs_and_files": "Andere logs en bestanden", "over": "meer dan", - "over_x_templates_easy_getting_started": "Er zijn __over__ 400 __templates__ in onze sjablonengalerij, dus het is heel makkelijk om aan de slag te gaan, of je nu een tijdschriftartikel, scriptie, CV of iets anders schrijft.", "overview": "Overzicht", "owner": "Eigenaar", "page_not_found": "Pagina Niet Gevonden", diff --git a/services/web/locales/no.json b/services/web/locales/no.json index e0d7c3cf18..525f728e15 100644 --- a/services/web/locales/no.json +++ b/services/web/locales/no.json @@ -153,7 +153,6 @@ "get_started_now": "Kom i gang nå", "github_commit_message_placeholder": "Commit-melding for endringer gjort i __appName__...", "github_is_premium": "Synkronisering med GitHub er en premium funksjonalitet", - "github_merge_failed": "Endringer i __appName__ og GitHub kunne ikke automatisk merges. Vennligst manuelt merge <0>__sharelatex_branch__ branchen inn i <1>__master_branch__ branchen i git. Klikk under for å fortsette etter du har merget manuelt.", "github_public_description": "Hvem som helst kan se dette repositoriet. Du velger hvem som kan gjøre commits.", "github_successfully_linked_description": "Takk, kobling av GitHub-kontoen din til __appName__ var vellykket. Du kan nå eksportere __appName__-prosjektene dine til GitHub, eller importere prosjekter fra GitHub-repositoriene dine.", "github_sync": "GitHub Synk.", @@ -262,7 +261,6 @@ "or": "eller", "other_logs_and_files": "Andre logger & filer", "over": "over", - "over_x_templates_easy_getting_started": "Vi har __over__ 400 __templates__ i malgalleriet vårt, så det er enkelt å komme i gang, enten du skriver en avhandling, et tidsskrift, CV eller noe annet.", "owner": "Eier", "page_not_found": "Fant ikke siden", "password": "Passord", diff --git a/services/web/locales/pt.json b/services/web/locales/pt.json index c723abd852..d1b8b86f78 100644 --- a/services/web/locales/pt.json +++ b/services/web/locales/pt.json @@ -112,7 +112,7 @@ "change": "Modificado", "change_password": "Mudar Senha", "change_plan": "Mudar plano", - "change_to_annual_billing_and_save": "Ganhe <0>__percentage__ de desconto no plano anual. Se você migrar agora você irá economizar __yearSaving__ por ano.", + "change_to_annual_billing_and_save": "Ganhe <0>__percentage__ de desconto no plano anual. Se você migrar agora você irá economizar __yearlySaving__ por ano.", "change_to_this_plan": "Alterar para esse plano", "chat": "Bate-papo", "checking": "Verificando", @@ -234,7 +234,7 @@ "expiry": "Data de Validade", "export_csv": "Exportar CSV", "export_project_to_github": "Exportar Projeto para o GitHub", - "faq_how_does_free_trial_works_answer": "Você obtém acesso total ao plano __appName__ escolhido durante a avaliação gratuita de __len __ dias. Não há obrigação de continuar além da versão de avaliação. Seu cartão será cobrado no final da avaliação de __len__ dias, a menos que você cancele antes disso. Você pode cancelar via suas configurações de assinatura.", + "faq_how_does_free_trial_works_answer": "Você obtém acesso total ao plano __appName__ escolhido durante a avaliação gratuita de __len__ dias. Não há obrigação de continuar além da versão de avaliação. Seu cartão será cobrado no final da avaliação de __len__ dias, a menos que você cancele antes disso. Você pode cancelar via suas configurações de assinatura.", "faq_how_free_trial_works_question": "Como foi o uso da versão de experimentação?", "faq_pay_by_invoice_question": "Eu posso pagar com boleto ou ordem de pedido?", "fast": "Rápido", @@ -276,7 +276,6 @@ "github_integration_info": "Enviar e baixe suas alterações do GitHub, assim você e seus colaboradores podem trabalhar offline com o git e online com o Overleaf.", "github_integration_lowercase": "Integração com GitHub", "github_is_premium": "Sincronizar com GitHub é um recurso premium", - "github_merge_failed": "Suas mudanças no __appName__ e GitHub não puderam ser mescladas automaticamente. Por favor, mescle (merge) manualmente o branch <0>__sharelatex_branch__ no branch <1>__master_branch__ no git. Clique abaixo para continuar, depois de você ter mesclado manualmente.", "github_public_description": "Qualquer um pode ver esse repositório.", "github_successfully_linked_description": "Obrigado, nós vinculamos com sucesso sua conta do GitHub com o __appName__. Agora você pode exportar seus projetos do __appName__ para o GitHub e importar seus projetos de repositórios do GitHub.", "github_sync": "Sincronizar com GitHub", @@ -624,7 +623,6 @@ "see_what_has_been": "Veja o que foi ", "select_all_projects": "Selecionar todos", "select_github_repository": "Selecione um repositório no GitHub para importar para o __appName__.", - "select_project": "Selecionar", "send": "Enviar", "send_first_message": "Envie sua primeira mensagem", "send_test_email": "Enviar email de teste", @@ -678,7 +676,7 @@ "sure_you_want_to_change_plan": "Você tem certeza que deseja alterar o plano para <0>__planName__?", "sure_you_want_to_delete": "Você tem certeza que deseja excluir permanentemente os seguintes arquivos?", "sure_you_want_to_leave_group": "Você tem certeza que deseja sair do grupo?", - "sure_you_want_to_restore_before": "Você tem certeza que deseja restaurar __filenname__ para antes das alterações em __date__?", + "sure_you_want_to_restore_before": "Você tem certeza que deseja restaurar __filename__ para antes das alterações em __date__?", "sv": "Suéco", "sync": "Sincronia", "sync_dropbox_github": "Sincronize com Dropbox e GitHub", @@ -791,7 +789,7 @@ "work_with_word_users": "Trabalhe com usuários do Word", "work_with_word_users_blurb": "__appName__ é tão fácil de se familiarizar que você poderá convidar seus colegas que não usam LaTeX para editar seus documentos LaTeX. Eles irão começar a produzir a partir do primeiro dia e serão capazes de aprender LaTeX aos poucos.", "year": "ano", - "you_have_added_x_of_group_size_y": "Você adicionou __addedUserSize__ de <1>__groupSize__ membros disponíveis.", + "you_have_added_x_of_group_size_y": "Você adicionou __addedUsersSize__ de <1>__groupSize__ membros disponíveis.", "you_introed_high_number": " Você adicionou <0>__numberOfPeople__ pessoas ao __appName__. Bom trabalho!", "you_introed_small_number": " Você introduziu <0>__numberOfPeople__ pessoas no __appName__. Parabéns, mas você pode trazer mais?", "you_not_introed_anyone_to_sl": "Você não adicionou ninguém ao __appName__ ainda. Comece a compartilhar!", diff --git a/services/web/locales/ru.json b/services/web/locales/ru.json index 8100fd7f0b..7efb011773 100644 --- a/services/web/locales/ru.json +++ b/services/web/locales/ru.json @@ -171,7 +171,6 @@ "get_started_now": "Начать прямо сейчас", "github_commit_message_placeholder": "Сообщение о фиксации изменений в __appName__...", "github_is_premium": "Синхронизация с GitHub доступна только в премиум аккаунте", - "github_merge_failed": "Ваши изменения в __appName__ и GitHub не могут быть интегрированы автоматически. Пожалуйста, интегрируйте (merge) ветвь <0>__sharelatex_branch__ branch в <1>__master_branch__ в git вручную. Нажмите внизу для продолжения, когда будете готовы.", "github_public_description": "Этот репозиторий может просмотреть каждый. Вы выбираете, кто может править.", "github_successfully_linked_description": "Спасибо, мы успешно связали ваш аккаунт на GitHub с __appName__. Теперь вы можете экспортировать проекты с __appName__ в GitHub или импортировать в обратном направлении.", "github_sync": "Синхронизация с GitHub", @@ -302,7 +301,6 @@ "or": "или", "other_logs_and_files": "Другие логи и файлы", "over": "свыше", - "over_x_templates_easy_getting_started": "В нашей галереи содержится __более__ 400 __шаблонов__, так что Вы можете легко начать работу над Вашей статьёй для журнала, диссертацией, резюме или любым другим документом.", "owner": "Владелец", "page_not_found": "Страница не найдена", "password": "Пароль", diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json index 33b46321c5..0d9dd23d04 100644 --- a/services/web/locales/sv.json +++ b/services/web/locales/sv.json @@ -354,7 +354,7 @@ "find_out_more_about_the_file_outline": "Läs mer om filöversikten", "find_out_more_nt": "Ta reda på mer.", "first_name": "Förnamn", - "first_x_days_free_after_that_y_per_month": "De första <0>__trialLen__-dagarna är gratis, därefter <0>__pris__ per månad", + "first_x_days_free_after_that_y_per_month": "De första <0>__trialLen__-dagarna är gratis, därefter <0>__price__ per månad", "folders": "Mappar", "following_paths_conflict": "Följande filer & mappar har samma sökvägar", "font_family": "Typsnittsfamilj", @@ -383,7 +383,6 @@ "github_integration_info": "Hämta och tryck upp ändringar till och från GitHub, så att dina samarbetspartners kan jobba offline med git och online med __appName__.", "github_integration_lowercase": "GitHubintegration", "github_is_premium": "GitHub synk är en premium funktion", - "github_merge_failed": "Dina ändringar i __appName__ och GitHub kunde inte automatiskt slås samman. Vänligen gör en manuell sammanslagning av <0>__sharelatex_branch__branch och <1>__master_branch__branch i git. Klicka sedan nedan för att fortsätta.", "github_no_master_branch_error": "Det här arkivet kan inte importeras eftersom det saknar huvudgrenen. Vänligen kontrollera att projektet har en huvudgren.", "github_private_description": "Du kan välja vem som kan se och checka in till detta kodförråd.", "github_public_description": "Alla kan se detta repo. Du bestämmer vem som kan commita.", @@ -463,7 +462,6 @@ "invalid_element_name": "Projektet kunde inte kopieras på grund av filnamn som innehåller ogiltiga tecken (t.ex. asterisker, snedstreck eller kontrolltecken). Byt namn på filerna och försök igen.", "invalid_email": "En e-postadress är inte giltig", "invalid_file_name": "Ogiltigt filnamn", - "invalid_filename": "Uppladdningen misslyckades: kontrollera att filnamnet inte innehåller specialtecken eller inledande/efterföljande blanksteg", "invalid_password": "Felaktigt lösenord", "invalid_password_too_long": "Maximal lösenordslängd __maxLength__ överskrids", "invalid_password_too_short": "Lösenordet är för kort, minimum __minLength__", @@ -671,7 +669,6 @@ "other_logs_and_files": "Andra loggar och filer", "other_output_files": "Ladda ner andra utdatafiler", "over": "över", - "over_x_templates_easy_getting_started": "Det finns __over__ 400 __templates__ i vårt mallgalleri, så det är verkligen enkelt att komma igång. Oavsett om du skriver en vetenskaplig artikel, uppsats, cv eller något annat.", "overall_theme": "Övergripande tema", "overleaf": "Overleaf", "overview": "Översikt", @@ -872,7 +869,6 @@ "select_an_output_file": "Välj en utdatafil", "select_from_source_files": "Välj från källfiler", "select_github_repository": "Välj ett GitHub repo att importera till __appName__.", - "select_project": "Välj", "send": "Skicka", "send_first_message": "Skicka ditt första meddelande till dina medarbetare", "send_test_email": "Skicka ett test-mail", @@ -1107,7 +1103,7 @@ "work_with_word_users_blurb": "__appName__ är enkelt att börja med, du kan direkt bjuda in dina icke-LaTeX kollegor att börja medverka i dina LaTeX dokument. De kommer att vara produktiva redan från första dagen och kommer att lära sig en del LaTeX under tiden som de skriver.", "x_price_for_first_month": "<0>__price__ för din första månad", "x_price_for_first_year": "<0>__price__ för ditt första år", - "x_price_for_y_months": "<0>__pris__ för dina första __discountMonths__ månader", + "x_price_for_y_months": "<0>__price__ för dina första __discountMonths__ månader", "x_price_per_year": "<0>__price__ per år", "year": "år", "you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page": "Du kan när som helst gå med/ur programmet på denna sida", diff --git a/services/web/locales/tr.json b/services/web/locales/tr.json index a2af3bf316..f6780f8fd3 100644 --- a/services/web/locales/tr.json +++ b/services/web/locales/tr.json @@ -147,7 +147,6 @@ "get_started_now": "Hemen kullanmaya başla", "github_commit_message_placeholder": "__appName__ üzerinden yaptığınız değişiklikler için yorum giriniz...", "github_is_premium": "GitHub senkronizasyonu premium bir özelliktir", - "github_merge_failed": "__appName__ üzerinden yaptığınız değişiklikler otomatik olarak GitHub üzerinde birleştirilemedi. Lütfen, <0>__sharelatex_branch__ dalının <1>__master_branch__ dalı ile olan birleşimini kendiniz yapınız. Birleşimi tamamladıktan sonra devam etmek için aşağıya tıklayın.", "github_public_description": "Herkes bu depoyu görüntüleyebilir. Kimlerin işlem yapabileceğini siz seçersiniz.", "github_successfully_linked_description": "Teşekkürler, GitHub hesabınız ile __appName__ arasındaki bağlantı, başarıyla oluşturuldu. Artık __appName__ projelerinizi GitHub üzerine yükleyebilir ya da GitHub depolarınızı __appName__’e yükleyebilirsiniz.", "github_sync": "GitHub Senkronizasyonu", @@ -254,7 +253,6 @@ "or": " ya da", "other_logs_and_files": "Diğer sonuç dökümleri & dosyalar", "over": "fazla", - "over_x_templates_easy_getting_started": "Şablon galerimizde sayısı 400’den __over__ olan __templates__ işe başlamanızı kolaylaştırabilir. Şablonlar arasında dergi makalesi, tez, CV ve daha fazlası bulunmaktadır.", "owner": "Sahibi", "page_not_found": "Sayfa Bulunamadı", "password": "Şifre", diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json index b553880275..bbea3b36ba 100644 --- a/services/web/locales/zh-CN.json +++ b/services/web/locales/zh-CN.json @@ -379,7 +379,6 @@ "github_integration_lowercase": "Git 和 GitHub 支持", "github_is_premium": "与GitHub同步是一项付费功能", "github_large_files_error": "合并失败:您的 Github 存储库包含超过 50mb 文件大小限制的文件 ", - "github_merge_failed": "您在 __appName__ 和 GitHub 中的更改未能自动合并。请您手动将 <0>__sharelatex_branch__ 分支合并到git中的 <1>__master_branch__ 分支。当您手动合并完成后,点击下面继续。", "github_no_master_branch_error": "无法导入此存储库,因为它缺少主分支。请确保项目有一个主分支", "github_private_description": "您可以选择谁可以查看并提交到此存储库。", "github_public_description": "任何人都可以看到该存储库。您可以选择谁有权提交。", @@ -890,7 +889,6 @@ "select_from_output_files": "从输出文件中选择", "select_from_source_files": "从源文件中选择", "select_github_repository": "选取要导入 __appName__ 的GitHub存储库", - "select_project": "选择", "send": "发送", "send_first_message": "向你的合作者发送第一条信息", "send_test_email": "发送测试邮件",