Commit 0b6b8cf7 authored by Script Kiddy's avatar Script Kiddy

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"
parent bd8a49a1
Pipeline #31831 skipped
......@@ -263,6 +263,7 @@ Name[fi]=Ladataan projekti
Name[fr]=Chargement du projet
Name[ga]=Tionscadal á Luchtú
Name[gl]=Cargando o proxecto
Name[hi]=परियोजना लोड किया जा रहा है
Name[hu]=Projekt betöltése
Name[it]=Caricamento del progetto
Name[ja]=プロジェクトの読み込み
......@@ -300,6 +301,7 @@ Comment[et]=Projekti laadimine just käivitati
Comment[fi]=Projektin lataamisprosessi on juuri alkanut
Comment[fr]=Un processus de chargement de projet vient de démarrer
Comment[gl]=Acaba de comezar un proceso de carga dun proxecto
Comment[hi]=परियोजना लोड क्रिया आरंभ हुई
Comment[hu]=A projekt betöltési folyamata elkezdődött
Comment[it]=È appena iniziato il caricamento di un progetto
Comment[ja]=プロジェクトの読み込みを開始しました
......@@ -462,6 +464,7 @@ Name[et]=Katkestuspunkti tabamus
Name[fi]=Keskeytyskohtaosuma
Name[fr]=Point d'arrêt atteint
Name[gl]=Acadouse un punto de parada
Name[hi]=ब्रेकपाइंट लगा
Name[hu]=Töréspont találat
Name[it]=Breakpoint raggiunto
Name[ja]=ブレイクポイントをヒット
......@@ -499,6 +502,7 @@ Comment[et]=Silur jõudis katkestuspunktini
Comment[fi]=Virheenpaikannin on osunut keskeytyskohtaan
Comment[fr]=Un point d'arrêt a été atteint par le débogueur
Comment[gl]=O depurador chegou a un punto de parada
Comment[hi]=ब्रेकपाइंट
Comment[hu]=Egy töréspontot ért el a hibakereső
Comment[it]=Un breakpoint è stato raggiunto dal debugger
Comment[ja]=デバッガがブレイクポイントをヒットしました
......@@ -539,6 +543,7 @@ Name[et]=Jälgimispunkti tabamus
Name[fi]=Seurantakohtaosuma
Name[fr]=Point de surveillance atteint
Name[gl]=Acadouse un punto de vixilancia
Name[hi]=जांच
Name[hu]=Figyelőpont találat
Name[it]=Watchpoint raggiunto
Name[ja]=ウォッチポイントをヒット
......
......@@ -88,6 +88,7 @@ Name[es]=Abrir una sesión
Name[et]=Seansi avamine
Name[fr]=Ouvrir une session
Name[gl]=Abrir unha sesión
Name[hi]=सत्र खोलें
Name[it]=Apri una sessione
Name[ko]=세션 열기
Name[nl]=Een sessie openen
......
......@@ -10,6 +10,7 @@ Name[es]=Complemento sencillo de KDevelop
Name[et]=Lihtne KDevelopi plugin
Name[fr]=Module d'extension KDevelop simple
Name[gl]=Complemento simple de KDevelop
Name[hi]=सरल के-डेवलप प्लगिन
Name[it]=Semplice estensione per KDevelop
Name[ko]=간단한 KDevelop 플러그인
Name[nl]=Eenvoudige KDevelop-plug-in
......
......@@ -9,6 +9,7 @@ Name[es]=En blanco
Name[et]=Tühi
Name[fr]=Vide
Name[gl]=Baleiro
Name[hi]=खाली
Name[it]=Vuoto
Name[ko]=비어 있음
Name[nb]=Tom
......
......@@ -13,6 +13,7 @@ Name[et]=GObject
Name[fi]=GObject
Name[fr]=GObject
Name[gl]=GObject
Name[hi]=GObject
Name[hu]=GObject
Name[it]=GObject
Name[kk]=GObject
......@@ -79,6 +80,7 @@ Language[fi]=C
Language[fr]=C
Language[ga]=C
Language[gl]=C
Language[hi]=C
Language[hu]=C
Language[it]=C
Language[kk]=C
......
......@@ -77,6 +77,7 @@ Language[fi]=C
Language[fr]=C
Language[ga]=C
Language[gl]=C
Language[hi]=C
Language[hu]=C
Language[it]=C
Language[kk]=C
......
......@@ -77,6 +77,7 @@ Language[fi]=C
Language[fr]=C
Language[ga]=C
Language[gl]=C
Language[hi]=C
Language[hu]=C
Language[it]=C
Language[kk]=C
......
......@@ -82,6 +82,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -77,6 +77,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -82,6 +82,7 @@ Language[fi]=Python
Language[fr]=Python
Language[ga]=Python
Language[gl]=Python
Language[hi]=Python
Language[hu]=Python
Language[it]=Python
Language[kk]=Python
......@@ -123,6 +124,7 @@ Name[et]=Definitsioon
Name[fi]=Toteutus
Name[fr]=Définition
Name[gl]=Definición
Name[hi]=परिभाषा
Name[hu]=Definíció
Name[it]=Definizione
Name[kk]=Анықтама
......
......@@ -56,6 +56,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -8,6 +8,7 @@ Name[es]=Subclase «pimpl» de QAbstractItemModel
Name[et]=QAbstractItemModel pimpl alamklass
Name[fr]=Sous-classe QAbstractItemModel pimpl
Name[gl]=Subclase de QAbstractItemModel con punteiro opaco
Name[hi]=QAbstractItemModel pimpl subclass
Name[it]=Sottoclasse pimpl di QAbstractItemModel
Name[ko]=QAbstractItemModel pimpl 하위 클래스
Name[nl]=QAbstractItemModel pimpl subclass
......@@ -55,6 +56,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -55,6 +55,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......@@ -172,6 +173,7 @@ Name[et]=Kasutajaliides
Name[fi]=Käyttöliittymä
Name[fr]=Interface utilisateur
Name[gl]=Interface de usuario
Name[hi]=यूज़र इंटरफेस
Name[hu]=Felhasználói felület
Name[it]=Interfaccia utente
Name[kk]=Пайдаланушы интерфейсі
......
......@@ -59,6 +59,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......@@ -211,6 +212,7 @@ Name[et]=Kasutajaliides
Name[fi]=Käyttöliittymä
Name[fr]=Interface utilisateur
Name[gl]=Interface de usuario
Name[hi]=यूज़र इंटरफेस
Name[hu]=Felhasználói felület
Name[it]=Interfaccia utente
Name[kk]=Пайдаланушы интерфейсі
......
......@@ -80,6 +80,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -9,6 +9,7 @@ Name[es]=Subclase «pimpl» de QObject
Name[et]=QObject pimpl alamklass
Name[fr]=Sous-classe QObject
Name[gl]=Subclase de QObject con punteiro opaco
Name[hi]=QObject pimpl subclass
Name[it]=Sottoclasse pimpl di QObject
Name[ko]=QObject pimpl 하위 클래스
Name[nl]=pimpl subklasse van QObject
......@@ -60,6 +61,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -60,6 +60,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -77,6 +77,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -77,6 +77,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......@@ -193,6 +194,7 @@ Name[et]=Kasutajaliides
Name[fi]=Käyttöliittymä
Name[fr]=Interface utilisateur
Name[gl]=Interface de usuario
Name[hi]=यूज़र इंटरफेस
Name[hu]=Felhasználói felület
Name[it]=Interfaccia utente
Name[kk]=Пайдаланушы интерфейсі
......
......@@ -55,6 +55,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......@@ -206,6 +207,7 @@ Name[et]=Kasutajaliides
Name[fi]=Käyttöliittymä
Name[fr]=Interface utilisateur
Name[gl]=Interface de usuario
Name[hi]=यूज़र इंटरफेस
Name[hu]=Felhasználói felület
Name[it]=Interfaccia utente
Name[kk]=Пайдаланушы интерфейсі
......
......@@ -78,6 +78,7 @@ Language[fi]=CMake
Language[fr]=CMake
Language[ga]=CMake
Language[gl]=CMake
Language[hi]=CMake
Language[hu]=CMake
Language[it]=CMake
Language[kk]=CMake
......@@ -119,6 +120,7 @@ Name[et]=Moodul
Name[fi]=Moduuli
Name[fr]=Module
Name[gl]=Módulo
Name[hi]=मॉडयूल
Name[hu]=Modul
Name[it]=Modulo
Name[kk]=Модулі
......
......@@ -9,6 +9,7 @@ Name[et]=CppUTest
Name[fi]=CppUTest
Name[fr]=CppUTest
Name[gl]=CppUTest
Name[hi]=CppUTest
Name[it]=CppUTest
Name[ko]=CppUTest
Name[nl]=CppUTest
......@@ -63,6 +64,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -9,6 +9,7 @@ Name[et]=Google Test
Name[fi]=Google Test
Name[fr]=Google Test
Name[gl]=Google Test
Name[hi]=गूगल जांच
Name[it]=Google Test
Name[ko]=Google Test
Name[nl]=Google Test
......@@ -63,6 +64,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -78,6 +78,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -77,6 +77,7 @@ Language[fi]=C++
Language[fr]=C++
Language[ga]=C++
Language[gl]=C++
Language[hi]=C++
Language[hu]=C++
Language[it]=C++
Language[kk]=C++
......
......@@ -14,6 +14,7 @@ Name[fi]=PHPUnit
Name[fr]=PHPUnit
Name[ga]=PHPUnit
Name[gl]=PHPUnit
Name[hi]=PHPUnit
Name[hu]=PHPUnit
Name[it]=PHPUnit
Name[kk]=PHPUnit
......@@ -79,6 +80,7 @@ Language[fi]=PHP
Language[fr]=Php
Language[ga]=PHP
Language[gl]=PHP
Language[hi]=Php
Language[hu]=PHP
Language[it]=Php
Language[kk]=Php
......
......@@ -14,6 +14,7 @@ Name[fi]=PyUnit
Name[fr]=PyUnit
Name[ga]=PyUnit
Name[gl]=PyUnit
Name[hi]=PyUnit
Name[hu]=PyUnit
Name[it]=PyUnit
Name[kk]=PyUnit
......@@ -80,6 +81,7 @@ Language[fi]=Python
Language[fr]=Python
Language[ga]=Python
Language[gl]=Python
Language[hi]=Python
Language[hu]=Python
Language[it]=Python
Language[kk]=Python
......
......@@ -9,6 +9,7 @@ Name[es]=Dockerfile
Name[et]=Dockerfile
Name[fr]=Fichier Docker
Name[gl]=Dockerfile
Name[hi]=Dockerfile
Name[it]=Dockerfile
Name[ko]=Dockerfile
Name[nl]=Dockerfile
......@@ -53,6 +54,7 @@ Language[es]=JSON
Language[et]=JSON
Language[fr]=JSON
Language[gl]=JSON
Language[hi]=JSON
Language[it]=JSON
Language[ko]=JSON
Language[nb]=JSON
......
......@@ -52,6 +52,7 @@ Language[es]=JSON
Language[et]=JSON
Language[fr]=JSON
Language[gl]=JSON
Language[hi]=JSON
Language[it]=JSON
Language[ko]=JSON
Language[nb]=JSON
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment