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:
parent
708e49155f
commit
d42bcb25a2
4 changed files with 6 additions and 0 deletions
|
@ -30,6 +30,7 @@ GenericName[fi]=Laitteiden synkronointi
|
|||
GenericName[gl]=Sincronización de dispositivos
|
||||
GenericName[hu]=Eszközszinkronizáció
|
||||
GenericName[it]=Sincronizzazione dispositivo
|
||||
GenericName[lt]=Įrenginių sinchronizavimas
|
||||
GenericName[nl]=Synchronisatie van apparaat
|
||||
GenericName[nn]=Einingssynkronisering
|
||||
GenericName[pl]=Synchronizacja urządzenia
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
"Description[en_GB]": "Find your lost phone by making it play an alarm sound ",
|
||||
"Description[fi]": "Löydä hukkaamasi puhelin laittamalla se soittamaan hälytysääntä ",
|
||||
"Description[nl]": "Zoek uw verloren telefoon door het te laten een wekkersignaal te laten spelen ",
|
||||
"Description[pl]": "Znajdź twój zgubiony telefon odgrywając na nim dźwięk ",
|
||||
"Description[pt]": "Descobre o seu telefone perdido, fazendo-o tocar um som de alarme",
|
||||
"Description[pt_BR]": "Encontre seu telefone fazendo ele tocar um som ",
|
||||
"Description[sv]": "Hitta din förlorade telefon genom att få den att spela ett alarmljud ",
|
||||
|
@ -32,6 +33,7 @@
|
|||
"Name[en_GB]": "Find My Phone",
|
||||
"Name[fi]": "Löydä puhelimeni",
|
||||
"Name[nl]": "Zoek mijn telefoon",
|
||||
"Name[pl]": "Znajdź mój telefon",
|
||||
"Name[pt]": "Descobrir o Meu Telefone",
|
||||
"Name[pt_BR]": "Encontrar meu telefone",
|
||||
"Name[sv]": "Hitta min telefon",
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
"Description[ca]": "Executa ordres de la consola de forma remota",
|
||||
"Description[fi]": "Suorita konsolikomentoja etänä",
|
||||
"Description[nl]": "Commando's in de terminal op afstand laten uitvoeren",
|
||||
"Description[pl]": "Wykonaj polecenie konsoli zdalnie",
|
||||
"Description[pt]": "Executar de forma remota comandos da consola",
|
||||
"Description[pt_BR]": "Executa comandos do console remotamente",
|
||||
"Description[sv]": "Kör terminalkommandon på distans",
|
||||
|
@ -29,6 +30,7 @@
|
|||
"Name[ca]": "Executa ordres",
|
||||
"Name[fi]": "Suorita komentoja",
|
||||
"Name[nl]": "Commando's uitvoeren",
|
||||
"Name[pl]": "Wykonywanie polecenie",
|
||||
"Name[pt]": "Executar comandos",
|
||||
"Name[pt_BR]": "Executar comandos",
|
||||
"Name[sv]": "Kör kommandon",
|
||||
|
|
|
@ -9,6 +9,7 @@ Name=Run Command plugin settings
|
|||
Name[ca]=Ajustaments del connector Executa ordres
|
||||
Name[fi]=Suorita komento -liitännäisen asetukset
|
||||
Name[nl]=Plug-in-instellingen van commando Uitvoeren
|
||||
Name[pl]=Ustawienia wtyczki wykonywania polecenia
|
||||
Name[pt]=Configuração do 'plugin' de execução de comandos
|
||||
Name[pt_BR]=Configurações do plugin de execução de comandos
|
||||
Name[sv]=Inställningar av insticksprogram för kör kommando
|
||||
|
|
Loading…
Reference in a new issue