From 6d7ee6503fa4ae3cbc902ce2aa911c39e44b9445 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Aug 2016 11:47:35 +0000 Subject: [PATCH] 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" --- app/org.kde.kdevelop.desktop | 1 + app/org.kde.kdevelop_ps.desktop | 1 + .../cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate | 2 ++ .../cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate | 2 ++ app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate | 2 ++ file_templates/testing/cpp_cpputest/cpp_cpputest.desktop | 2 ++ file_templates/testing/cpp_gtest/cpp_gtest.desktop | 2 ++ 7 files changed, 12 insertions(+) diff --git a/app/org.kde.kdevelop.desktop b/app/org.kde.kdevelop.desktop index cf3ad4098f..4976ab1967 100644 --- a/app/org.kde.kdevelop.desktop +++ b/app/org.kde.kdevelop.desktop @@ -22,6 +22,7 @@ Name[nl]=KDevelop Name[pl]=KDevelop Name[pt]=KDevelop Name[pt_BR]=KDevelop +Name[ru]=KDevelop Name[sk]=KDevelop Name[sl]=KDevelop Name[sv]=KDevelop diff --git a/app/org.kde.kdevelop_ps.desktop b/app/org.kde.kdevelop_ps.desktop index 7b77557595..f86a7c45f2 100644 --- a/app/org.kde.kdevelop_ps.desktop +++ b/app/org.kde.kdevelop_ps.desktop @@ -21,6 +21,7 @@ Name[nl]=KDevelop (pak een sessie) Name[pl]=KDevelop (Wybór sesji) Name[pt]=KDevelop (Seleccionar uma Sessão) Name[pt_BR]=KDevelop (selecionar uma sessão) +Name[ru]=KDevelop (с выбором сеанса) Name[sk]=KDevelop (zvoliť sedenie) Name[sl]=KDevelop (izbor seje) Name[sv]=KDevelop (välj session) diff --git a/app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate b/app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate index 86bb1d0314..4c24c073e1 100644 --- a/app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate +++ b/app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate @@ -15,6 +15,7 @@ Name[nl]=CMake Qt5 - C++ Name[pl]=CMake Qt5 - C++ Name[pt]=CMake com Qt5 - C++ Name[pt_BR]=CMake Qt5 - C++ +Name[ru]=Qt5-C++ (CMake) Name[sk]=CMake Qt5 - C++ Name[sl]=CMake Qt5 - C++ Name[sv]=CMake Qt5 - C++ @@ -35,6 +36,7 @@ Comment[nl]=Gui-toepassing van Qt5 CMake. Genereert een op CMake/Qt5 gebaseerd G Comment[pl]=Program Qt5 CMake Gui. Generuj programy oparte o CMake/Qt5 (zgodne na wielu platformach) Comment[pt]=Aplicação Gráfica com CMake para o Qt5. Gera uma aplicação baseada no QMake/Qt5 com uma interface gráfica (compatível com várias plataformas) Comment[pt_BR]=Aplicativo gráfico com CMake para Qt5. Gera um aplicativo de interface em CMake/Qt5 (compatível com várias plataformas) +Comment[ru]=Графическое приложение на Qt5 и CMake. Создаёт графическое кроссплатформенное приложение на базе CMake/Qt5. Comment[sk]=Aplikácia Qt5 CMake Gui. Generuje GUI aplikáciu založenú na CMake/Qt5 (cross-platformovo kompatibilné) Comment[sl]=Ustvari program z grafičnim uporabniškim vmesnikom temelječ na CMake/Qt5 (združljiv z več okolji) Comment[sv]=Qt5 CMake-program med grafiskt användargränssnitt. Skapa ett CMake/Qt5-baserat program med grafiskt användargränssnitt (som fungerar på flera plattformar) diff --git a/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate b/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate index 540f17eced..8de4335bad 100644 --- a/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate +++ b/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate @@ -25,6 +25,7 @@ Name[nl]=Qt4-GUI-toepassing Name[pl]=Aplikacja (GUI) QT4 Name[pt]=Uma Aplicação Gráfica do Qt4 Name[pt_BR]=Aplicativo gráfico do Qt4 +Name[ru]=Графическое приложение на Qt4 Name[sk]=Aplikácia Qt4 GUI Name[sl]=Grafični program za Qt4 Name[sv]=Qt4-program med grafiskt användargränssnitt @@ -57,6 +58,7 @@ Comment[nn]=Lag eit QMake/Qt4-basert program med grafisk brukargrensesnitt (krys Comment[pl]=Generuje program używający QMake i Qt/4 z graficznym interfejsem użytkownika (wieloplatformowy) Comment[pt]=Gera uma aplicação baseada no QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) Comment[pt_BR]=Gera um aplicativo em QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) +Comment[ru]=Основа приложения на Qt4 и CMake. Создаёт кроссплатформенное графическое приложение на базе CMake/Qt4. Comment[sk]=Generovať aplikáciu QMake/Qt4 s grafickým používateľským rozhraním (crossplatformovo kompatibilný) Comment[sl]=Ustvari program temelječ na CMake/Qt4 z grafičnim uporabniškim vmesnikom (združljiv z več okolji) Comment[sv]=Skapa ett CMake/Qt4-baserat program med grafiskt användargränssnitt (som fungerar på flera plattformar) diff --git a/app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate b/app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate index 52fc7746fb..30f689e4a2 100644 --- a/app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate +++ b/app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate @@ -16,6 +16,7 @@ Name[nl]=Qt5-QML2-toepassing Name[pl]=Program QML2 Qt5 Name[pt]=Aplicação em QML2 do Qt5 Name[pt_BR]=Aplicativo em QML2 do Qt5 +Name[ru]=Приложение на Qt5 и QML2 Name[sk]=Qt5 QML2 aplikácia Name[sl]=Program Qt5 QML2 Name[sv]=Qt5 QML2-program @@ -37,6 +38,7 @@ Comment[nl]=Een Qt5 en QML2 basistoepassing met QMake. Waarschuwing, u hebt er Q Comment[pl]=Podstawowy program Qt5 i QML2 wykorzystujący QMake. Uwaga, do tego potrzebujesz Qt5, a nie Qt4. Comment[pt]=Uma aplicação básica em Qt5 e QML2 que usa o QMake. Atenção: é necessário o Qt5 para tal, não o Qt4. Comment[pt_BR]=Aplicativo básico em Qt5 e QML2 que usa o QMake. Atenção, para isso é necessário o Qt5, não o Qt4. +Comment[ru]=Простое приложение на Qt5 и QML2, использующее QMake. Внимание: требуется Qt5. Comment[sk]=Qt5 a QML2 aplikácia pomocou QMake. Upozornenie, potrebujete Qt5 nie Qt4. Comment[sl]=Osnovni program Qt5 in QML2 z uporabo QMake. Opozorilo: potrebujete Qt5 in ne Qt4. Comment[sv]=Ett Qt5 och QML2-baserat program som använder QMake. Varning: Man behöver Qt5 för det, inte Qt4. diff --git a/file_templates/testing/cpp_cpputest/cpp_cpputest.desktop b/file_templates/testing/cpp_cpputest/cpp_cpputest.desktop index 09b1cebdb1..c128c818fb 100644 --- a/file_templates/testing/cpp_cpputest/cpp_cpputest.desktop +++ b/file_templates/testing/cpp_cpputest/cpp_cpputest.desktop @@ -14,6 +14,7 @@ Name[nl]=CppUTest Name[pl]=CppUTest Name[pt]=CppUTest Name[pt_BR]=CppUTest +Name[ru]=CppUTest Name[sk]=CppUTest Name[sl]=CppUTest Name[sv]=CppUTest @@ -36,6 +37,7 @@ Comment[nl]=Een test van een eenheid met gebruik van de bibliotheek CppUTest Comment[pl]=Jednostkowy test wykorzystujący bibliotekę CppUTest Comment[pt]=Um teste unitário que usa a plataforma CppUTest Comment[pt_BR]=Teste unitário que usa a biblioteca CppUTest +Comment[ru]=Модульный тест на базе библиотеки CppUTest Comment[sk]=Unit test pomocou frameworku CppUTest Comment[sl]=Preizkus enote z uporabo knjižnice CppUTest Comment[sv]=En enhetstest som använder biblioteket CppUTest diff --git a/file_templates/testing/cpp_gtest/cpp_gtest.desktop b/file_templates/testing/cpp_gtest/cpp_gtest.desktop index ec8e59a4e7..4ff238d5cf 100644 --- a/file_templates/testing/cpp_gtest/cpp_gtest.desktop +++ b/file_templates/testing/cpp_gtest/cpp_gtest.desktop @@ -13,6 +13,7 @@ Name[nl]=Google Test Name[pl]=Google Test Name[pt]=Teste do Google Name[pt_BR]=Google Test +Name[ru]=Google Test Name[sk]=Google Test Name[sl]=Google Test Name[sv]=Google Test @@ -32,6 +33,7 @@ Comment[nl]=Een test van een eenheid met gebruik van de bibliotheek Google Test Comment[pl]=Jednostkowy test wykorzystujący bibliotekę Google Test Comment[pt]=Um teste unitário que usa a plataforma de testes do Google Comment[pt_BR]=Teste unitário que usa a biblioteca Google Test +Comment[ru]=Модульный тест на базе библиотеки Google Test Comment[sk]=Unit test pomocou knižnice Google Test Comment[sl]=Preizkus enote z uporabo knjižnice Google Test Comment[sv]=En enhetstest som använder biblioteket Google Test -- GitLab