Skip to content

Commit

Permalink
Update English.pot #216
Browse files Browse the repository at this point in the history
  • Loading branch information
sdottaka committed Nov 10, 2019
1 parent 72f40ac commit cf738b0
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 71 deletions.
52 changes: 18 additions & 34 deletions Translations/WinMerge/Basque.po
Original file line number Diff line number Diff line change
Expand Up @@ -560,12 +560,11 @@ msgstr ""
msgid "&Print..."
msgstr "I&rarkitu..."

msgid "Page Set&up"
msgstr "msgstr "Ire&ki Gatazka Agiria..."
msgid "Page Set&up..."
msgstr "Ire&ki Gatazka Agiria..."

#, c-format
msgid "Print Previe&w"
msgstr "Irarkitu Aurreikus&pena"
msgid "Print Previe&w..."
msgstr "Irarkitu Aurreikus&pena..."

#, c-format
msgid "&Convert Line Endings to"
Expand Down Expand Up @@ -815,13 +814,11 @@ msgstr ""
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""

#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "K&opiatu Eskuinera eta Aurrera egin\tAlt+Ctrl+Right"
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "K&opiatu Eskuinera eta Aurrera egin\tCtrl+Alt+Right"

#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Kopiatu Ez&kerrera eta Aurrera egin\tAlt+Ctrl+Right"
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopiatu Ez&kerrera eta Aurrera egin\tCtrl+Alt+Right"

#, c-format
msgid "Copy &All to Right"
Expand All @@ -831,8 +828,7 @@ msgstr "Kopiatu &Dena Eskuinera"
msgid "Cop&y All to Left"
msgstr "Kopia&tu Dena Ezkerrera"

#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""

#, c-format
Expand Down Expand Up @@ -1753,9 +1749,8 @@ msgstr ""
msgid "Filefilters"
msgstr "Agiri-iragazkiak"

#, c-format
msgid "Test"
msgstr "Azterketa"
msgid "Test..."
msgstr "Azterketa..."

#, c-format
msgid "Install..."
Expand Down Expand Up @@ -2073,8 +2068,7 @@ msgstr "E&zeztatu"
msgid "Test Filter"
msgstr "Azterketa Iragazkia"

#, c-format
msgid "Testing filter ..."
msgid "Testing filter..."
msgstr "Iragazkia aztertzen..."

#, c-format
Expand Down Expand Up @@ -2257,8 +2251,7 @@ msgstr "&Alderaketa azkar muga (MB):"
msgid "&Binary compare limit (MB):"
msgstr ""

#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgstr ""

msgctxt "Options dialog|Categories"
Expand Down Expand Up @@ -2840,20 +2833,14 @@ msgstr ""
"Jarraitu horrela ere?"

#, c-format
msgid ""
"Saving file failed.\n"
"%1\n"
"%2\n"
"Do you want to:\n"
"\t-use a different filename (Press Ok)\n"
"\t-abort the current operation (Press Cancel)?"
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
msgstr ""
"Agiri gordetze hutsegitea.\n"
"%1\n"
"%2\n"
"Nahi duzu:\n"
"\t-agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n"
"\t-uneko eragiketa uztea (Sakatu Ezeztatu)?"
"\t- agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n"
"\t- uneko eragiketa uztea (Sakatu Ezeztatu)?"

#, c-format
msgid ""
Expand Down Expand Up @@ -3578,12 +3565,9 @@ msgid "Do you want to move to the previous page?"
msgstr ""

#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \n"
"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
"Would you like to treat both files as being in the default Windows codepage (recommended)?"
msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
msgstr ""
"Kode-orrialde ezberdinak aurkitu dira ezkerreko (cp%d) eta eskuineko (cp%d) agirietan. \n"
"Kode-orrialde ezberdinak aurkitu dira ezkerreko (cp%d) eta eskuineko (cp%d) agirietan.\n"
"Erakutsiz agiri bakoitza kode-orrialde horretan erakuspen hobeago bat emango du baina batzea/kopiatzea kaltegarria izango da.\n"
"Nahi duzu agiri biak tratatzea windowsen kode-orrialde berezkoan (gomendatuta)?"

Expand Down
58 changes: 21 additions & 37 deletions Translations/WinMerge/Brazilian.po
Original file line number Diff line number Diff line change
Expand Up @@ -560,12 +560,11 @@ msgstr "Salvar &o da Direita Como..."
msgid "&Print..."
msgstr "&Imprimir..."

msgid "Page Set&up"
msgstr "Configuração da Pá&gina"
msgid "Page Set&up..."
msgstr "Configuração da Pá&gina..."

#, c-format
msgid "Print Previe&w"
msgstr "Pré-Visualização da Impressã&o"
msgid "Print Previe&w..."
msgstr "Pré-Visualização da Impressã&o..."

#, c-format
msgid "&Convert Line Endings to"
Expand Down Expand Up @@ -815,13 +814,11 @@ msgstr "Copiar da Esquerda\tAlt+Shift+Right"
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Copiar da Direita\tAlt+Shift+Left"

#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "C&opiar para a Direita e Avançar\tAlt+Ctrl+Direita"
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "C&opiar para a Direita e Avançar\tCtrl+Alt+Direita"

#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Copiar &para a Esquerda e Avançar\tAlt+Ctrl+Esquerda"
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Copiar &para a Esquerda e Avançar\tCtrl+Alt+Esquerda"

#, c-format
msgid "Copy &All to Right"
Expand All @@ -831,9 +828,8 @@ msgstr "Copiar &Tudo pra Direita"
msgid "Cop&y All to Left"
msgstr "Cop&iar Tudo pra Esquerda"

#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
msgstr "A&uto-Unir\tAlt+Ctrl+M"
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "A&uto-Unir\tCtrl+Alt+M"

#, c-format
msgid "Add &Synchronization Point\tAlt+S"
Expand Down Expand Up @@ -1753,9 +1749,8 @@ msgstr "C&aracters da quebra de linha:"
msgid "Filefilters"
msgstr "Filtros dos arquivos"

#, c-format
msgid "Test"
msgstr "Teste"
msgid "Test..."
msgstr "Teste..."

#, c-format
msgid "Install..."
Expand Down Expand Up @@ -2077,9 +2072,8 @@ msgstr "&Cancelar"
msgid "Test Filter"
msgstr "Testar Filtro"

#, c-format
msgid "Testing filter ..."
msgstr "Testando o filtro ..."
msgid "Testing filter..."
msgstr "Testando o filtro..."

#, c-format
msgid "&Enter text to test:"
Expand Down Expand Up @@ -2261,9 +2255,8 @@ msgstr "&Limite de comparação rápida (MB):"
msgid "&Binary compare limit (MB):"
msgstr ""

#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgstr "&Número dos threads de comparação (um valor negativo implica em adição do número de cores da CPU disponíveis):"
msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgstr "\n&Número dos threads de comparação (um valor negativo implica em adição do número de cores da CPU disponíveis):"

msgctxt "Options dialog|Categories"
msgid "Binary"
Expand Down Expand Up @@ -2864,20 +2857,14 @@ msgstr ""
"Continuar de qualquer maneira?"

#, c-format
msgid ""
"Saving file failed.\n"
"%1\n"
"%2\n"
"Do you want to:\n"
"\t-use a different filename (Press Ok)\n"
"\t-abort the current operation (Press Cancel)?"
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
msgstr ""
"Falhou em salvar o arquivo.\n"
"%1\n"
"%2\n"
"Você quer:\n"
"\t-usar um nome de arquivo diferente (Pressione Ok)\n"
"\t-abortar a operação atual (Pressione Cancelar)?"
"\t- usar um nome de arquivo diferente (Pressione Ok)\n"
"\t- abortar a operação atual (Pressione Cancelar)?"

#, c-format
msgid ""
Expand Down Expand Up @@ -3602,12 +3589,9 @@ msgid "Do you want to move to the previous page?"
msgstr "Você quer mover para a página anterior?"

#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \n"
"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
"Would you like to treat both files as being in the default Windows codepage (recommended)?"
msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
msgstr ""
"Códigos de páginas diferentes achados nos arquivos da esquerda (cp%d) e direita (cp%d). \n"
"Códigos de páginas diferentes achados nos arquivos da esquerda (cp%d) e direita (cp%d).\n"
"Exibir cada arquivo na sua página de código dará uma melhor exibição mas unir/copiar será perigoso.\n"
"Você gostaria de tratar ambos os arquivos como estando na página do código padrão do windows? (recomendado)"

Expand Down

0 comments on commit cf738b0

Please sign in to comment.