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-09 01:50:14 +00:00
parent bbe9bbf94c
commit 2d6d0c6789
14 changed files with 17 additions and 0 deletions

View file

@ -22,6 +22,7 @@ Name[nn]=Skal
Name[pt]=Consola Name[pt]=Consola
Name[pt_BR]=Shell Name[pt_BR]=Shell
Name[ro]=Interpretor Name[ro]=Interpretor
Name[sk]=Shell
Name[sl]=Shell Name[sl]=Shell
Name[sv]=Skal Name[sv]=Skal
Name[tr]=Kabuk Name[tr]=Kabuk
@ -46,6 +47,7 @@ Comment[nn]=Set opp systemskalet
Comment[pt]=Configurar a consola do sistema Comment[pt]=Configurar a consola do sistema
Comment[pt_BR]=Configurar o shell do sistema Comment[pt_BR]=Configurar o shell do sistema
Comment[ro]=Configurează interpretorul sistemului Comment[ro]=Configurează interpretorul sistemului
Comment[sk]=Nastaviť systémový shell
Comment[sl]=Nastavi sistemski shell Comment[sl]=Nastavi sistemski shell
Comment[sv]=Anpassa systemskalet Comment[sv]=Anpassa systemskalet
Comment[tr]=Sistem kabuğunu yapılandır Comment[tr]=Sistem kabuğunu yapılandır
@ -86,6 +88,7 @@ X-KDE-Keywords[nn]=system,skal,shell,panel
X-KDE-Keywords[pt]=sistema,consola,painel X-KDE-Keywords[pt]=sistema,consola,painel
X-KDE-Keywords[pt_BR]=sistema,shell,painel X-KDE-Keywords[pt_BR]=sistema,shell,painel
X-KDE-Keywords[ro]=sistem,interpretor,panou X-KDE-Keywords[ro]=sistem,interpretor,panou
X-KDE-Keywords[sk]=systém,shell,panel
X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
X-KDE-Keywords[sv]=system,skal,panel X-KDE-Keywords[sv]=system,skal,panel
X-KDE-Keywords[tr]=sistem,kabuk,panel X-KDE-Keywords[tr]=sistem,kabuk,panel

View file

@ -27,6 +27,7 @@ Name[pt]=Modo de Avião
Name[pt_BR]=Modo avião Name[pt_BR]=Modo avião
Name[ro]=Regim de avion Name[ro]=Regim de avion
Name[ru]=Режим полёта Name[ru]=Режим полёта
Name[sk]=Režim lietadlo
Name[sl]=Letalski način Name[sl]=Letalski način
Name[sv]=Flygplansläge Name[sv]=Flygplansläge
Name[tr]=Uçak Kipi Name[tr]=Uçak Kipi

View file

@ -16,6 +16,7 @@ Name[nl]=Audio
Name[pt]=Áudio Name[pt]=Áudio
Name[pt_BR]=Áudio Name[pt_BR]=Áudio
Name[ro]=Audio Name[ro]=Audio
Name[sk]=Zvuk
Name[sl]=Zvok Name[sl]=Zvok
Name[sv]=Ljud Name[sv]=Ljud
Name[tr]=Ses Name[tr]=Ses

View file

@ -16,6 +16,7 @@ Name[nl]=Batterij
Name[pt]=Bateria Name[pt]=Bateria
Name[pt_BR]=Bateria Name[pt_BR]=Bateria
Name[ro]=Acumulator Name[ro]=Acumulator
Name[sk]=Batéria
Name[sl]=Baterija Name[sl]=Baterija
Name[sv]=Batteri Name[sv]=Batteri
Name[tr]=Pil Name[tr]=Pil

View file

@ -16,6 +16,7 @@ Name[nl]=Bluetooth
Name[pt]=Bluetooth Name[pt]=Bluetooth
Name[pt_BR]=Bluetooth Name[pt_BR]=Bluetooth
Name[ro]=Bluetooth Name[ro]=Bluetooth
Name[sk]=Bluetooth
Name[sl]=Bluetooth Name[sl]=Bluetooth
Name[sv]=Blåtand Name[sv]=Blåtand
Name[tr]=Bluetooth Name[tr]=Bluetooth

