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"
This commit is contained in:
l10n daemon script 2022-06-30 01:45:48 +00:00
parent b7f1a5b379
commit 1629733d7e
12 changed files with 15 additions and 0 deletions

View file

@ -8,7 +8,11 @@ Name=Plasma Mobile (Development)
Name[az]=Plasma Mobil (Tərtibat)
Name[ca]=Plasma Mobile (Desenvolupament)
Name[es]=Plasma Mobile (desarrollo)
Name[fr]=Plasma Mobile (Développement)
Name[ia]=Plasma Mobile (Disveloppamento)
Name[nl]=Plasma-mobiel (ontwikkeling)
Name[pt]=Plasma Mobile (Desenvolvimento)
Name[sl]=Plasma Mobile (Razvoj)
Name[tr]=Plasma Mobile (Geliştirme)
Name[uk]=Мобільна Плазма (версія у розробці)
Name[x-test]=xxPlasma Mobile (Development)xx

View file

@ -10,6 +10,7 @@ Name[ca]=Halcyon
Name[ca@valencia]=Halcyon
Name[es]=Halcyon
Name[fr]=Halcyon
Name[ia]=Halcyon
Name[nl]=Halcyon
Name[pa]=ਿ
Name[pt]=Halcyon

View file

@ -11,6 +11,7 @@ Name[en_GB]=Audio
Name[es]=Sonido
Name[fi]=Ääni
Name[fr]=Audio
Name[ia]=Audio
Name[it]=Audio
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Battery
Name[es]=Batería
Name[fi]=Akku
Name[fr]=Batterie
Name[ia]=Batteria
Name[it]=Batteria
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Bluetooth
Name[es]=Bluetooth
Name[fi]=Bluetooth
Name[fr]=Bluetooth
Name[ia]=Bluetooth
Name[it]=Bluetooth
Name[ka]=Bluetooth
Name[ko]=

View file

@ -10,6 +10,7 @@ Name[en_GB]=Flashlight
Name[es]=Linterna
Name[fi]=Taskulamppu
Name[fr]=Flashlight
Name[ia]=Flashlight (luce de fulgure)
Name[it]=Torcia
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Location
Name[es]=Ubicación
Name[fi]=Sijainti
Name[fr]=Localisation
Name[ia]=Location
Name[it]=Posizione
Name[ka]=
Name[ko]=

View file

@ -10,6 +10,7 @@ Name[en_GB]=Mobile Data
Name[es]=Datos móviles
Name[fi]=Mobiilidata
Name[fr]=Données mobiles
Name[ia]=Datos Mobile
Name[it]=Dati mobili
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Screenshot
Name[es]=Captura de pantalla
Name[fi]=Ruutukaappaus
Name[fr]=Copie d'écran
Name[ia]=Instantanee de schermo
Name[it]=Schermata
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Screenshot
Name[es]=Captura de pantalla
Name[fi]=Ruutukaappaus
Name[fr]=Copie d'écran
Name[ia]=Instantanee de schermo
Name[it]=Schermata
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Settings
Name[es]=Preferencias
Name[fi]=Asetukset
Name[fr]=Configuration
Name[ia]=Preferentias
Name[it]=Impostazioni
Name[ka]=
Name[ko]=

View file

@ -11,6 +11,7 @@ Name[en_GB]=Wi-Fi
Name[es]=Wifi
Name[fi]=Langaton verkko
Name[fr]=Wi-Fi
Name[ia]=Wi-Fi
Name[it]=Wi-Fi
Name[ka]=Wi-Fi
Name[ko]=Wi-Fi