[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:25:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=6d70c45
The following commit has been merged in the master branch:
commit 6d70c45ad5cb661d3d0c43d09eda7c998e797852
Author: l10n daemon script <scripty at kde.org>
Date: Sun Jul 5 10:01:43 2015 +0000
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
config/appearance/kcm_ktp_chat_appearance.desktop | 4 ++--
config/behavior/kcm_ktp_chat_behavior.desktop | 2 +-
config/messages/kcm_ktp_chat_messages.desktop | 2 +-
config/otr/kcm_ktp_chat_otr.desktop | 2 +-
filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake | 2 +-
filters/formatting/ktptextui_message_filter_formatting.desktop.cmake | 2 +-
filters/images/ktptextui_message_filter_images.desktop.cmake | 2 +-
filters/latex/ktptextui_message_filter_latex.desktop.cmake | 4 ++--
filters/otr/ktptextui_message_filter_otr.desktop.cmake | 2 +-
.../ktptextui_message_filter_searchexpansion.desktop.cmake | 2 +-
filters/youtube/ktptextui_message_filter_youtube.desktop.cmake | 2 +-
logviewer/ktp-log-viewer.desktop | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/config/appearance/kcm_ktp_chat_appearance.desktop b/config/appearance/kcm_ktp_chat_appearance.desktop
index 94dd780..f841f2e 100644
--- a/config/appearance/kcm_ktp_chat_appearance.desktop
+++ b/config/appearance/kcm_ktp_chat_appearance.desktop
@@ -41,7 +41,7 @@ Name[nl]=Uiterlijk van chat-venster
Name[pa]=ਗੱਲਾਬਤ ਵਿੰਡੋ ਦਿੱਖ
Name[pl]=Wygląd okna rozmowy
Name[pt]=Aparência da Janela de Conversação
-Name[pt_BR]=Aparência da janela de bate-papo
+Name[pt_BR]=Aparência da janela de conversas
Name[ro]=Aspectul ferestrei de discuții
Name[ru]=Внешний вид окна общения
Name[sk]=Vzhľad okna rozhovoru
@@ -86,7 +86,7 @@ Comment[nl]=Kies een stijl voor uw chatvenster en pas het aan
Comment[pa]=ਆਪਣੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਦੇ ਸਟਾਈਲ ਦੀ ਚੋਣ ਕਰੋ ਤੇ ਇਹ ਨੂੰ ਕਸਮਾਈਜ਼ ਕਰੋ
Comment[pl]=Wybierz styl dla twojego okna rozmowy i dostosuj go
Comment[pt]=Escolha um estilo para a sua janela de conversação e personalize-o
-Comment[pt_BR]=Escolha o estilo da sua janela de bate-papo e personalize-a
+Comment[pt_BR]=Escolha o estilo da sua janela de conversas e personalize-a
Comment[ro]=Alegeți un stil pentru fereastra de discuții și personalizați-l
Comment[ru]=Выбор и изменение стиля окна общения
Comment[sk]=Vyberte štýl pre vaše okno rozhovoru a upravte si ho
diff --git a/config/behavior/kcm_ktp_chat_behavior.desktop b/config/behavior/kcm_ktp_chat_behavior.desktop
index 6204aa9..f486be2 100644
--- a/config/behavior/kcm_ktp_chat_behavior.desktop
+++ b/config/behavior/kcm_ktp_chat_behavior.desktop
@@ -40,7 +40,7 @@ Name[nl]=Gedrag van tabblad Chat
Name[pa]=ਗੱਲਬਾਤ ਟੈਬ ਰਵੱਈਆ
Name[pl]=Zachowanie karty rozmowy
Name[pt]=Comportamento da Página de Conversação
-Name[pt_BR]=Comportamento da aba de bate-papo
+Name[pt_BR]=Comportamento da aba de conversas
Name[ro]=Comportamentul filelor de discuție
Name[ru]=Поведение вкладок общения
Name[sk]=Správanie karty rozhovoru
diff --git a/config/messages/kcm_ktp_chat_messages.desktop b/config/messages/kcm_ktp_chat_messages.desktop
index 2810d16..f9d9cde 100644
--- a/config/messages/kcm_ktp_chat_messages.desktop
+++ b/config/messages/kcm_ktp_chat_messages.desktop
@@ -77,7 +77,7 @@ Comment[nl]=Hoe te handelen met extra informatie verkregen uit berichten
Comment[pa]=ਸੁਨੇਹਿਆਂ ਨੂੰ ਪ੍ਰਾਪਤ ਵਾਧੂ ਜਾਣਕਾਰੀ ਨਾਲ ਕਿਵੇਂ ਨਿਪਟਿਆ ਜਾਵੇ
Comment[pl]=Sposób radzenia sobie z dodatkowymi informacjami uzyskanymi z wiadomości
Comment[pt]=Como lidar com a informação extra obtida a partir das mensagens
-Comment[pt_BR]=Como lidar com informações adicionais obtidas a partir de mensagens
+Comment[pt_BR]=Como tratar as informações extras recebidas com as mensagens
Comment[ro]=Cum să procedați cu informațiile suplimentare obținute din mesaje
Comment[ru]=Обработка дополнительных данных в сообщениях
Comment[sk]=Ako sa vysporiadať s dodatočnými informáciami získanými zo správ
diff --git a/config/otr/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
index 17aa7cc..62371be 100644
--- a/config/otr/kcm_ktp_chat_otr.desktop
+++ b/config/otr/kcm_ktp_chat_otr.desktop
@@ -31,7 +31,7 @@ Comment[nl]=Versleutel gesprekken met Off-The-Record-versleuteling
Comment[nn]=Krypter prateøkter med Off-The-Record-kryptering
Comment[pl]=Szyfrowanie sesji rozmowy za pomocą Off-The-Record
Comment[pt]=Encriptar as sessões de conversão com encriptação OTR (Off-The-Record - Não Oficial)
-Comment[pt_BR]=Criptografa as sessões de bate-papo com criptografia OTR (Off-The-Record)
+Comment[pt_BR]=Criptografa as sessões de conversas com criptografia OTR (Off-The-Record)
Comment[ro]=Criptează sesiunile de discuție cu criptare Off-The-Record
Comment[ru]=Шифрование разговоров по протоколу OTR
Comment[sk]=Zašifruje rozhovory pomocou Off-The-Record (OTR) šifrovania
diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
index 849286e..6ef84c6 100644
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
@@ -74,7 +74,7 @@ Comment[nl]=Emoticons tonen (lachende gezichtjes) in de chat
Comment[pa]=ਗੱਲਬਾਤ ਵਿੱਚ ਈਮੋਸ਼ਨ (ਮੁਖੜੇ) ਵੇਖਾਓ
Comment[pl]=Pokaż emotikony (buźki) wewnątrz okna rozmowy
Comment[pt]=Mostrar os ícones emotivos nas conversas
-Comment[pt_BR]=Mostra emoticons (carinhas) dentro do bate-papo
+Comment[pt_BR]=Mostra emoticons (carinhas) dentro da conversa
Comment[ro]=Arată emoticoni (fețe zîmbitoare) în interiorul discuției
Comment[ru]=Показывать смайлики в чате
Comment[sk]=Zobraziť emotikony (smajlíkov) v rozhovore
diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
index 6d44d9b..d1d71cd 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
@@ -29,7 +29,7 @@ Name[nl]=Tekstopmaak
Name[pa]=ਟੈਕਸਟ ਫਾਰਮੈਟ
Name[pl]=Formatowanie tekstu
Name[pt]=Formatação do Texto
-Name[pt_BR]=Formatação do texto
+Name[pt_BR]=Formatação de texto
Name[ro]=Formatarea textului
Name[ru]=Форматирование текста
Name[sk]=Formátovanie textu
diff --git a/filters/images/ktptextui_message_filter_images.desktop.cmake b/filters/images/ktptextui_message_filter_images.desktop.cmake
index 5ce963d..2c24dc8 100644
--- a/filters/images/ktptextui_message_filter_images.desktop.cmake
+++ b/filters/images/ktptextui_message_filter_images.desktop.cmake
@@ -71,7 +71,7 @@ Comment[nds]=En Vöransicht för elkeen binnen en Klöönsnack loosstüert Bild-
Comment[nl]=Een miniatuur of elke verzonden URL van een afbeelding inbedden in een chat
Comment[pl]=Osadź miniaturę jakiegokolwiek adresu URL obrazu w oknie rozmowy
Comment[pt]=Incorporar uma miniatura de qualquer URL de imagens numa conversa
-Comment[pt_BR]=Insere uma miniatura de qualquer URL de imagem enviada no bate-papo
+Comment[pt_BR]=Insere uma miniatura de qualquer URL de imagem enviada em uma conversa
Comment[ro]=Înglobează miniatura oricărui URL de imagine trimis într-o discuție
Comment[ru]=Встраивание миниатюры для любой ссылки на изображение
Comment[sk]=Zahrnúť náhľad každej URL poslanej v rozhovore
diff --git a/filters/latex/ktptextui_message_filter_latex.desktop.cmake b/filters/latex/ktptextui_message_filter_latex.desktop.cmake
index eeb0726..3c66237 100644
--- a/filters/latex/ktptextui_message_filter_latex.desktop.cmake
+++ b/filters/latex/ktptextui_message_filter_latex.desktop.cmake
@@ -41,7 +41,7 @@ Name[nl]=LaTeX-renderer
Name[pa]=LaTeX ਰੈਂਡਰ
Name[pl]=Wyświetlanie LaTeX
Name[pt]=Representação em LaTeX
-Name[pt_BR]=Renderizador de LaTeX
+Name[pt_BR]=Representação de LaTeX
Name[ro]=Randor LaTeX
Name[ru]=Визуализатор LaTeX
Name[sk]=Vykresľovač LaTeX
@@ -82,7 +82,7 @@ Comment[nds]=Bargt rinkamen Narichten LaTeX twischen $-Tekens, warrt dat direkte
Comment[nl]=Als een inkomend bericht LaTeX tussen $$ bevat, zal het direct in de chat worden weergegeven
Comment[pl]=Jeśli przychodząca wiadomość będzie zawierać składnię LaTeX pomiędzy $$, to zostanie ona wyświetlona bezpośrednio w rozmowie.
Comment[pt]=Se as mensagens recebidas tiverem código em LaTeX entre $$, o mesmo será desenhado directamente na conversa.
-Comment[pt_BR]=Se existir código em LaTeX entre $$ nas mensagens recebidas, ele será mostrado no bate-papo.
+Comment[pt_BR]=Se existir código em LaTeX entre $$ nas mensagens recebidas, ele será representado na conversa
Comment[ru]=Если входящие сообщения содержат код LaTeX между символами $$, он будет отрисован в чате.
Comment[sk]=Ak prichádzajúca správa obsahuje LaTeX medzi $$, vykreslí to rovno do rozhovoru.
Comment[sl]=Če bo katerokoli dohodno sporočilo vsebovalo LaTeX med $$, bo samodejno izrisan v klepetu.
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index aedd3fc..ca1b112 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -55,7 +55,7 @@ Comment[nb]=Hvis en melding er en OTR-melding blir den ikke vist
Comment[nl]=Als een bericht een OTR-bericht is, zal het niet getoond worden
Comment[pl]=Jeśli wiadomość jest wiadomością OTR, to nie zostanie pokazana
Comment[pt]=Se uma dada mensagem for em OTR, não será apresentada
-Comment[pt_BR]=Se uma determinada mensagem for em OTR, não será apresentada
+Comment[pt_BR]=Se receber uma mensagem em OTR, ela não será apresentada
Comment[ru]=Если сообщение зашифровано по протоколу OTR, то оно не будет показано
Comment[sk]=Ak správa je OTR správa, nebude zobrazená
Comment[sl]=Če je sporočilo vrste OTR, ne bo prikazano
diff --git a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
index 2004890..d8fc5dd 100644
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
@@ -30,7 +30,7 @@ Name[nn]=Vevsnarvegar
Name[pa]=ਵੈੱਬ ਸ਼ਾਰਟਕੱਟ
Name[pl]=Skróty sieciowe
Name[pt]=Atalhos Web
-Name[pt_BR]=Atalhos da Internet
+Name[pt_BR]=Atalhos da Web
Name[ro]=Acceleratori web
Name[ru]=Веб-сокращения
Name[se]=Fierpmádatlávkestagat
diff --git a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
index 679b305..84e0796 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -69,7 +69,7 @@ Comment[nds]=För elkeen binnen en Naricht vörhannen Link op en YouTube-Video e
Comment[nl]=Als een bericht een koppeling bevat naar een YouTube video, zal het ingebed worden als een voorbeeld in de chat
Comment[pl]=Jeśli jakakolwiek wiadomość zawiera odnośnik do filmu na YouTube, to zostanie osadzony jej podgląd w oknie rozmowy
Comment[pt]=Se alguma das mensagens tiver um endereço de um vídeo do YouTube, irá incorporar uma antevisão na conversa
-Comment[pt_BR]=Se alguma mensagem tiver um link para um vídeo do YouTube, será embutida uma visualização no bate-papo
+Comment[pt_BR]=Se alguma mensagem tiver um link para um vídeo do YouTube, será embutida uma visualização na conversa
Comment[ro]=Dacă vreun mesaj conține o legătură la un video YouTube, aceasta va încorpora o previzualizare în discuție
Comment[ru]=Встраивание видео с YouTube при получении ссылки на него
Comment[sk]=Ak nejaká správa obsahuje odkaz na video YouTube, budu vložený náhľad do rozhovoru
diff --git a/logviewer/ktp-log-viewer.desktop b/logviewer/ktp-log-viewer.desktop
index d8a60c9..d6966ef 100644
--- a/logviewer/ktp-log-viewer.desktop
+++ b/logviewer/ktp-log-viewer.desktop
@@ -29,7 +29,7 @@ Name[nl]=KDE viewer voor IM-log
Name[pa]=KDE IM ਲਾਗ ਝਲਕ
Name[pl]=Przeglądarka dziennika KI KDE
Name[pt]=Visualizador dos Registos de MI do KDE
-Name[pt_BR]=Visualizador de registros de MI do KDE
+Name[pt_BR]=Visualizador de Registros de MI do KDE
Name[ro]=Vizualizator de jurnale pentru MI KDE
Name[ru]=Просмотр журнала общения в KDE
Name[sk]=Prehliadač záznamu KDE IM
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list