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-07-07 01:44:15 +00:00
parent c632dab1c1
commit 5a6559017e
11 changed files with 12 additions and 0 deletions

View file

@ -44,6 +44,7 @@ Description[en_GB]=Airplane mode quick setting
Description[es]=Ajuste rápido del modo avión
Description[fi]=Lentokonetilan pika-asetus
Description[fr]=Configuration rapide du mode Avion
Description[ia]=Preferentia rapide de modo eroplano
Description[it]=Impostazioni rapide per la modalità aereo
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Audio quick setting
Description[es]=Ajuste rápido del sonido
Description[fi]=Äänen pika-asetus
Description[fr]=Configuration rapide de l'audio
Description[ia]=Preferentia rapide de Audio
Description[it]=Impostazioni rapide audio
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Battery quick setting
Description[es]=Ajuste rápido de la batería
Description[fi]=Akun pika-asetus
Description[fr]=Configuration rapide de la batterie
Description[ia]=Preferentia rapide de Batteria
Description[it]=Impostazioni rapide batteria
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Bluetooth quick setting
Description[es]=Ajuste rápido del Bluetooth
Description[fi]=Bluetoothin pika-asetus
Description[fr]=Configuration rapide de Bluetooth
Description[ia]=Preferentia rapide de Bluetooth
Description[it]=Impostazioni rapide del Bluetooth
Description[ka]=BT-
Description[ko]=

View file

@ -36,6 +36,7 @@ Description[en_GB]=Flashlight quick setting
Description[es]=Ajuste rápido de la linterna
Description[fi]=Taskulampun pika-asetus
Description[fr]=Configuration rapide de Flashlight
Description[ia]=Preferentia rapide de Flashlight
Description[it]=Impostazioni rapide torcia
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Location quick setting
Description[es]=Ajuste rápido de la ubicación
Description[fi]=Sijainnin pika-asetus
Description[fr]=Configuration rapide de la localisation
Description[ia]=Preferentia rapide de location
Description[it]=Impostazioni rapide posizione
Description[ka]=
Description[ko]=

View file

@ -36,6 +36,7 @@ Description[en_GB]=Location quick setting
Description[es]=Ajuste rápido de la ubicación
Description[fi]=Sijainnin pika-asetus
Description[fr]=Configuration rapide de la localisation
Description[ia]=Preferentia rapide de location
Description[it]=Impostazioni rapide posizione
Description[ka]=
Description[ko]=

View file

@ -10,6 +10,7 @@ Name[en_GB]=Screen rotation
Name[es]=Rotación de la pantalla
Name[fi]=Näytön kierto
Name[fr]=Rotation de l'écran
Name[ia]=Rotation de schermo
Name[it]=Rotazione dello schermo
Name[ka]=
Name[ko]=
@ -35,6 +36,7 @@ Description[en_GB]=Screen rotation quick setting
Description[es]=Ajuste rápido de la rotación de la pantalla
Description[fi]=Näytön kierron pika-asetus
Description[fr]=Configuration rapide de la rotation d'écran
Description[ia]=Preferentia rapide de rotation de schermo
Description[it]=Impostazioni rapide rotazione dello schermo
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Screenshot quick setting
Description[es]=Ajuste rápido de la captura de pantalla
Description[fi]=Ruutukaappauksen pika-asetus
Description[fr]=Configuration rapide des copies d'écran
Description[ia]=Preferentia rapide de Captura de Schermo
Description[it]=Impostazioni rapide schermata
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Settings application quick setting
Description[es]=Ajuste rápido de la aplicación de preferencias
Description[fi]=Asetussovelluksen pika-asetus
Description[fr]=Configuration rapide de la configuration d'une application
Description[ia]=Preferentia rapide de Fixar applicationes
Description[it]=Impostazione delle impostazioni rapide
Description[ka]=
Description[ko]=

View file

@ -37,6 +37,7 @@ Description[en_GB]=Wi-Fi quick setting
Description[es]=Ajuste rápido del wifi
Description[fi]=Langattoman verkon pika-asetus
Description[fr]=Configuration rapide du Wifi
Description[ia]=Preferentia rapide de Wi-Fi
Description[it]=Impostazioni rapide Wi-Fi
Description[ka]=Wi-Fi-
Description[ko]=Wi-Fi