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-04-05 01:49:56 +00:00
parent a385bae963
commit 03f3411c9a
10 changed files with 17 additions and 0 deletions

View file

@ -6,6 +6,7 @@ Name=Audio
Name[az]=Səs Name[az]=Səs
Name[ca]=Àudio Name[ca]=Àudio
Name[ca@valencia]=Àudio Name[ca@valencia]=Àudio
Name[cs]=Audio
Name[en_GB]=Audio Name[en_GB]=Audio
Name[es]=Sonido Name[es]=Sonido
Name[fr]=Audio Name[fr]=Audio
@ -13,6 +14,7 @@ Name[it]=Audio
Name[nl]=Audio Name[nl]=Audio
Name[pt]=Áudio Name[pt]=Áudio
Name[pt_BR]=Áudio Name[pt_BR]=Áudio
Name[ro]=Audio
Name[sl]=Zvok Name[sl]=Zvok
Name[sv]=Ljud Name[sv]=Ljud
Name[tr]=Ses Name[tr]=Ses

View file

@ -6,6 +6,7 @@ Name=Battery
Name[az]=Batareya Name[az]=Batareya
Name[ca]=Bateria Name[ca]=Bateria
Name[ca@valencia]=Bateria Name[ca@valencia]=Bateria
Name[cs]=Baterie
Name[en_GB]=Battery Name[en_GB]=Battery
Name[es]=Batería Name[es]=Batería
Name[fr]=Batterie Name[fr]=Batterie
@ -13,6 +14,7 @@ Name[it]=Batteria
Name[nl]=Batterij Name[nl]=Batterij
Name[pt]=Bateria Name[pt]=Bateria
Name[pt_BR]=Bateria Name[pt_BR]=Bateria
Name[ro]=Acumulator
Name[sl]=Baterija Name[sl]=Baterija
Name[sv]=Batteri Name[sv]=Batteri
Name[tr]=Pil Name[tr]=Pil

View file

@ -6,6 +6,7 @@ Name=Bluetooth
Name[az]=Bluetooth Name[az]=Bluetooth
Name[ca]=Bluetooth Name[ca]=Bluetooth
Name[ca@valencia]=Bluetooth Name[ca@valencia]=Bluetooth
Name[cs]=Bluetooth
Name[en_GB]=Bluetooth Name[en_GB]=Bluetooth
Name[es]=Bluetooth Name[es]=Bluetooth
Name[fr]=Bluetooth Name[fr]=Bluetooth
@ -13,6 +14,7 @@ Name[it]=Bluetooth
Name[nl]=Bluetooth Name[nl]=Bluetooth
Name[pt]=Bluetooth Name[pt]=Bluetooth
Name[pt_BR]=Bluetooth Name[pt_BR]=Bluetooth
Name[ro]=Bluetooth
Name[sl]=Bluetooth Name[sl]=Bluetooth
Name[sv]=Blåtand Name[sv]=Blåtand
Name[tr]=Bluetooth Name[tr]=Bluetooth

View file

@ -13,6 +13,7 @@ Name[it]=Torcia
Name[nl]=Zaklamp Name[nl]=Zaklamp
Name[pt]=Luz de Flash Name[pt]=Luz de Flash
Name[pt_BR]=Lanterna Name[pt_BR]=Lanterna
Name[ro]=Lanternă
Name[sl]=Svetilka Name[sl]=Svetilka
Name[sv]=Ficklampa Name[sv]=Ficklampa
Name[tr]=El Feneri Name[tr]=El Feneri

View file

@ -6,6 +6,7 @@ Name=Location
Name[az]=Məkan Name[az]=Məkan
Name[ca]=Ubicació Name[ca]=Ubicació
Name[ca@valencia]=Ubicació Name[ca@valencia]=Ubicació
Name[cs]=Umístění
Name[en_GB]=Location Name[en_GB]=Location
Name[es]=Ubicación Name[es]=Ubicación
Name[fr]=Localisation Name[fr]=Localisation
@ -13,6 +14,7 @@ Name[it]=Posizione
Name[nl]=Locatie Name[nl]=Locatie
Name[pt]=Localização Name[pt]=Localização
Name[pt_BR]=Localização Name[pt_BR]=Localização
Name[ro]=Localizare
Name[sl]=Lokacija Name[sl]=Lokacija
Name[sv]=Plats Name[sv]=Plats
Name[tr]=Konum Name[tr]=Konum