View file

@ -22,6 +22,7 @@ Name[nn]=Caffeine
Name[pt]=Cafeína Name[pt]=Cafeína
Name[pt_BR]=Cafeína Name[pt_BR]=Cafeína
Name[ro]=Cafeină Name[ro]=Cafeină
Name[sk]=Kofeín
Name[sl]=Caffeine Name[sl]=Caffeine
Name[sv]=Koffein Name[sv]=Koffein
Name[tr]=Caffeine Name[tr]=Caffeine

View file

@ -15,6 +15,7 @@ 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[ro]=Lanternă
Name[sk]=Baterka
Name[sl]=Svetilka Name[sl]=Svetilka
Name[sv]=Ficklampa Name[sv]=Ficklampa
Name[tr]=El Feneri Name[tr]=El Feneri

View file

@ -16,6 +16,7 @@ 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[ro]=Localizare
Name[sk]=Umiestnenie
Name[sl]=Lokacija Name[sl]=Lokacija
Name[sv]=Plats Name[sv]=Plats
Name[tr]=Konum Name[tr]=Konum

View file

@ -15,6 +15,7 @@ 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[ro]=Date mobile
Name[sk]=Mobilné dáta
Name[sl]=Mobilni podatki Name[sl]=Mobilni podatki
Name[sv]=Mobildata Name[sv]=Mobildata
Name[tr]=Mobil veri Name[tr]=Mobil veri

View file

@ -20,6 +20,7 @@ Name[nn]=Kraftmeny
Name[pt]=Menu de Energia Name[pt]=Menu de Energia
Name[pt_BR]=Menu de energia Name[pt_BR]=Menu de energia
Name[ro]=Meniu avansat Name[ro]=Meniu avansat
Name[sk]=Ponuka napájania
Name[sl]=Meni energije Name[sl]=Meni energije
Name[sv]=Strömmeny Name[sv]=Strömmeny
Name[tr]=Güç Menüsü Name[tr]=Güç Menüsü

View file

@ -15,6 +15,7 @@ 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[ro]=Rotirea ecranului
Name[sk]=Otočenie obrazovky
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

@ -16,6 +16,7 @@ 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[ro]=Captură de ecran
Name[sk]=Snímka obrazovky
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

@ -16,6 +16,7 @@ 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[ro]=Configurări
Name[sk]=Nastavenia
Name[sl]=Nastavitve Name[sl]=Nastavitve
Name[sv]=Inställningar Name[sv]=Inställningar
Name[tr]=Ayarlar Name[tr]=Ayarlar

View file

@ -16,6 +16,7 @@ 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[ro]=Wi-Fi
Name[sk]=Wi-Fi
Name[sl]=Wi-Fi Name[sl]=Wi-Fi
Name[sv]=Wifi Name[sv]=Wifi
Name[tr]=Wi-Fi Name[tr]=Wi-Fi
@ -35,6 +36,7 @@ Description[it]=Impostazioni rapide Wi-Fi
Description[nl]=Snelle instelling van Wi-Fi Description[nl]=Snelle instelling van Wi-Fi
Description[pt]=Configuração rápida do Wi-Fi Description[pt]=Configuração rápida do Wi-Fi
Description[pt_BR]=Configurações rápidas do Wi-Fi Description[pt_BR]=Configurações rápidas do Wi-Fi
Description[sk]=Rýchle nastavenia wifi
Description[sl]=Hitre nastavitve Wi-Fi Description[sl]=Hitre nastavitve Wi-Fi
Description[sv]=Snabbinställning av wifi Description[sv]=Snabbinställning av wifi
Description[tr]=Wi-Fi hızlı ayarı Description[tr]=Wi-Fi hızlı ayarı