View file

@ -13,6 +13,7 @@ Name[it]=Dati mobili
Name[nl]=Mobiele gegevens Name[nl]=Mobiele gegevens
Name[pt]=Dados Móveis Name[pt]=Dados Móveis
Name[pt_BR]=Dados móveis Name[pt_BR]=Dados móveis
Name[ro]=Date mobile
Name[sl]=Mobilni podatki Name[sl]=Mobilni podatki
Name[sv]=Mobildata Name[sv]=Mobildata
Name[tr]=Mobil veri Name[tr]=Mobil veri

View file

@ -13,6 +13,7 @@ Name[it]=Rotazione dello schermo
Name[nl]=Schermrotatie Name[nl]=Schermrotatie
Name[pt]=Rotação do ecrã Name[pt]=Rotação do ecrã
Name[pt_BR]=Rotação da tela Name[pt_BR]=Rotação da tela
Name[ro]=Rotirea ecranului
Name[sl]=Sukanje zaslona Name[sl]=Sukanje zaslona
Name[sv]=Skärmrotation Name[sv]=Skärmrotation
Name[tr]=Ekran döndürme Name[tr]=Ekran döndürme

View file

@ -6,6 +6,7 @@ Name=Screenshot
Name[az]=Ekran şəkli Name[az]=Ekran şəkli
Name[ca]=Captura de pantalla Name[ca]=Captura de pantalla
Name[ca@valencia]=Captura de pantalla Name[ca@valencia]=Captura de pantalla
Name[cs]=Snímek obrazovky
Name[en_GB]=Screenshot Name[en_GB]=Screenshot
Name[es]=Captura de pantalla Name[es]=Captura de pantalla
Name[fr]=Copie d'écran Name[fr]=Copie d'écran
@ -13,6 +14,7 @@ Name[it]=Schermata
Name[nl]=Schermafdruk Name[nl]=Schermafdruk
Name[pt]=Captura Name[pt]=Captura
Name[pt_BR]=Captura de tela Name[pt_BR]=Captura de tela
Name[ro]=Captură de ecran
Name[sl]=Slika zaslona Name[sl]=Slika zaslona
Name[sv]= Skärmbild Name[sv]= Skärmbild
Name[tr]=Ekran görüntüsü Name[tr]=Ekran görüntüsü

View file

@ -6,6 +6,7 @@ Name=Settings
Name[az]=Ayarlar Name[az]=Ayarlar
Name[ca]=Configuració Name[ca]=Configuració
Name[ca@valencia]=Configuració Name[ca@valencia]=Configuració
Name[cs]=Nastavení
Name[en_GB]=Settings Name[en_GB]=Settings
Name[es]=Preferencias Name[es]=Preferencias
Name[fr]=Configuration Name[fr]=Configuration
@ -13,6 +14,7 @@ Name[it]=Impostazioni
Name[nl]=Instellingen Name[nl]=Instellingen
Name[pt]=Configuração Name[pt]=Configuração
Name[pt_BR]=Configurações Name[pt_BR]=Configurações
Name[ro]=Configurări
Name[sl]=Nastavitve Name[sl]=Nastavitve
Name[sv]=Inställningar Name[sv]=Inställningar
Name[tr]=Ayarlar Name[tr]=Ayarlar

View file

@ -6,6 +6,7 @@ Name=Wi-Fi
Name[az]=Wi-Fi Name[az]=Wi-Fi
Name[ca]=Wi-Fi Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi Name[ca@valencia]=Wi-Fi
Name[cs]=Wi-Fi
Name[en_GB]=Wi-Fi Name[en_GB]=Wi-Fi
Name[es]=Wifi Name[es]=Wifi
Name[fr]=Wi-Fi Name[fr]=Wi-Fi
@ -13,6 +14,7 @@ Name[it]=Wi-Fi
Name[nl]=Wi-Fi Name[nl]=Wi-Fi
Name[pt]=Wi-Fi Name[pt]=Wi-Fi
Name[pt_BR]=Wi-Fi Name[pt_BR]=Wi-Fi
Name[ro]=Wi-Fi
Name[sl]=Wi-Fi Name[sl]=Wi-Fi
Name[sv]=Wifi Name[sv]=Wifi
Name[tr]=Wi-Fi Name[tr]=Wi-Fi